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