maruel@chromium.org | 45d8db0 | 2011-03-31 20:43:56 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python |
steveblock@chromium.org | 9356704 | 2012-02-15 01:02:26 +0000 | [diff] [blame] | 2 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 5 | |
| 6 | """Unit tests for gclient_scm.py.""" |
| 7 | |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 8 | # pylint: disable=E1103 |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 9 | |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 10 | # Import before super_mox to keep valid references. |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 11 | from shutil import rmtree |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 12 | from subprocess import Popen, PIPE, STDOUT |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 13 | |
| 14 | import logging |
| 15 | import os |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 16 | import re |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 17 | import sys |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 18 | import tempfile |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 19 | import unittest |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 20 | |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 21 | sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) |
maruel@chromium.org | ba55177 | 2010-02-03 18:21:42 +0000 | [diff] [blame] | 22 | |
maruel@chromium.org | 0927b7e | 2011-11-11 16:06:22 +0000 | [diff] [blame] | 23 | from testing_support.super_mox import mox, StdoutCheck, SuperMoxTestBase |
| 24 | from testing_support.super_mox import TestCaseUtils |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 25 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 26 | import gclient_scm |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 27 | import subprocess2 |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 28 | |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 29 | # Shortcut since this function is used often |
| 30 | join = gclient_scm.os.path.join |
| 31 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 32 | TIMESTAMP_RE = re.compile('\[[0-9]{1,2}:[0-9]{2}:[0-9]{2}\] (.*)', re.DOTALL) |
| 33 | def strip_timestamps(value): |
| 34 | lines = value.splitlines(True) |
| 35 | for i in xrange(len(lines)): |
| 36 | m = TIMESTAMP_RE.match(lines[i]) |
| 37 | if m: |
| 38 | lines[i] = m.group(1) |
| 39 | return ''.join(lines) |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 40 | |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 41 | # Access to a protected member XXX of a client class |
| 42 | # pylint: disable=W0212 |
| 43 | |
| 44 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 45 | class GCBaseTestCase(object): |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 46 | def assertRaisesError(self, msg, fn, *args, **kwargs): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 47 | """Like unittest's assertRaises() but checks for Gclient.Error.""" |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 48 | # pylint: disable=E1101 |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 49 | try: |
| 50 | fn(*args, **kwargs) |
| 51 | except gclient_scm.gclient_utils.Error, e: |
| 52 | self.assertEquals(e.args[0], msg) |
| 53 | else: |
| 54 | self.fail('%s not raised' % msg) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 55 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 56 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 57 | class BaseTestCase(GCBaseTestCase, SuperMoxTestBase): |
| 58 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 59 | SuperMoxTestBase.setUp(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 60 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter') |
| 61 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, |
| 62 | 'CheckCallAndFilterAndHeader') |
| 63 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead') |
| 64 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite') |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 65 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'rmtree') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 66 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture') |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 67 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, '_CaptureInfo') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 68 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureStatus') |
| 69 | self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'RunAndGetFileList') |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 70 | self.mox.StubOutWithMock(subprocess2, 'communicate') |
| 71 | self.mox.StubOutWithMock(subprocess2, 'Popen') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 72 | self._scm_wrapper = gclient_scm.CreateSCM |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 73 | gclient_scm.scm.SVN.current_version = None |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 74 | self._original_SVNBinaryExists = gclient_scm.SVNWrapper.BinaryExists |
| 75 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
| 76 | gclient_scm.SVNWrapper.BinaryExists = staticmethod(lambda : True) |
| 77 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 78 | # Absolute path of the fake checkout directory. |
| 79 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 80 | |
| 81 | def tearDown(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 82 | SuperMoxTestBase.tearDown(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 83 | gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists |
| 84 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 85 | |
| 86 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 87 | class SVNWrapperTestCase(BaseTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 88 | class OptionsObject(object): |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 89 | def __init__(self, verbose=False, revision=None, force=False): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 90 | self.verbose = verbose |
| 91 | self.revision = revision |
| 92 | self.manually_grab_svn_rev = True |
| 93 | self.deps_os = None |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 94 | self.force = force |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 95 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 96 | self.nohooks = False |
maruel@chromium.org | 36ac239 | 2011-10-12 16:36:11 +0000 | [diff] [blame] | 97 | # TODO(maruel): Test --jobs > 1. |
| 98 | self.jobs = 1 |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 99 | self.delete_unversioned_trees = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 100 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 101 | def checkstdout(self, expected): |
| 102 | value = sys.stdout.getvalue() |
| 103 | sys.stdout.close() |
| 104 | # pylint: disable=E1101 |
| 105 | self.assertEquals(expected, strip_timestamps(value)) |
| 106 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 107 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 108 | return self.OptionsObject(*args, **kwargs) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 109 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 110 | def setUp(self): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 111 | BaseTestCase.setUp(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 112 | self.url = self.SvnUrl() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 113 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 114 | def testUnsupportedSCM(self): |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 115 | args = ['gopher://foo', self.root_dir, self.relpath] |
| 116 | exception_msg = 'No SCM found for url gopher://foo' |
| 117 | self.assertRaisesError(exception_msg, self._scm_wrapper, *args) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 118 | |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 119 | def testSVNFullUrlForRelativeUrl(self): |
| 120 | self.url = 'svn://a/b/c/d' |
| 121 | |
| 122 | self.mox.ReplayAll() |
| 123 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 124 | relpath=self.relpath) |
| 125 | self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'svn://a/b/crap') |
| 126 | |
| 127 | def testGITFullUrlForRelativeUrl(self): |
| 128 | self.url = 'git://a/b/c/d' |
| 129 | |
| 130 | self.mox.ReplayAll() |
| 131 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 132 | relpath=self.relpath) |
| 133 | self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'git://a/b/c/crap') |
| 134 | |
igorgatis@gmail.com | 4e07567 | 2011-11-21 16:35:08 +0000 | [diff] [blame] | 135 | def testGITFakeHttpUrl(self): |
| 136 | self.url = 'git+http://foo' |
| 137 | |
| 138 | self.mox.ReplayAll() |
| 139 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 140 | relpath=self.relpath) |
| 141 | self.assertEqual(scm.url, 'http://foo') |
| 142 | |
| 143 | def testGITFakeHttpsUrl(self): |
| 144 | self.url = 'git+https://foo' |
| 145 | |
| 146 | self.mox.ReplayAll() |
| 147 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 148 | relpath=self.relpath) |
| 149 | self.assertEqual(scm.url, 'https://foo') |
| 150 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 151 | def testRunCommandException(self): |
| 152 | options = self.Options(verbose=False) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 153 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
mmoss@chromium.org | 50fd47f | 2014-02-13 01:03:19 +0000 | [diff] [blame] | 154 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 155 | self.mox.ReplayAll() |
| 156 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 157 | relpath=self.relpath) |
| 158 | exception = "Unsupported argument(s): %s" % ','.join(self.args) |
| 159 | self.assertRaisesError(exception, scm.RunCommand, |
| 160 | 'update', options, self.args) |
| 161 | |
| 162 | def testRunCommandUnknown(self): |
| 163 | # TODO(maruel): if ever used. |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 164 | pass |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 165 | |
| 166 | def testRevertMissing(self): |
| 167 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 168 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 169 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 170 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 171 | ).AndReturn('1.5.1') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 172 | # It'll to a checkout instead. |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 173 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 174 | # Checkout. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 175 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 176 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 177 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 178 | gclient_scm.os.makedirs(parent) |
| 179 | gclient_scm.os.path.exists(parent).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 180 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 181 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 182 | options.verbose, |
| 183 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 184 | cwd=self.root_dir, |
| 185 | file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 186 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 187 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 188 | ).AndReturn({'Revision': 100}) |
| 189 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 190 | self.mox.ReplayAll() |
| 191 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 192 | relpath=self.relpath) |
| 193 | scm.revert(options, self.args, files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 194 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 195 | ('_____ %s is missing, synching instead\n' % self.relpath)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 196 | |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 197 | def testRevertNoDotSvn(self): |
| 198 | options = self.Options(verbose=True, force=True) |
| 199 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 200 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(False) |
mmoss@chromium.org | 50fd47f | 2014-02-13 01:03:19 +0000 | [diff] [blame] | 201 | gclient_scm.os.path.isdir(join(self.base_path, '.git')).AndReturn(False) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 202 | gclient_scm.os.path.isdir(join(self.base_path, '.hg')).AndReturn(False) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 203 | # Checkout. |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 204 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 205 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 206 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 207 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 208 | gclient_scm.os.makedirs(parent) |
| 209 | gclient_scm.os.path.exists(parent).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 210 | files_list = self.mox.CreateMockAnything() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 211 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 212 | ).AndReturn('1.6') |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 213 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 214 | options.verbose, |
| 215 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 216 | cwd=self.root_dir, |
| 217 | file_list=files_list) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 218 | gclient_scm.gclient_utils.rmtree(self.base_path) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 219 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 220 | ).AndReturn({'Revision': 100}) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 221 | self.mox.ReplayAll() |
| 222 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 223 | relpath=self.relpath) |
| 224 | scm.revert(options, self.args, files_list) |
| 225 | self.checkstdout( |
| 226 | '\n_____ %s is not a valid svn checkout, synching instead\n' % |
| 227 | self.relpath) |
| 228 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 229 | def testRevertNone(self): |
| 230 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 231 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 232 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True) |
maruel@chromium.org | ea15cb7 | 2012-05-04 14:16:31 +0000 | [diff] [blame] | 233 | gclient_scm.scm.SVN.CaptureStatus( |
| 234 | None, self.base_path, no_ignore=False).AndReturn([]) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 235 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 236 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 237 | options.verbose, |
| 238 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 239 | cwd=self.base_path, |
| 240 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 241 | |
| 242 | self.mox.ReplayAll() |
| 243 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 244 | relpath=self.relpath) |
| 245 | file_list = [] |
| 246 | scm.revert(options, self.args, file_list) |
| 247 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 248 | def testRevertDirectory(self): |
| 249 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 250 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 251 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 252 | items = [ |
| 253 | ('~ ', 'a'), |
| 254 | ] |
maruel@chromium.org | ea15cb7 | 2012-05-04 14:16:31 +0000 | [diff] [blame] | 255 | gclient_scm.scm.SVN.CaptureStatus( |
| 256 | None, self.base_path, no_ignore=False).AndReturn(items) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 257 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 258 | gclient_scm.os.path.exists(file_path).AndReturn(True) |
| 259 | gclient_scm.os.path.isfile(file_path).AndReturn(False) |
msb@chromium.org | 32906d1 | 2010-01-12 18:22:09 +0000 | [diff] [blame] | 260 | gclient_scm.os.path.islink(file_path).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 261 | gclient_scm.os.path.isdir(file_path).AndReturn(True) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 262 | gclient_scm.gclient_utils.rmtree(file_path) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 263 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 264 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 265 | options.verbose, |
| 266 | ['update', '--revision', 'BASE', '--ignore-externals'], |
| 267 | cwd=self.base_path, |
| 268 | file_list=mox.IgnoreArg()) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 269 | |
| 270 | self.mox.ReplayAll() |
| 271 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 272 | relpath=self.relpath) |
| 273 | file_list2 = [] |
| 274 | scm.revert(options, self.args, file_list2) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 275 | self.checkstdout(('%s\n' % file_path)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 276 | |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 277 | def testRevertDot(self): |
| 278 | self.mox.StubOutWithMock(gclient_scm.SVNWrapper, 'update') |
| 279 | options = self.Options(verbose=True) |
| 280 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 281 | gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True) |
| 282 | items = [ |
| 283 | ('~ ', '.'), |
| 284 | ] |
maruel@chromium.org | ea15cb7 | 2012-05-04 14:16:31 +0000 | [diff] [blame] | 285 | gclient_scm.scm.SVN.CaptureStatus( |
| 286 | None, self.base_path, no_ignore=False).AndReturn(items) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 287 | # gclient_utils.rmtree() doesn't work on path ending with '.', like 'foo/.'. |
maruel@chromium.org | 6208757 | 2012-04-24 23:16:28 +0000 | [diff] [blame] | 288 | file_path = self.base_path |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 289 | gclient_scm.os.path.exists(file_path).AndReturn(True) |
| 290 | gclient_scm.os.path.isfile(file_path).AndReturn(False) |
| 291 | gclient_scm.os.path.islink(file_path).AndReturn(False) |
| 292 | gclient_scm.os.path.isdir(file_path).AndReturn(True) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 293 | gclient_scm.gclient_utils.rmtree(file_path) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 294 | # pylint: disable=E1120 |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 295 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 296 | gclient_scm.SVNWrapper.update(options, [], ['.']) |
| 297 | |
| 298 | self.mox.ReplayAll() |
| 299 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 300 | relpath=self.relpath) |
| 301 | file_list2 = [] |
| 302 | scm.revert(options, self.args, file_list2) |
maruel@chromium.org | 6208757 | 2012-04-24 23:16:28 +0000 | [diff] [blame] | 303 | self.checkstdout(('%s\n' % os.path.join(file_path, '.'))) |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 304 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 305 | def testStatus(self): |
| 306 | options = self.Options(verbose=True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 307 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 308 | gclient_scm.scm.SVN.RunAndGetFileList( |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 309 | options.verbose, |
| 310 | ['status'] + self.args + ['--ignore-externals'], |
| 311 | cwd=self.base_path, |
| 312 | file_list=[]).AndReturn(None) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 313 | |
| 314 | self.mox.ReplayAll() |
| 315 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 316 | relpath=self.relpath) |
| 317 | file_list = [] |
| 318 | self.assertEqual(scm.status(options, self.args, file_list), None) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 319 | |
| 320 | # TODO(maruel): TEST REVISIONS!!! |
| 321 | # TODO(maruel): TEST RELOCATE!!! |
| 322 | def testUpdateCheckout(self): |
| 323 | options = self.Options(verbose=True) |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 324 | file_info = gclient_scm.gclient_utils.PrintableObject() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 325 | file_info.root = 'blah' |
| 326 | file_info.url = self.url |
| 327 | file_info.uuid = 'ABC' |
| 328 | file_info.revision = 42 |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 329 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 330 | # Checkout. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 331 | gclient_scm.os.path.exists(self.base_path).AndReturn(False) |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 332 | parent = gclient_scm.os.path.dirname(self.base_path) |
| 333 | gclient_scm.os.path.exists(parent).AndReturn(False) |
| 334 | gclient_scm.os.makedirs(parent) |
| 335 | gclient_scm.os.path.exists(parent).AndReturn(True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 336 | files_list = self.mox.CreateMockAnything() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 337 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 338 | ).AndReturn('1.5.1') |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 339 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 340 | options.verbose, |
| 341 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 342 | cwd=self.root_dir, |
| 343 | file_list=files_list) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 344 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 345 | ).AndReturn({'Revision': 100}) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 346 | self.mox.ReplayAll() |
| 347 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 348 | relpath=self.relpath) |
| 349 | scm.update(options, (), files_list) |
| 350 | |
| 351 | def testUpdateUpdate(self): |
| 352 | options = self.Options(verbose=True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 353 | options.force = True |
| 354 | options.nohooks = False |
| 355 | file_info = { |
| 356 | 'Repository Root': 'blah', |
| 357 | 'URL': self.url, |
| 358 | 'UUID': 'ABC', |
| 359 | 'Revision': 42, |
| 360 | } |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 361 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 362 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 363 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 364 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 365 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 366 | # Checkout or update. |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 367 | dotted_path = join(self.base_path, '.') |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 368 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 369 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 370 | # Verify no locked files. |
| 371 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([]) |
| 372 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 373 | # Cheat a bit here. |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 374 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 375 | ).AndReturn(file_info) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 376 | |
| 377 | # _AddAdditionalUpdateFlags() |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 378 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 379 | ).AndReturn('1.5.1') |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 380 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 381 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 382 | ).AndReturn({'Revision': 100}) |
| 383 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 384 | additional_args = [] |
| 385 | if options.manually_grab_svn_rev: |
| 386 | additional_args = ['--revision', str(file_info['Revision'])] |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 387 | additional_args.extend(['--force', '--ignore-externals']) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 388 | files_list = [] |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 389 | gclient_scm.scm.SVN.RunAndGetFileList( |
maruel@chromium.org | 0380707 | 2010-08-16 17:18:44 +0000 | [diff] [blame] | 390 | options.verbose, |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 391 | ['update', self.base_path] + additional_args, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 392 | cwd=self.root_dir, file_list=files_list) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 393 | |
| 394 | self.mox.ReplayAll() |
| 395 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 396 | relpath=self.relpath) |
| 397 | scm.update(options, (), files_list) |
| 398 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 399 | def testUpdateReset(self): |
| 400 | options = self.Options(verbose=True) |
| 401 | options.reset = True |
| 402 | file_info = { |
| 403 | 'Repository Root': 'blah', |
| 404 | 'URL': self.url, |
| 405 | 'UUID': 'ABC', |
| 406 | 'Revision': 42, |
| 407 | } |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 408 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 409 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 410 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 411 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 412 | |
| 413 | # Checkout or update. |
| 414 | dotted_path = join(self.base_path, '.') |
| 415 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
| 416 | |
| 417 | # Create an untracked file and directory. |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 418 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path |
| 419 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 420 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 421 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 422 | ).AndReturn(file_info) |
| 423 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 424 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 425 | ).AndReturn({'Revision': 100}) |
| 426 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 427 | self.mox.ReplayAll() |
| 428 | files_list = [] |
| 429 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 430 | relpath=self.relpath) |
| 431 | scm.update(options, (), files_list) |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 432 | self.checkstdout('_____ %s at 42\n' % self.relpath) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 433 | |
| 434 | def testUpdateResetDeleteUnversionedTrees(self): |
| 435 | options = self.Options(verbose=True) |
| 436 | options.reset = True |
| 437 | options.delete_unversioned_trees = True |
| 438 | |
| 439 | file_info = { |
| 440 | 'Repository Root': 'blah', |
| 441 | 'URL': self.url, |
| 442 | 'UUID': 'ABC', |
| 443 | 'Revision': 42, |
| 444 | } |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 445 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 446 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 447 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 448 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 449 | |
| 450 | # Checkout or update. |
| 451 | dotted_path = join(self.base_path, '.') |
| 452 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
| 453 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 454 | # Create an untracked file and directory. |
| 455 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path |
| 456 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 457 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 458 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 459 | ).AndReturn(file_info) |
| 460 | |
| 461 | # Confirm that the untracked file is removed. |
| 462 | gclient_scm.scm.SVN.CaptureStatus(None, self.base_path |
| 463 | ).AndReturn([['? ', 'dir'], ['? ', 'file']]) |
| 464 | gclient_scm.os.path.isdir(join(self.base_path, 'dir')).AndReturn(True) |
| 465 | gclient_scm.os.path.isdir(join(self.base_path, 'file')).AndReturn(False) |
| 466 | gclient_scm.os.path.islink(join(self.base_path, 'dir')).AndReturn(False) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 467 | gclient_scm.gclient_utils.rmtree(join(self.base_path, 'dir')) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 468 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 469 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 470 | ).AndReturn({'Revision': 100}) |
| 471 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 472 | self.mox.ReplayAll() |
| 473 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 474 | relpath=self.relpath) |
| 475 | files_list = [] |
| 476 | scm.update(options, (), files_list) |
| 477 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 478 | ('_____ %s at 42\n' |
| 479 | '_____ removing unversioned directory dir\n') % self.relpath) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 480 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 481 | def testUpdateSingleCheckout(self): |
| 482 | options = self.Options(verbose=True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 483 | file_info = { |
| 484 | 'URL': self.url, |
| 485 | 'Revision': 42, |
| 486 | } |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 487 | |
| 488 | # Checks to make sure that we support svn co --depth. |
| 489 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 490 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 491 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 492 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False) |
| 493 | gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(False) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 494 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 495 | # Verify no locked files. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 496 | dotted_path = join(self.base_path, '.') |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 497 | gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 498 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 499 | # When checking out a single file, we issue an svn checkout and svn update. |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 500 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 501 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 502 | ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path], |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 503 | always=True, |
| 504 | cwd=self.root_dir) |
| 505 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 506 | options.verbose, |
| 507 | ['update', 'DEPS', '--ignore-externals'], |
| 508 | cwd=self.base_path, |
| 509 | file_list=files_list) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 510 | |
| 511 | # Now we fall back on scm.update(). |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 512 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 513 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 514 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 515 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 516 | gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info) |
| 517 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 518 | ).AndReturn(file_info) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 519 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 520 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 521 | ).AndReturn({'Revision': 100}) |
| 522 | |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 523 | self.mox.ReplayAll() |
| 524 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 525 | relpath=self.relpath) |
| 526 | scm.updatesingle(options, ['DEPS'], files_list) |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 527 | self.checkstdout('_____ %s at 42\n' % self.relpath) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 528 | |
| 529 | def testUpdateSingleCheckoutSVN14(self): |
| 530 | options = self.Options(verbose=True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 531 | |
| 532 | # Checks to make sure that we support svn co --depth. |
| 533 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 534 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 535 | ).AndReturn('1.4.4') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 536 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 537 | |
| 538 | # When checking out a single file with svn 1.4, we use svn export |
| 539 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 540 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 541 | ['svn', 'export', join(self.url, 'DEPS'), join(self.base_path, 'DEPS')], |
scottmg@chromium.org | f547c80 | 2013-09-27 17:55:26 +0000 | [diff] [blame] | 542 | always=True, cwd=self.root_dir) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 543 | |
| 544 | self.mox.ReplayAll() |
| 545 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 546 | relpath=self.relpath) |
| 547 | scm.updatesingle(options, ['DEPS'], files_list) |
| 548 | |
| 549 | def testUpdateSingleCheckoutSVNUpgrade(self): |
| 550 | options = self.Options(verbose=True) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 551 | file_info = { |
| 552 | 'URL': self.url, |
| 553 | 'Revision': 42, |
| 554 | } |
| 555 | |
| 556 | # Checks to make sure that we support svn co --depth. |
| 557 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 558 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 559 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 560 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 561 | # If DEPS already exists, assume we're upgrading from svn1.4, so delete |
| 562 | # the old DEPS file. |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 563 | gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(True) |
| 564 | gclient_scm.os.remove(join(self.base_path, 'DEPS')) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 565 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 566 | # Verify no locked files. |
| 567 | gclient_scm.scm.SVN.CaptureStatus( |
| 568 | None, join(self.base_path, '.')).AndReturn([]) |
| 569 | |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 570 | # When checking out a single file, we issue an svn checkout and svn update. |
| 571 | files_list = self.mox.CreateMockAnything() |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 572 | gclient_scm.gclient_utils.CheckCallAndFilterAndHeader( |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 573 | ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path], |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 574 | always=True, |
| 575 | cwd=self.root_dir) |
| 576 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 577 | options.verbose, |
| 578 | ['update', 'DEPS', '--ignore-externals'], |
| 579 | cwd=self.base_path, |
| 580 | file_list=files_list) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 581 | |
| 582 | # Now we fall back on scm.update(). |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 583 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 584 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 585 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 586 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 587 | gclient_scm.scm.SVN._CaptureInfo( |
| 588 | [], join(self.base_path, ".")).AndReturn(file_info) |
| 589 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 590 | ).AndReturn(file_info) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 591 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 592 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 593 | ).AndReturn({'Revision': 100}) |
| 594 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 595 | self.mox.ReplayAll() |
| 596 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 597 | relpath=self.relpath) |
| 598 | scm.updatesingle(options, ['DEPS'], files_list) |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 599 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 600 | ('_____ %s at 42\n' % self.relpath)) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 601 | |
| 602 | def testUpdateSingleUpdate(self): |
| 603 | options = self.Options(verbose=True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 604 | file_info = { |
| 605 | 'URL': self.url, |
| 606 | 'Revision': 42, |
| 607 | } |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 608 | # Checks to make sure that we support svn co --depth. |
| 609 | gclient_scm.scm.SVN.current_version = None |
shouqun.liu@intel.com | 13b522c | 2012-07-20 17:16:51 +0000 | [diff] [blame] | 610 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 611 | ).AndReturn('1.5.1') |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 612 | gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(True) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 613 | |
stip@chromium.org | 3031d73 | 2014-04-21 22:18:02 +0000 | [diff] [blame] | 614 | # Verify no locked files. |
| 615 | gclient_scm.scm.SVN.CaptureStatus(None, join(self.base_path, '.') |
| 616 | ).AndReturn([]) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 617 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 618 | # Now we fall back on scm.update(). |
| 619 | files_list = self.mox.CreateMockAnything() |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 620 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 621 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 622 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 623 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 624 | gclient_scm.scm.SVN._CaptureInfo( |
| 625 | [], join(self.base_path, '.')).AndReturn(file_info) |
| 626 | gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None |
| 627 | ).AndReturn(file_info) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 628 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 629 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 630 | ).AndReturn({'Revision': 100}) |
| 631 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 632 | self.mox.ReplayAll() |
| 633 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 634 | relpath=self.relpath) |
| 635 | scm.updatesingle(options, ['DEPS'], files_list) |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 636 | self.checkstdout('_____ %s at 42\n' % self.relpath) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 637 | |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 638 | def testUpdateGit(self): |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 639 | options = self.Options(verbose=True) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 640 | file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.hg') |
| 641 | gclient_scm.os.path.exists(file_path).AndReturn(False) |
| 642 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 643 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 644 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
| 645 | error = gclient_scm.subprocess2.CalledProcessError( |
| 646 | 1, 'cmd', '/cwd', 'stdout', 'stderr') |
| 647 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.').AndRaise(error) |
| 648 | |
borenet@google.com | b225621 | 2014-05-07 20:57:28 +0000 | [diff] [blame] | 649 | bad_scm_path = os.path.join(self.root_dir, '_bad_scm', |
| 650 | os.path.dirname(self.relpath)) |
| 651 | gclient_scm.os.makedirs(bad_scm_path) |
| 652 | dest_path = os.path.join(bad_scm_path, |
| 653 | os.path.basename(self.relpath) + 'ABCD') |
| 654 | self.mox.StubOutWithMock(gclient_scm.tempfile, 'mkdtemp', True) |
| 655 | gclient_scm.tempfile.mkdtemp( |
| 656 | prefix=os.path.basename(self.relpath), |
| 657 | dir=os.path.join(self.root_dir, '_bad_scm', |
| 658 | os.path.dirname(self.relpath))).AndReturn(dest_path) |
| 659 | self.mox.StubOutWithMock(gclient_scm.shutil, 'move', True) |
| 660 | gclient_scm.shutil.move(self.base_path, dest_path) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 661 | gclient_scm.os.path.exists(self.root_dir).AndReturn(True) |
| 662 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 663 | ).AndReturn('1.5.1') |
| 664 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 665 | options.verbose, |
| 666 | ['checkout', self.url, self.base_path, '--force', '--ignore-externals'], |
| 667 | cwd=self.root_dir, |
| 668 | file_list=[]) |
| 669 | |
| 670 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 671 | ).AndReturn({'Revision': 100}) |
| 672 | |
| 673 | self.mox.ReplayAll() |
| 674 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 675 | relpath=self.relpath) |
| 676 | scm.update(options, None, []) |
borenet@google.com | b225621 | 2014-05-07 20:57:28 +0000 | [diff] [blame] | 677 | self.checkstdout('_____ Conflicting directory found in %s. Moving to %s.\n' |
| 678 | % (self.base_path, dest_path)) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 679 | |
| 680 | def testUpdateGitForce(self): |
| 681 | options = self.Options(verbose=True, force=True) |
borenet@google.com | b225621 | 2014-05-07 20:57:28 +0000 | [diff] [blame] | 682 | old_environ = dict(gclient_scm.os.environ) |
| 683 | gclient_scm.os.environ['CHROME_HEADLESS'] = '1' |
| 684 | try: |
| 685 | file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.hg') |
| 686 | gclient_scm.os.path.exists(file_path).AndReturn(False) |
| 687 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 688 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 689 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False) |
| 690 | error = gclient_scm.subprocess2.CalledProcessError( |
| 691 | 1, 'cmd', '/cwd', 'stdout', 'stderr') |
| 692 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.').AndRaise(error) |
| 693 | gclient_scm.gclient_utils.rmtree(self.base_path) |
| 694 | gclient_scm.os.path.exists(self.root_dir).AndReturn(True) |
| 695 | gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None |
| 696 | ).AndReturn('1.5.1') |
| 697 | gclient_scm.scm.SVN.RunAndGetFileList( |
| 698 | options.verbose, |
| 699 | ['checkout', self.url, self.base_path, '--force', |
| 700 | '--ignore-externals'], |
| 701 | cwd=self.root_dir, |
| 702 | file_list=[]) |
| 703 | |
| 704 | gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.' |
| 705 | ).AndReturn({'Revision': 100}) |
| 706 | |
| 707 | self.mox.ReplayAll() |
| 708 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 709 | relpath=self.relpath) |
| 710 | file_list = [] |
| 711 | scm.update(options, None, file_list) |
| 712 | self.checkstdout('_____ Conflicting directory found in %s. Removing.\n' |
| 713 | % self.base_path) |
| 714 | finally: |
| 715 | gclient_scm.os.environ = old_environ |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 716 | |
| 717 | def testUpdateGitSvn(self): |
| 718 | options = self.Options(verbose=True) |
| 719 | file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.hg') |
| 720 | gclient_scm.os.path.exists(file_path).AndReturn(False) |
| 721 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 722 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
| 723 | gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(True) |
| 724 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'Capture', True) |
| 725 | gclient_scm.scm.GIT.Capture(['config', '--local', '--get', |
| 726 | 'svn-remote.svn.url'], |
| 727 | cwd=self.base_path).AndReturn(self.url) |
| 728 | |
| 729 | self.mox.ReplayAll() |
| 730 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 731 | relpath=self.relpath) |
| 732 | file_list = [] |
| 733 | scm.update(options, [], file_list) |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 734 | self.checkstdout( |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 735 | ('\n_____ %s looks like a git-svn checkout. Skipping.\n' % self.relpath) |
| 736 | ) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 737 | |
| 738 | def testUpdateHg(self): |
| 739 | options = self.Options(verbose=True) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 740 | gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(True) |
| 741 | |
| 742 | self.mox.ReplayAll() |
| 743 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 744 | relpath=self.relpath) |
| 745 | file_list = [] |
| 746 | scm.update(options, self.args, file_list) |
| 747 | self.checkstdout( |
| 748 | ('________ found .hg directory; skipping %s\n' % self.relpath)) |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 749 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 750 | def testGetUsableRevSVN(self): |
| 751 | # pylint: disable=E1101 |
| 752 | options = self.Options(verbose=True) |
| 753 | |
| 754 | # Mock SVN revision validity checking. |
| 755 | self.mox.StubOutWithMock( |
| 756 | gclient_scm.scm.SVN, 'IsValidRevision', True) |
| 757 | gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 1) |
| 758 | ).AndReturn(True) |
| 759 | gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 'fake') |
| 760 | ).AndReturn(False) |
| 761 | |
| 762 | self.mox.ReplayAll() |
| 763 | |
| 764 | svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir) |
| 765 | # With an SVN checkout, 1 an example of a valid usable rev. |
| 766 | self.assertEquals(svn_scm.GetUsableRev(1, options), 1) |
| 767 | # With an SVN checkout, a fake or unknown rev should raise an excpetion. |
| 768 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 769 | svn_scm.GetUsableRev, 'fake', options) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 770 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 771 | class BaseGitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils, |
| 772 | unittest.TestCase): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 773 | """This class doesn't use pymox.""" |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 774 | class OptionsObject(object): |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 775 | def __init__(self, verbose=False, revision=None): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 776 | self.verbose = verbose |
| 777 | self.revision = revision |
| 778 | self.manually_grab_svn_rev = True |
| 779 | self.deps_os = None |
| 780 | self.force = False |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 781 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 782 | self.nohooks = False |
iannucci@chromium.org | d4fffee | 2013-06-28 00:35:26 +0000 | [diff] [blame] | 783 | self.upstream = False |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 784 | self.cache_dir = None |
bauerb@chromium.org | 4dd0937 | 2011-07-22 14:41:51 +0000 | [diff] [blame] | 785 | self.merge = False |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 786 | self.jobs = 1 |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 787 | self.delete_unversioned_trees = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 788 | |
| 789 | sample_git_import = """blob |
| 790 | mark :1 |
| 791 | data 6 |
| 792 | Hello |
| 793 | |
| 794 | blob |
| 795 | mark :2 |
| 796 | data 4 |
| 797 | Bye |
| 798 | |
| 799 | reset refs/heads/master |
| 800 | commit refs/heads/master |
| 801 | mark :3 |
| 802 | author Bob <bob@example.com> 1253744361 -0700 |
| 803 | committer Bob <bob@example.com> 1253744361 -0700 |
| 804 | data 8 |
| 805 | A and B |
| 806 | M 100644 :1 a |
| 807 | M 100644 :2 b |
| 808 | |
| 809 | blob |
| 810 | mark :4 |
| 811 | data 10 |
| 812 | Hello |
| 813 | You |
| 814 | |
| 815 | blob |
| 816 | mark :5 |
| 817 | data 8 |
| 818 | Bye |
| 819 | You |
| 820 | |
| 821 | commit refs/heads/origin |
| 822 | mark :6 |
| 823 | author Alice <alice@example.com> 1253744424 -0700 |
| 824 | committer Alice <alice@example.com> 1253744424 -0700 |
| 825 | data 13 |
| 826 | Personalized |
| 827 | from :3 |
| 828 | M 100644 :4 a |
| 829 | M 100644 :5 b |
| 830 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 831 | blob |
| 832 | mark :7 |
| 833 | data 5 |
| 834 | Mooh |
| 835 | |
| 836 | commit refs/heads/feature |
| 837 | mark :8 |
| 838 | author Bob <bob@example.com> 1390311986 -0000 |
| 839 | committer Bob <bob@example.com> 1390311986 -0000 |
| 840 | data 6 |
| 841 | Add C |
| 842 | from :3 |
| 843 | M 100644 :7 c |
| 844 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 845 | reset refs/heads/master |
| 846 | from :3 |
| 847 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 848 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 849 | return self.OptionsObject(*args, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 850 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 851 | def checkstdout(self, expected): |
| 852 | value = sys.stdout.getvalue() |
| 853 | sys.stdout.close() |
| 854 | # pylint: disable=E1101 |
| 855 | self.assertEquals(expected, strip_timestamps(value)) |
| 856 | |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 857 | @staticmethod |
| 858 | def CreateGitRepo(git_import, path): |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 859 | """Do it for real.""" |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 860 | try: |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 861 | Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT, |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 862 | cwd=path).communicate() |
| 863 | except OSError: |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 864 | # git is not available, skip this test. |
| 865 | return False |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 866 | Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE, |
| 867 | stderr=STDOUT, cwd=path).communicate(input=git_import) |
| 868 | Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT, |
| 869 | cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 870 | Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 871 | stderr=STDOUT, cwd=path).communicate() |
| 872 | Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE, |
| 873 | stderr=STDOUT, cwd=path).communicate() |
| 874 | Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'], |
| 875 | stdout=PIPE, stderr=STDOUT, cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 876 | Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 877 | stderr=STDOUT, cwd=path).communicate() |
iannucci@chromium.org | 1e7187a | 2013-02-17 20:54:05 +0000 | [diff] [blame] | 878 | Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE, |
| 879 | stderr=STDOUT, cwd=path).communicate() |
| 880 | Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE, |
| 881 | stderr=STDOUT, cwd=path).communicate() |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 882 | return True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 883 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 884 | def _GetAskForDataCallback(self, expected_prompt, return_value): |
| 885 | def AskForData(prompt, options): |
| 886 | self.assertEquals(prompt, expected_prompt) |
| 887 | return return_value |
| 888 | return AskForData |
| 889 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 890 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 891 | TestCaseUtils.setUp(self) |
| 892 | unittest.TestCase.setUp(self) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 893 | self.url = 'git://foo' |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame^] | 894 | # The .git suffix allows gclient_scm to recognize the dir as a git repo |
| 895 | # when cloning it locally |
| 896 | self.root_dir = tempfile.mkdtemp('.git') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 897 | self.relpath = '.' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 898 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 899 | self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path) |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 900 | StdoutCheck.setUp(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 901 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
| 902 | self._original_SVNBinaryExists = gclient_scm.SVNWrapper.BinaryExists |
| 903 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
| 904 | gclient_scm.SVNWrapper.BinaryExists = staticmethod(lambda : True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 905 | |
| 906 | def tearDown(self): |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 907 | try: |
| 908 | rmtree(self.root_dir) |
| 909 | StdoutCheck.tearDown(self) |
| 910 | TestCaseUtils.tearDown(self) |
| 911 | unittest.TestCase.tearDown(self) |
| 912 | finally: |
| 913 | # TODO(maruel): Use auto_stub.TestCase. |
| 914 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
| 915 | gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists |
| 916 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 917 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 918 | class ManagedGitWrapperTestCase(BaseGitWrapperTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 919 | |
| 920 | def testRevertMissing(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 921 | if not self.enabled: |
| 922 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 923 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 924 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 925 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 926 | relpath=self.relpath) |
| 927 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 928 | scm.update(options, None, file_list) |
| 929 | gclient_scm.os.remove(file_path) |
| 930 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 931 | scm.revert(options, self.args, file_list) |
| 932 | self.assertEquals(file_list, [file_path]) |
| 933 | file_list = [] |
| 934 | scm.diff(options, self.args, file_list) |
| 935 | self.assertEquals(file_list, []) |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 936 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 937 | |
| 938 | def testRevertNone(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 939 | if not self.enabled: |
| 940 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 941 | options = self.Options() |
| 942 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 943 | relpath=self.relpath) |
| 944 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 945 | scm.update(options, None, file_list) |
| 946 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 947 | scm.revert(options, self.args, file_list) |
| 948 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 949 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 950 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 951 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 952 | |
| 953 | def testRevertModified(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 954 | if not self.enabled: |
| 955 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 956 | options = self.Options() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 957 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 958 | relpath=self.relpath) |
| 959 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 960 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 961 | file_path = join(self.base_path, 'a') |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 962 | open(file_path, 'a').writelines('touched\n') |
| 963 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 964 | scm.revert(options, self.args, file_list) |
| 965 | self.assertEquals(file_list, [file_path]) |
| 966 | file_list = [] |
| 967 | scm.diff(options, self.args, file_list) |
| 968 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 969 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 970 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 971 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 972 | |
| 973 | def testRevertNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 974 | if not self.enabled: |
| 975 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 976 | options = self.Options() |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 977 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 978 | relpath=self.relpath) |
| 979 | file_list = [] |
| 980 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 981 | file_path = join(self.base_path, 'c') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 982 | f = open(file_path, 'w') |
| 983 | f.writelines('new\n') |
| 984 | f.close() |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 985 | Popen(['git', 'add', 'c'], stdout=PIPE, |
| 986 | stderr=STDOUT, cwd=self.base_path).communicate() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 987 | file_list = [] |
| 988 | scm.revert(options, self.args, file_list) |
| 989 | self.assertEquals(file_list, [file_path]) |
| 990 | file_list = [] |
| 991 | scm.diff(options, self.args, file_list) |
| 992 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 993 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 994 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 995 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 996 | |
| 997 | def testStatusNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 998 | if not self.enabled: |
| 999 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1000 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1001 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1002 | open(file_path, 'a').writelines('touched\n') |
| 1003 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1004 | relpath=self.relpath) |
| 1005 | file_list = [] |
| 1006 | scm.status(options, self.args, file_list) |
| 1007 | self.assertEquals(file_list, [file_path]) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1008 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 1009 | ('running \'git diff --name-status ' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1010 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1011 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1012 | |
| 1013 | def testStatus2New(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 1014 | if not self.enabled: |
| 1015 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1016 | options = self.Options() |
| 1017 | expected_file_list = [] |
| 1018 | for f in ['a', 'b']: |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 1019 | file_path = join(self.base_path, f) |
| 1020 | open(file_path, 'a').writelines('touched\n') |
| 1021 | expected_file_list.extend([file_path]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1022 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1023 | relpath=self.relpath) |
| 1024 | file_list = [] |
| 1025 | scm.status(options, self.args, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1026 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1027 | self.assertEquals(sorted(file_list), expected_file_list) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1028 | self.checkstdout( |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 1029 | ('running \'git diff --name-status ' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1030 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1031 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1032 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1033 | def testUpdateUpdate(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 1034 | if not self.enabled: |
| 1035 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1036 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1037 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1038 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1039 | relpath=self.relpath) |
| 1040 | file_list = [] |
| 1041 | scm.update(options, (), file_list) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 1042 | self.assertEquals(file_list, expected_file_list) |
| 1043 | self.assertEquals(scm.revinfo(options, (), None), |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1044 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 1045 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1046 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 1047 | def testUpdateMerge(self): |
| 1048 | if not self.enabled: |
| 1049 | return |
| 1050 | options = self.Options() |
| 1051 | options.merge = True |
| 1052 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1053 | relpath=self.relpath) |
| 1054 | scm._Run(['checkout', '-q', 'feature'], options) |
| 1055 | rev = scm.revinfo(options, (), None) |
| 1056 | file_list = [] |
| 1057 | scm.update(options, (), file_list) |
| 1058 | self.assertEquals(file_list, [join(self.base_path, x) |
| 1059 | for x in ['a', 'b', 'c']]) |
| 1060 | # The actual commit that is created is unstable, so we verify its tree and |
| 1061 | # parents instead. |
| 1062 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
| 1063 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 1064 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^1']), rev) |
| 1065 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^2']), |
| 1066 | scm._Capture(['rev-parse', 'origin/master'])) |
| 1067 | sys.stdout.close() |
| 1068 | |
| 1069 | def testUpdateRebase(self): |
| 1070 | if not self.enabled: |
| 1071 | return |
| 1072 | options = self.Options() |
| 1073 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1074 | relpath=self.relpath) |
| 1075 | scm._Run(['checkout', '-q', 'feature'], options) |
| 1076 | file_list = [] |
| 1077 | # Fake a 'y' key press. |
| 1078 | scm._AskForData = self._GetAskForDataCallback( |
| 1079 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 1080 | '(y)es / (q)uit / (s)kip : ', 'y') |
| 1081 | scm.update(options, (), file_list) |
| 1082 | self.assertEquals(file_list, [join(self.base_path, x) |
| 1083 | for x in ['a', 'b', 'c']]) |
| 1084 | # The actual commit that is created is unstable, so we verify its tree and |
| 1085 | # parent instead. |
| 1086 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
| 1087 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 1088 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^']), |
| 1089 | scm._Capture(['rev-parse', 'origin/master'])) |
| 1090 | sys.stdout.close() |
| 1091 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1092 | def testUpdateReset(self): |
| 1093 | if not self.enabled: |
| 1094 | return |
| 1095 | options = self.Options() |
| 1096 | options.reset = True |
| 1097 | |
| 1098 | dir_path = join(self.base_path, 'c') |
| 1099 | os.mkdir(dir_path) |
| 1100 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 1101 | |
| 1102 | file_path = join(self.base_path, 'file') |
| 1103 | open(file_path, 'w').writelines('new\n') |
| 1104 | |
| 1105 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1106 | relpath=self.relpath) |
| 1107 | file_list = [] |
| 1108 | scm.update(options, (), file_list) |
| 1109 | self.assert_(gclient_scm.os.path.isdir(dir_path)) |
| 1110 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 1111 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1112 | |
| 1113 | def testUpdateResetDeleteUnversionedTrees(self): |
| 1114 | if not self.enabled: |
| 1115 | return |
| 1116 | options = self.Options() |
| 1117 | options.reset = True |
| 1118 | options.delete_unversioned_trees = True |
| 1119 | |
| 1120 | dir_path = join(self.base_path, 'dir') |
| 1121 | os.mkdir(dir_path) |
| 1122 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 1123 | |
| 1124 | file_path = join(self.base_path, 'file') |
| 1125 | open(file_path, 'w').writelines('new\n') |
| 1126 | |
| 1127 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1128 | relpath=self.relpath) |
| 1129 | file_list = [] |
| 1130 | scm.update(options, (), file_list) |
| 1131 | self.assert_(not gclient_scm.os.path.isdir(dir_path)) |
| 1132 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 1133 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1134 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 1135 | def testUpdateUnstagedConflict(self): |
| 1136 | if not self.enabled: |
| 1137 | return |
| 1138 | options = self.Options() |
| 1139 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1140 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1141 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 1142 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 1143 | try: |
| 1144 | scm.update(options, (), []) |
| 1145 | self.fail() |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 1146 | except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 1147 | # The exact exception text varies across git versions so it's not worth |
| 1148 | # verifying it. It's fine as long as it throws. |
| 1149 | pass |
| 1150 | # Manually flush stdout since we can't verify it's content accurately across |
| 1151 | # git versions. |
| 1152 | sys.stdout.getvalue() |
| 1153 | sys.stdout.close() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 1154 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1155 | def testUpdateConflict(self): |
| 1156 | if not self.enabled: |
| 1157 | return |
| 1158 | options = self.Options() |
| 1159 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1160 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 1161 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 1162 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1163 | scm._Run(['commit', '-am', 'test'], options) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 1164 | scm._AskForData = self._GetAskForDataCallback( |
| 1165 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 1166 | '(y)es / (q)uit / (s)kip : ', 'y') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1167 | exception = ('Conflict while rebasing this branch.\n' |
| 1168 | 'Fix the conflict and run gclient again.\n' |
| 1169 | 'See \'man git-rebase\' for details.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1170 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 1171 | exception = ('\n____ . at refs/remotes/origin/master\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 1172 | '\tYou have unstaged changes.\n' |
| 1173 | '\tPlease commit, stash, or reset.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1174 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 1175 | sys.stdout.close() |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1176 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 1177 | def testRevinfo(self): |
| 1178 | if not self.enabled: |
| 1179 | return |
| 1180 | options = self.Options() |
| 1181 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1182 | relpath=self.relpath) |
| 1183 | rev_info = scm.revinfo(options, (), None) |
| 1184 | self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458') |
| 1185 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1186 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1187 | class ManagedGitWrapperTestCaseMox(BaseTestCase): |
| 1188 | class OptionsObject(object): |
| 1189 | def __init__(self, verbose=False, revision=None, force=False): |
| 1190 | self.verbose = verbose |
| 1191 | self.revision = revision |
| 1192 | self.deps_os = None |
| 1193 | self.force = force |
| 1194 | self.reset = False |
| 1195 | self.nohooks = False |
| 1196 | # TODO(maruel): Test --jobs > 1. |
| 1197 | self.jobs = 1 |
| 1198 | |
| 1199 | def Options(self, *args, **kwargs): |
| 1200 | return self.OptionsObject(*args, **kwargs) |
| 1201 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1202 | def checkstdout(self, expected): |
| 1203 | value = sys.stdout.getvalue() |
| 1204 | sys.stdout.close() |
| 1205 | # pylint: disable=E1101 |
| 1206 | self.assertEquals(expected, strip_timestamps(value)) |
| 1207 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1208 | def setUp(self): |
| 1209 | BaseTestCase.setUp(self) |
| 1210 | self.fake_hash_1 = 't0ta11yf4k3' |
| 1211 | self.fake_hash_2 = '3v3nf4k3r' |
| 1212 | self.url = 'git://foo' |
maruel@chromium.org | 9717013 | 2013-05-08 14:58:34 +0000 | [diff] [blame] | 1213 | self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1214 | self.relpath = 'fake' |
| 1215 | self.base_path = os.path.join(self.root_dir, self.relpath) |
| 1216 | |
| 1217 | def tearDown(self): |
| 1218 | BaseTestCase.tearDown(self) |
| 1219 | |
| 1220 | def testGetUsableRevGit(self): |
| 1221 | # pylint: disable=E1101 |
| 1222 | options = self.Options(verbose=True) |
| 1223 | |
| 1224 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 1225 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 1226 | ).AndReturn(True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1227 | |
| 1228 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 1229 | gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes( |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1230 | ).AndReturn(False) |
| 1231 | |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1232 | gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True) |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 1233 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1234 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1235 | self.mox.ReplayAll() |
| 1236 | |
| 1237 | git_scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1238 | relpath=self.relpath) |
| 1239 | # A [fake] git sha1 with a git repo should work (this is in the case that |
| 1240 | # the LKGR gets flipped to git sha1's some day). |
| 1241 | self.assertEquals(git_scm.GetUsableRev(self.fake_hash_1, options), |
| 1242 | self.fake_hash_1) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1243 | # An SVN rev with an existing purely git repo should raise an exception. |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1244 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1245 | git_scm.GetUsableRev, '1', options) |
| 1246 | |
| 1247 | def testGetUsableRevGitSvn(self): |
| 1248 | # pylint: disable=E1101 |
| 1249 | options = self.Options() |
| 1250 | too_big = str(1e7) |
| 1251 | |
| 1252 | # Pretend like the git-svn repo's HEAD is at r2. |
| 1253 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'GetGitSvnHeadRev', True) |
| 1254 | gclient_scm.scm.GIT.GetGitSvnHeadRev(cwd=self.base_path).MultipleTimes( |
| 1255 | ).AndReturn(2) |
| 1256 | |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1257 | self.mox.StubOutWithMock( |
| 1258 | gclient_scm.scm.GIT, 'GetBlessedSha1ForSvnRev', True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1259 | # r1 -> first fake hash, r3 -> second fake hash. |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1260 | gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='1' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1261 | ).AndReturn(self.fake_hash_1) |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 1262 | gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='3' |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1263 | ).MultipleTimes().AndReturn(self.fake_hash_2) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1264 | |
| 1265 | # Ensure that we call git svn fetch if our LKGR is > the git-svn HEAD rev. |
| 1266 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'Capture', True) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1267 | gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 1268 | cwd=self.base_path).AndReturn('blah') |
| 1269 | gclient_scm.scm.GIT.Capture(['fetch'], cwd=self.base_path) |
| 1270 | gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path) |
| 1271 | error = subprocess2.CalledProcessError(1, 'cmd', '/cwd', 'stdout', 'stderr') |
| 1272 | gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 1273 | cwd=self.base_path).AndRaise(error) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1274 | gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path) |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 1275 | gclient_scm.scm.GIT.Capture(['fetch', 'origin'], cwd=self.base_path) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1276 | |
| 1277 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 1278 | gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes( |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1279 | ).AndReturn(True) |
| 1280 | |
| 1281 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 1282 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 1283 | ).AndReturn(True) |
| 1284 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=too_big |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 1285 | ).MultipleTimes(2).AndReturn(False) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1286 | |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1287 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
| 1288 | gclient_scm.os.path.isdir(self.base_path).MultipleTimes().AndReturn(True) |
| 1289 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1290 | self.mox.ReplayAll() |
| 1291 | |
| 1292 | git_svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 1293 | relpath=self.relpath) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1294 | # Without an existing checkout, this should fail. |
| 1295 | # TODO(dbeam) Fix this. http://crbug.com/109184 |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 1296 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1297 | git_svn_scm.GetUsableRev, '1', options) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1298 | # Given an SVN revision with a git-svn checkout, it should be translated to |
| 1299 | # a git sha1 and be usable. |
| 1300 | self.assertEquals(git_svn_scm.GetUsableRev('1', options), |
| 1301 | self.fake_hash_1) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 1302 | # Our fake HEAD rev is r2, so this should call git fetch and git svn fetch |
| 1303 | # to get more revs (pymox will complain if this doesn't happen). We mock an |
| 1304 | # optimized checkout the first time, so this run should call git fetch. |
| 1305 | self.assertEquals(git_svn_scm.GetUsableRev('3', options), |
| 1306 | self.fake_hash_2) |
| 1307 | # The time we pretend we're not optimized, so no git fetch should fire. |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1308 | self.assertEquals(git_svn_scm.GetUsableRev('3', options), |
| 1309 | self.fake_hash_2) |
| 1310 | # Given a git sha1 with a git-svn checkout, it should be used as is. |
| 1311 | self.assertEquals(git_svn_scm.GetUsableRev(self.fake_hash_1, options), |
| 1312 | self.fake_hash_1) |
| 1313 | # We currently check for seemingly valid SVN revisions by assuming 6 digit |
| 1314 | # numbers, so assure that numeric revs >= 1000000 don't work. |
| 1315 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 1316 | git_svn_scm.GetUsableRev, too_big, options) |
| 1317 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1318 | def testUpdateNoDotGit(self): |
| 1319 | options = self.Options() |
| 1320 | |
| 1321 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 1322 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 1323 | gclient_scm.os.path.exists(os.path.join(self.base_path, '.git') |
| 1324 | ).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1325 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True) |
| 1326 | # pylint: disable=E1120 |
| 1327 | gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url, |
| 1328 | options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1329 | self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True) |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 1330 | gclient_scm.subprocess2.check_output( |
| 1331 | ['git', 'ls-files'], cwd=self.base_path, |
| 1332 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('') |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1333 | gclient_scm.subprocess2.check_output( |
| 1334 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 1335 | cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 1336 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1337 | stderr=-1, |
| 1338 | ).AndReturn('') |
| 1339 | |
| 1340 | self.mox.ReplayAll() |
| 1341 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 1342 | relpath=self.relpath) |
| 1343 | scm.update(options, None, []) |
| 1344 | self.checkstdout('\n') |
| 1345 | |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 1346 | def testUpdateConflict(self): |
| 1347 | options = self.Options() |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1348 | |
| 1349 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 1350 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 1351 | gclient_scm.os.path.exists(os.path.join(self.base_path, '.git') |
| 1352 | ).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1353 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True) |
| 1354 | # pylint: disable=E1120 |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 1355 | gclient_scm.GitWrapper._Clone( |
| 1356 | 'refs/remotes/origin/master', self.url, options |
| 1357 | ).AndRaise(gclient_scm.subprocess2.CalledProcessError(None, None, None, |
| 1358 | None, None)) |
| 1359 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_DeleteOrMove', True) |
| 1360 | gclient_scm.GitWrapper._DeleteOrMove(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1361 | gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url, |
| 1362 | options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1363 | self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True) |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 1364 | gclient_scm.subprocess2.check_output( |
| 1365 | ['git', 'ls-files'], cwd=self.base_path, |
| 1366 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('') |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1367 | gclient_scm.subprocess2.check_output( |
| 1368 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 1369 | cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 1370 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 1371 | stderr=-1, |
| 1372 | ).AndReturn('') |
| 1373 | |
| 1374 | self.mox.ReplayAll() |
| 1375 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 1376 | relpath=self.relpath) |
| 1377 | scm.update(options, None, []) |
| 1378 | self.checkstdout('\n') |
| 1379 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1380 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1381 | class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame^] | 1382 | def checkInStdout(self, expected): |
| 1383 | value = sys.stdout.getvalue() |
| 1384 | sys.stdout.close() |
| 1385 | # pylint: disable=E1101 |
| 1386 | self.assertIn(expected, value) |
| 1387 | |
| 1388 | def checkNotInStdout(self, expected): |
| 1389 | value = sys.stdout.getvalue() |
| 1390 | sys.stdout.close() |
| 1391 | # pylint: disable=E1101 |
| 1392 | self.assertNotIn(expected, value) |
| 1393 | |
| 1394 | def getCurrentBranch(self): |
| 1395 | # Returns name of current branch or HEAD for detached HEAD |
| 1396 | branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'], |
| 1397 | cwd=self.base_path) |
| 1398 | if branch == 'HEAD': |
| 1399 | return None |
| 1400 | return branch |
| 1401 | |
| 1402 | def testUpdateClone(self): |
| 1403 | if not self.enabled: |
| 1404 | return |
| 1405 | options = self.Options() |
| 1406 | |
| 1407 | origin_root_dir = self.root_dir |
| 1408 | self.root_dir = tempfile.mkdtemp() |
| 1409 | self.relpath = '.' |
| 1410 | self.base_path = join(self.root_dir, self.relpath) |
| 1411 | |
| 1412 | scm = gclient_scm.CreateSCM(url=origin_root_dir, |
| 1413 | root_dir=self.root_dir, |
| 1414 | relpath=self.relpath) |
| 1415 | |
| 1416 | expected_file_list = [join(self.base_path, "a"), |
| 1417 | join(self.base_path, "b")] |
| 1418 | file_list = [] |
| 1419 | options.revision = 'unmanaged' |
| 1420 | scm.update(options, (), file_list) |
| 1421 | |
| 1422 | self.assertEquals(file_list, expected_file_list) |
| 1423 | self.assertEquals(scm.revinfo(options, (), None), |
| 1424 | '069c602044c5388d2d15c3f875b057c852003458') |
| 1425 | # indicates detached HEAD |
| 1426 | self.assertEquals(self.getCurrentBranch(), None) |
| 1427 | self.checkInStdout( |
| 1428 | 'Checked out refs/remotes/origin/master to a detached HEAD') |
| 1429 | |
| 1430 | rmtree(origin_root_dir) |
| 1431 | |
| 1432 | def testUpdateCloneOnCommit(self): |
| 1433 | if not self.enabled: |
| 1434 | return |
| 1435 | options = self.Options() |
| 1436 | |
| 1437 | origin_root_dir = self.root_dir |
| 1438 | self.root_dir = tempfile.mkdtemp() |
| 1439 | self.relpath = '.' |
| 1440 | self.base_path = join(self.root_dir, self.relpath) |
| 1441 | url_with_commit_ref = origin_root_dir +\ |
| 1442 | '@a7142dc9f0009350b96a11f372b6ea658592aa95' |
| 1443 | |
| 1444 | scm = gclient_scm.CreateSCM(url=url_with_commit_ref, |
| 1445 | root_dir=self.root_dir, |
| 1446 | relpath=self.relpath) |
| 1447 | |
| 1448 | expected_file_list = [join(self.base_path, "a"), |
| 1449 | join(self.base_path, "b")] |
| 1450 | file_list = [] |
| 1451 | options.revision = 'unmanaged' |
| 1452 | scm.update(options, (), file_list) |
| 1453 | |
| 1454 | self.assertEquals(file_list, expected_file_list) |
| 1455 | self.assertEquals(scm.revinfo(options, (), None), |
| 1456 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
| 1457 | # indicates detached HEAD |
| 1458 | self.assertEquals(self.getCurrentBranch(), None) |
| 1459 | self.checkInStdout( |
| 1460 | 'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD') |
| 1461 | |
| 1462 | rmtree(origin_root_dir) |
| 1463 | |
| 1464 | def testUpdateCloneOnBranch(self): |
| 1465 | if not self.enabled: |
| 1466 | return |
| 1467 | options = self.Options() |
| 1468 | |
| 1469 | origin_root_dir = self.root_dir |
| 1470 | self.root_dir = tempfile.mkdtemp() |
| 1471 | self.relpath = '.' |
| 1472 | self.base_path = join(self.root_dir, self.relpath) |
| 1473 | url_with_branch_ref = origin_root_dir + '@feature' |
| 1474 | |
| 1475 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 1476 | root_dir=self.root_dir, |
| 1477 | relpath=self.relpath) |
| 1478 | |
| 1479 | expected_file_list = [join(self.base_path, "a"), |
| 1480 | join(self.base_path, "b"), |
| 1481 | join(self.base_path, "c")] |
| 1482 | file_list = [] |
| 1483 | options.revision = 'unmanaged' |
| 1484 | scm.update(options, (), file_list) |
| 1485 | |
| 1486 | self.assertEquals(file_list, expected_file_list) |
| 1487 | self.assertEquals(scm.revinfo(options, (), None), |
| 1488 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
| 1489 | self.assertEquals(self.getCurrentBranch(), 'feature') |
| 1490 | self.checkNotInStdout('Checked out feature to a detached HEAD') |
| 1491 | |
| 1492 | rmtree(origin_root_dir) |
| 1493 | |
| 1494 | def testUpdateCloneOnDetachedBranch(self): |
| 1495 | if not self.enabled: |
| 1496 | return |
| 1497 | options = self.Options() |
| 1498 | |
| 1499 | origin_root_dir = self.root_dir |
| 1500 | self.root_dir = tempfile.mkdtemp() |
| 1501 | self.relpath = '.' |
| 1502 | self.base_path = join(self.root_dir, self.relpath) |
| 1503 | url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature' |
| 1504 | |
| 1505 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 1506 | root_dir=self.root_dir, |
| 1507 | relpath=self.relpath) |
| 1508 | |
| 1509 | expected_file_list = [join(self.base_path, "a"), |
| 1510 | join(self.base_path, "b"), |
| 1511 | join(self.base_path, "c")] |
| 1512 | file_list = [] |
| 1513 | options.revision = 'unmanaged' |
| 1514 | scm.update(options, (), file_list) |
| 1515 | |
| 1516 | self.assertEquals(file_list, expected_file_list) |
| 1517 | self.assertEquals(scm.revinfo(options, (), None), |
| 1518 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
| 1519 | # indicates detached HEAD |
| 1520 | self.assertEquals(self.getCurrentBranch(), None) |
| 1521 | self.checkInStdout( |
| 1522 | 'Checked out refs/remotes/origin/feature to a detached HEAD') |
| 1523 | |
| 1524 | rmtree(origin_root_dir) |
| 1525 | |
| 1526 | def testUpdateCloneOnBranchHead(self): |
| 1527 | if not self.enabled: |
| 1528 | return |
| 1529 | options = self.Options() |
| 1530 | |
| 1531 | origin_root_dir = self.root_dir |
| 1532 | self.root_dir = tempfile.mkdtemp() |
| 1533 | self.relpath = '.' |
| 1534 | self.base_path = join(self.root_dir, self.relpath) |
| 1535 | url_with_branch_ref = origin_root_dir + '@refs/heads/feature' |
| 1536 | |
| 1537 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 1538 | root_dir=self.root_dir, |
| 1539 | relpath=self.relpath) |
| 1540 | |
| 1541 | expected_file_list = [join(self.base_path, "a"), |
| 1542 | join(self.base_path, "b"), |
| 1543 | join(self.base_path, "c")] |
| 1544 | file_list = [] |
| 1545 | options.revision = 'unmanaged' |
| 1546 | scm.update(options, (), file_list) |
| 1547 | |
| 1548 | self.assertEquals(file_list, expected_file_list) |
| 1549 | self.assertEquals(scm.revinfo(options, (), None), |
| 1550 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
| 1551 | self.assertEquals(self.getCurrentBranch(), 'feature') |
| 1552 | self.checkNotInStdout( |
| 1553 | 'Checked out refs/heads/feature to a detached HEAD') |
| 1554 | |
| 1555 | rmtree(origin_root_dir) |
| 1556 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1557 | def testUpdateUpdate(self): |
| 1558 | if not self.enabled: |
| 1559 | return |
| 1560 | options = self.Options() |
| 1561 | expected_file_list = [] |
| 1562 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 1563 | relpath=self.relpath) |
| 1564 | file_list = [] |
| 1565 | options.revision = 'unmanaged' |
| 1566 | scm.update(options, (), file_list) |
| 1567 | self.assertEquals(file_list, expected_file_list) |
| 1568 | self.assertEquals(scm.revinfo(options, (), None), |
| 1569 | '069c602044c5388d2d15c3f875b057c852003458') |
| 1570 | self.checkstdout('________ unmanaged solution; skipping .\n') |
| 1571 | |
| 1572 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1573 | if __name__ == '__main__': |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 1574 | if '-v' in sys.argv: |
| 1575 | logging.basicConfig( |
| 1576 | level=logging.DEBUG, |
| 1577 | format='%(asctime).19s %(levelname)s %(filename)s:' |
| 1578 | '%(lineno)s %(message)s') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1579 | unittest.main() |
| 1580 | |
| 1581 | # vim: ts=2:sw=2:tw=80:et: |