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 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 118 | class BaseGitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils, |
| 119 | unittest.TestCase): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 120 | """This class doesn't use pymox.""" |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 121 | class OptionsObject(object): |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 122 | def __init__(self, verbose=False, revision=None): |
dnj@chromium.org | 5b23e87 | 2015-02-20 21:25:57 +0000 | [diff] [blame] | 123 | self.auto_rebase = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 124 | self.verbose = verbose |
| 125 | self.revision = revision |
| 126 | self.manually_grab_svn_rev = True |
| 127 | self.deps_os = None |
| 128 | self.force = False |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 129 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 130 | self.nohooks = False |
primiano@chromium.org | 5439ea5 | 2014-08-06 17:18:18 +0000 | [diff] [blame] | 131 | self.no_history = False |
iannucci@chromium.org | d4fffee | 2013-06-28 00:35:26 +0000 | [diff] [blame] | 132 | self.upstream = False |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 133 | self.cache_dir = None |
bauerb@chromium.org | 4dd0937 | 2011-07-22 14:41:51 +0000 | [diff] [blame] | 134 | self.merge = False |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 135 | self.jobs = 1 |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 136 | self.delete_unversioned_trees = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 137 | |
| 138 | sample_git_import = """blob |
| 139 | mark :1 |
| 140 | data 6 |
| 141 | Hello |
| 142 | |
| 143 | blob |
| 144 | mark :2 |
| 145 | data 4 |
| 146 | Bye |
| 147 | |
| 148 | reset refs/heads/master |
| 149 | commit refs/heads/master |
| 150 | mark :3 |
| 151 | author Bob <bob@example.com> 1253744361 -0700 |
| 152 | committer Bob <bob@example.com> 1253744361 -0700 |
| 153 | data 8 |
| 154 | A and B |
| 155 | M 100644 :1 a |
| 156 | M 100644 :2 b |
| 157 | |
| 158 | blob |
| 159 | mark :4 |
| 160 | data 10 |
| 161 | Hello |
| 162 | You |
| 163 | |
| 164 | blob |
| 165 | mark :5 |
| 166 | data 8 |
| 167 | Bye |
| 168 | You |
| 169 | |
| 170 | commit refs/heads/origin |
| 171 | mark :6 |
| 172 | author Alice <alice@example.com> 1253744424 -0700 |
| 173 | committer Alice <alice@example.com> 1253744424 -0700 |
| 174 | data 13 |
| 175 | Personalized |
| 176 | from :3 |
| 177 | M 100644 :4 a |
| 178 | M 100644 :5 b |
| 179 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 180 | blob |
| 181 | mark :7 |
| 182 | data 5 |
| 183 | Mooh |
| 184 | |
| 185 | commit refs/heads/feature |
| 186 | mark :8 |
| 187 | author Bob <bob@example.com> 1390311986 -0000 |
| 188 | committer Bob <bob@example.com> 1390311986 -0000 |
| 189 | data 6 |
| 190 | Add C |
| 191 | from :3 |
| 192 | M 100644 :7 c |
| 193 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 194 | reset refs/heads/master |
| 195 | from :3 |
| 196 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 197 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 198 | return self.OptionsObject(*args, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 199 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 200 | def checkstdout(self, expected): |
| 201 | value = sys.stdout.getvalue() |
| 202 | sys.stdout.close() |
| 203 | # pylint: disable=E1101 |
| 204 | self.assertEquals(expected, strip_timestamps(value)) |
| 205 | |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 206 | @staticmethod |
| 207 | def CreateGitRepo(git_import, path): |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 208 | """Do it for real.""" |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 209 | try: |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 210 | Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT, |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 211 | cwd=path).communicate() |
| 212 | except OSError: |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 213 | # git is not available, skip this test. |
| 214 | return False |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 215 | Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE, |
| 216 | stderr=STDOUT, cwd=path).communicate(input=git_import) |
| 217 | Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT, |
| 218 | cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 219 | Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 220 | stderr=STDOUT, cwd=path).communicate() |
| 221 | Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE, |
| 222 | stderr=STDOUT, cwd=path).communicate() |
| 223 | Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'], |
| 224 | stdout=PIPE, stderr=STDOUT, cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 225 | Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 226 | stderr=STDOUT, cwd=path).communicate() |
iannucci@chromium.org | 1e7187a | 2013-02-17 20:54:05 +0000 | [diff] [blame] | 227 | Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE, |
| 228 | stderr=STDOUT, cwd=path).communicate() |
| 229 | Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE, |
| 230 | stderr=STDOUT, cwd=path).communicate() |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 231 | return True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 232 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 233 | def _GetAskForDataCallback(self, expected_prompt, return_value): |
| 234 | def AskForData(prompt, options): |
| 235 | self.assertEquals(prompt, expected_prompt) |
| 236 | return return_value |
| 237 | return AskForData |
| 238 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 239 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 240 | TestCaseUtils.setUp(self) |
| 241 | unittest.TestCase.setUp(self) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 242 | self.url = 'git://foo' |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 243 | # The .git suffix allows gclient_scm to recognize the dir as a git repo |
| 244 | # when cloning it locally |
| 245 | self.root_dir = tempfile.mkdtemp('.git') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 246 | self.relpath = '.' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 247 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 248 | self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path) |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 249 | StdoutCheck.setUp(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 250 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
| 251 | self._original_SVNBinaryExists = gclient_scm.SVNWrapper.BinaryExists |
| 252 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
| 253 | gclient_scm.SVNWrapper.BinaryExists = staticmethod(lambda : True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 254 | |
| 255 | def tearDown(self): |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 256 | try: |
| 257 | rmtree(self.root_dir) |
| 258 | StdoutCheck.tearDown(self) |
| 259 | TestCaseUtils.tearDown(self) |
| 260 | unittest.TestCase.tearDown(self) |
| 261 | finally: |
| 262 | # TODO(maruel): Use auto_stub.TestCase. |
| 263 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
| 264 | gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists |
| 265 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 266 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 267 | class ManagedGitWrapperTestCase(BaseGitWrapperTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 268 | |
| 269 | def testRevertMissing(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 270 | if not self.enabled: |
| 271 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 272 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 273 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 274 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 275 | relpath=self.relpath) |
| 276 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 277 | scm.update(options, None, file_list) |
| 278 | gclient_scm.os.remove(file_path) |
| 279 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 280 | scm.revert(options, self.args, file_list) |
| 281 | self.assertEquals(file_list, [file_path]) |
| 282 | file_list = [] |
| 283 | scm.diff(options, self.args, file_list) |
| 284 | self.assertEquals(file_list, []) |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 285 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 286 | |
| 287 | def testRevertNone(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 288 | if not self.enabled: |
| 289 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 290 | options = self.Options() |
| 291 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 292 | relpath=self.relpath) |
| 293 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 294 | scm.update(options, None, file_list) |
| 295 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 296 | scm.revert(options, self.args, file_list) |
| 297 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 298 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 299 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 300 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 301 | |
| 302 | def testRevertModified(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 303 | if not self.enabled: |
| 304 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 305 | options = self.Options() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 306 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 307 | relpath=self.relpath) |
| 308 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 309 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 310 | file_path = join(self.base_path, 'a') |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 311 | open(file_path, 'a').writelines('touched\n') |
| 312 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 313 | scm.revert(options, self.args, file_list) |
| 314 | self.assertEquals(file_list, [file_path]) |
| 315 | file_list = [] |
| 316 | scm.diff(options, self.args, file_list) |
| 317 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 318 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 319 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 320 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 321 | |
| 322 | def testRevertNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 323 | if not self.enabled: |
| 324 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 325 | options = self.Options() |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 326 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 327 | relpath=self.relpath) |
| 328 | file_list = [] |
| 329 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 330 | file_path = join(self.base_path, 'c') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 331 | f = open(file_path, 'w') |
| 332 | f.writelines('new\n') |
| 333 | f.close() |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 334 | Popen(['git', 'add', 'c'], stdout=PIPE, |
| 335 | stderr=STDOUT, cwd=self.base_path).communicate() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 336 | file_list = [] |
| 337 | scm.revert(options, self.args, file_list) |
| 338 | self.assertEquals(file_list, [file_path]) |
| 339 | file_list = [] |
| 340 | scm.diff(options, self.args, file_list) |
| 341 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 342 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 343 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 344 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 345 | |
| 346 | def testStatusNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 347 | if not self.enabled: |
| 348 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 349 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 350 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 351 | open(file_path, 'a').writelines('touched\n') |
| 352 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 353 | relpath=self.relpath) |
| 354 | file_list = [] |
| 355 | scm.status(options, self.args, file_list) |
| 356 | self.assertEquals(file_list, [file_path]) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 357 | self.checkstdout( |
sbc@chromium.org | 2cd0b8e | 2014-09-22 21:17:59 +0000 | [diff] [blame] | 358 | ('\n________ running \'git diff --name-status ' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 359 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 360 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 361 | |
| 362 | def testStatus2New(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 363 | if not self.enabled: |
| 364 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 365 | options = self.Options() |
| 366 | expected_file_list = [] |
| 367 | for f in ['a', 'b']: |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 368 | file_path = join(self.base_path, f) |
| 369 | open(file_path, 'a').writelines('touched\n') |
| 370 | expected_file_list.extend([file_path]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 371 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 372 | relpath=self.relpath) |
| 373 | file_list = [] |
| 374 | scm.status(options, self.args, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 375 | 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] | 376 | self.assertEquals(sorted(file_list), expected_file_list) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 377 | self.checkstdout( |
sbc@chromium.org | 2cd0b8e | 2014-09-22 21:17:59 +0000 | [diff] [blame] | 378 | ('\n________ running \'git diff --name-status ' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 379 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 380 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 381 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 382 | def testUpdateUpdate(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 383 | if not self.enabled: |
| 384 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 385 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 386 | 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] | 387 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 388 | relpath=self.relpath) |
| 389 | file_list = [] |
| 390 | scm.update(options, (), file_list) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 391 | self.assertEquals(file_list, expected_file_list) |
| 392 | self.assertEquals(scm.revinfo(options, (), None), |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 393 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 394 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 395 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 396 | def testUpdateMerge(self): |
| 397 | if not self.enabled: |
| 398 | return |
| 399 | options = self.Options() |
| 400 | options.merge = True |
| 401 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 402 | relpath=self.relpath) |
| 403 | scm._Run(['checkout', '-q', 'feature'], options) |
| 404 | rev = scm.revinfo(options, (), None) |
| 405 | file_list = [] |
| 406 | scm.update(options, (), file_list) |
| 407 | self.assertEquals(file_list, [join(self.base_path, x) |
| 408 | for x in ['a', 'b', 'c']]) |
| 409 | # The actual commit that is created is unstable, so we verify its tree and |
| 410 | # parents instead. |
| 411 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
| 412 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 413 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^1']), rev) |
| 414 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^2']), |
| 415 | scm._Capture(['rev-parse', 'origin/master'])) |
| 416 | sys.stdout.close() |
| 417 | |
| 418 | def testUpdateRebase(self): |
| 419 | if not self.enabled: |
| 420 | return |
| 421 | options = self.Options() |
| 422 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 423 | relpath=self.relpath) |
| 424 | scm._Run(['checkout', '-q', 'feature'], options) |
| 425 | file_list = [] |
| 426 | # Fake a 'y' key press. |
| 427 | scm._AskForData = self._GetAskForDataCallback( |
| 428 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 429 | '(y)es / (q)uit / (s)kip : ', 'y') |
| 430 | scm.update(options, (), file_list) |
| 431 | self.assertEquals(file_list, [join(self.base_path, x) |
| 432 | for x in ['a', 'b', 'c']]) |
| 433 | # The actual commit that is created is unstable, so we verify its tree and |
| 434 | # parent instead. |
| 435 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
| 436 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 437 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^']), |
| 438 | scm._Capture(['rev-parse', 'origin/master'])) |
| 439 | sys.stdout.close() |
| 440 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 441 | def testUpdateReset(self): |
| 442 | if not self.enabled: |
| 443 | return |
| 444 | options = self.Options() |
| 445 | options.reset = True |
| 446 | |
| 447 | dir_path = join(self.base_path, 'c') |
| 448 | os.mkdir(dir_path) |
| 449 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 450 | |
| 451 | file_path = join(self.base_path, 'file') |
| 452 | open(file_path, 'w').writelines('new\n') |
| 453 | |
| 454 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 455 | relpath=self.relpath) |
| 456 | file_list = [] |
| 457 | scm.update(options, (), file_list) |
| 458 | self.assert_(gclient_scm.os.path.isdir(dir_path)) |
| 459 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 460 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 461 | |
| 462 | def testUpdateResetDeleteUnversionedTrees(self): |
| 463 | if not self.enabled: |
| 464 | return |
| 465 | options = self.Options() |
| 466 | options.reset = True |
| 467 | options.delete_unversioned_trees = True |
| 468 | |
| 469 | dir_path = join(self.base_path, 'dir') |
| 470 | os.mkdir(dir_path) |
| 471 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 472 | |
| 473 | file_path = join(self.base_path, 'file') |
| 474 | open(file_path, 'w').writelines('new\n') |
| 475 | |
| 476 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 477 | relpath=self.relpath) |
| 478 | file_list = [] |
| 479 | scm.update(options, (), file_list) |
| 480 | self.assert_(not gclient_scm.os.path.isdir(dir_path)) |
| 481 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 482 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 483 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 484 | def testUpdateUnstagedConflict(self): |
| 485 | if not self.enabled: |
| 486 | return |
| 487 | options = self.Options() |
| 488 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 489 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 490 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 491 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 492 | try: |
| 493 | scm.update(options, (), []) |
| 494 | self.fail() |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 495 | except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 496 | # The exact exception text varies across git versions so it's not worth |
| 497 | # verifying it. It's fine as long as it throws. |
| 498 | pass |
| 499 | # Manually flush stdout since we can't verify it's content accurately across |
| 500 | # git versions. |
| 501 | sys.stdout.getvalue() |
| 502 | sys.stdout.close() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 503 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 504 | def testUpdateConflict(self): |
| 505 | if not self.enabled: |
| 506 | return |
| 507 | options = self.Options() |
| 508 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 509 | relpath=self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 510 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 511 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 512 | scm._Run(['commit', '-am', 'test'], options) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 513 | scm._AskForData = self._GetAskForDataCallback( |
| 514 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 515 | '(y)es / (q)uit / (s)kip : ', 'y') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 516 | exception = ('Conflict while rebasing this branch.\n' |
| 517 | 'Fix the conflict and run gclient again.\n' |
| 518 | 'See \'man git-rebase\' for details.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 519 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 520 | exception = ('\n____ . at refs/remotes/origin/master\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 521 | '\tYou have unstaged changes.\n' |
| 522 | '\tPlease commit, stash, or reset.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 523 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 524 | sys.stdout.close() |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 525 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 526 | def testRevinfo(self): |
| 527 | if not self.enabled: |
| 528 | return |
| 529 | options = self.Options() |
| 530 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 531 | relpath=self.relpath) |
| 532 | rev_info = scm.revinfo(options, (), None) |
| 533 | self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458') |
| 534 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 535 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 536 | class ManagedGitWrapperTestCaseMox(BaseTestCase): |
| 537 | class OptionsObject(object): |
| 538 | def __init__(self, verbose=False, revision=None, force=False): |
| 539 | self.verbose = verbose |
| 540 | self.revision = revision |
| 541 | self.deps_os = None |
| 542 | self.force = force |
| 543 | self.reset = False |
| 544 | self.nohooks = False |
| 545 | # TODO(maruel): Test --jobs > 1. |
| 546 | self.jobs = 1 |
| 547 | |
| 548 | def Options(self, *args, **kwargs): |
| 549 | return self.OptionsObject(*args, **kwargs) |
| 550 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 551 | def checkstdout(self, expected): |
| 552 | value = sys.stdout.getvalue() |
primiano@chromium.org | 5439ea5 | 2014-08-06 17:18:18 +0000 | [diff] [blame] | 553 | sys.stdout.close() |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 554 | # pylint: disable=E1101 |
| 555 | self.assertEquals(expected, strip_timestamps(value)) |
| 556 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 557 | def setUp(self): |
| 558 | BaseTestCase.setUp(self) |
| 559 | self.fake_hash_1 = 't0ta11yf4k3' |
| 560 | self.fake_hash_2 = '3v3nf4k3r' |
| 561 | self.url = 'git://foo' |
maruel@chromium.org | 9717013 | 2013-05-08 14:58:34 +0000 | [diff] [blame] | 562 | self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 563 | self.relpath = 'fake' |
| 564 | self.base_path = os.path.join(self.root_dir, self.relpath) |
primiano@chromium.org | 1c12738 | 2015-02-17 11:15:40 +0000 | [diff] [blame] | 565 | self.backup_base_path = os.path.join(self.root_dir, |
| 566 | 'old_%s.git' % self.relpath) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 567 | |
| 568 | def tearDown(self): |
| 569 | BaseTestCase.tearDown(self) |
| 570 | |
| 571 | def testGetUsableRevGit(self): |
| 572 | # pylint: disable=E1101 |
| 573 | options = self.Options(verbose=True) |
| 574 | |
| 575 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 576 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 577 | ).AndReturn(True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 578 | |
| 579 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 580 | gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes( |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 581 | ).AndReturn(False) |
| 582 | |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 583 | gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True) |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 584 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 585 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 586 | self.mox.ReplayAll() |
| 587 | |
| 588 | git_scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 589 | relpath=self.relpath) |
| 590 | # A [fake] git sha1 with a git repo should work (this is in the case that |
| 591 | # the LKGR gets flipped to git sha1's some day). |
| 592 | self.assertEquals(git_scm.GetUsableRev(self.fake_hash_1, options), |
| 593 | self.fake_hash_1) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 594 | # 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] | 595 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 596 | git_scm.GetUsableRev, '1', options) |
| 597 | |
| 598 | def testGetUsableRevGitSvn(self): |
| 599 | # pylint: disable=E1101 |
| 600 | options = self.Options() |
| 601 | too_big = str(1e7) |
| 602 | |
| 603 | # Pretend like the git-svn repo's HEAD is at r2. |
| 604 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'GetGitSvnHeadRev', True) |
| 605 | gclient_scm.scm.GIT.GetGitSvnHeadRev(cwd=self.base_path).MultipleTimes( |
| 606 | ).AndReturn(2) |
| 607 | |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 608 | self.mox.StubOutWithMock( |
| 609 | gclient_scm.scm.GIT, 'GetBlessedSha1ForSvnRev', True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 610 | # r1 -> first fake hash, r3 -> second fake hash. |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 611 | gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='1' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 612 | ).AndReturn(self.fake_hash_1) |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 613 | gclient_scm.scm.GIT.GetBlessedSha1ForSvnRev(cwd=self.base_path, rev='3' |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 614 | ).MultipleTimes().AndReturn(self.fake_hash_2) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 615 | |
| 616 | # 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] | 617 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Fetch', True) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 618 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'Capture', True) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 619 | gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 620 | cwd=self.base_path).AndReturn('blah') |
dnj@chromium.org | 680f217 | 2014-06-25 00:39:32 +0000 | [diff] [blame] | 621 | # pylint: disable=E1120 |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 622 | gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path) |
| 623 | error = subprocess2.CalledProcessError(1, 'cmd', '/cwd', 'stdout', 'stderr') |
| 624 | gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 625 | cwd=self.base_path).AndRaise(error) |
dnj@chromium.org | 680f217 | 2014-06-25 00:39:32 +0000 | [diff] [blame] | 626 | gclient_scm.GitWrapper._Fetch(options) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 627 | gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path) |
smut@google.com | d33eab3 | 2014-07-07 19:35:18 +0000 | [diff] [blame] | 628 | gclient_scm.GitWrapper._Fetch(options) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 629 | |
| 630 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True) |
szager@chromium.org | 6c2b49d | 2014-02-26 23:57:38 +0000 | [diff] [blame] | 631 | gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes( |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 632 | ).AndReturn(True) |
| 633 | |
| 634 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 635 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 636 | ).AndReturn(True) |
| 637 | 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] | 638 | ).MultipleTimes(2).AndReturn(False) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 639 | |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 640 | gclient_scm.os.path.isdir(self.base_path).AndReturn(False) |
| 641 | gclient_scm.os.path.isdir(self.base_path).MultipleTimes().AndReturn(True) |
| 642 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 643 | self.mox.ReplayAll() |
| 644 | |
| 645 | git_svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 646 | relpath=self.relpath) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 647 | # Without an existing checkout, this should fail. |
| 648 | # TODO(dbeam) Fix this. http://crbug.com/109184 |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 649 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 650 | git_svn_scm.GetUsableRev, '1', options) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 651 | # Given an SVN revision with a git-svn checkout, it should be translated to |
| 652 | # a git sha1 and be usable. |
| 653 | self.assertEquals(git_svn_scm.GetUsableRev('1', options), |
| 654 | self.fake_hash_1) |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 655 | # Our fake HEAD rev is r2, so this should call git fetch and git svn fetch |
| 656 | # to get more revs (pymox will complain if this doesn't happen). We mock an |
| 657 | # optimized checkout the first time, so this run should call git fetch. |
| 658 | self.assertEquals(git_svn_scm.GetUsableRev('3', options), |
| 659 | self.fake_hash_2) |
| 660 | # 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] | 661 | self.assertEquals(git_svn_scm.GetUsableRev('3', options), |
| 662 | self.fake_hash_2) |
| 663 | # Given a git sha1 with a git-svn checkout, it should be used as is. |
| 664 | self.assertEquals(git_svn_scm.GetUsableRev(self.fake_hash_1, options), |
| 665 | self.fake_hash_1) |
| 666 | # We currently check for seemingly valid SVN revisions by assuming 6 digit |
| 667 | # numbers, so assure that numeric revs >= 1000000 don't work. |
| 668 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 669 | git_svn_scm.GetUsableRev, too_big, options) |
| 670 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 671 | def testUpdateNoDotGit(self): |
| 672 | options = self.Options() |
| 673 | |
szager@chromium.org | 8a13970 | 2014-06-20 15:55:01 +0000 | [diff] [blame] | 674 | gclient_scm.os.path.isdir( |
| 675 | os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False) |
primiano@chromium.org | 1c12738 | 2015-02-17 11:15:40 +0000 | [diff] [blame] | 676 | gclient_scm.os.path.exists(self.backup_base_path).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 677 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 678 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 679 | gclient_scm.os.path.exists(os.path.join(self.base_path, '.git') |
| 680 | ).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 681 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True) |
| 682 | # pylint: disable=E1120 |
| 683 | gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url, |
| 684 | options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 685 | self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True) |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 686 | gclient_scm.subprocess2.check_output( |
| 687 | ['git', 'ls-files'], cwd=self.base_path, |
| 688 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('') |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 689 | gclient_scm.subprocess2.check_output( |
| 690 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 691 | cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 692 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 693 | stderr=-1, |
| 694 | ).AndReturn('') |
| 695 | |
| 696 | self.mox.ReplayAll() |
| 697 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 698 | relpath=self.relpath) |
| 699 | scm.update(options, None, []) |
| 700 | self.checkstdout('\n') |
| 701 | |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 702 | def testUpdateConflict(self): |
| 703 | options = self.Options() |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 704 | |
szager@chromium.org | 8a13970 | 2014-06-20 15:55:01 +0000 | [diff] [blame] | 705 | gclient_scm.os.path.isdir( |
| 706 | os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False) |
primiano@chromium.org | 1c12738 | 2015-02-17 11:15:40 +0000 | [diff] [blame] | 707 | gclient_scm.os.path.exists(self.backup_base_path).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 708 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 709 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 710 | gclient_scm.os.path.exists(os.path.join(self.base_path, '.git') |
| 711 | ).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 712 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True) |
| 713 | # pylint: disable=E1120 |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 714 | gclient_scm.GitWrapper._Clone( |
| 715 | 'refs/remotes/origin/master', self.url, options |
| 716 | ).AndRaise(gclient_scm.subprocess2.CalledProcessError(None, None, None, |
| 717 | None, None)) |
| 718 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_DeleteOrMove', True) |
| 719 | gclient_scm.GitWrapper._DeleteOrMove(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 720 | gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url, |
| 721 | options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 722 | self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True) |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 723 | gclient_scm.subprocess2.check_output( |
| 724 | ['git', 'ls-files'], cwd=self.base_path, |
| 725 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('') |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 726 | gclient_scm.subprocess2.check_output( |
| 727 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 728 | cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 729 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 730 | stderr=-1, |
| 731 | ).AndReturn('') |
| 732 | |
| 733 | self.mox.ReplayAll() |
| 734 | scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir, |
| 735 | relpath=self.relpath) |
| 736 | scm.update(options, None, []) |
| 737 | self.checkstdout('\n') |
| 738 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 739 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 740 | class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 741 | def checkInStdout(self, expected): |
| 742 | value = sys.stdout.getvalue() |
| 743 | sys.stdout.close() |
| 744 | # pylint: disable=E1101 |
| 745 | self.assertIn(expected, value) |
| 746 | |
| 747 | def checkNotInStdout(self, expected): |
| 748 | value = sys.stdout.getvalue() |
| 749 | sys.stdout.close() |
| 750 | # pylint: disable=E1101 |
| 751 | self.assertNotIn(expected, value) |
| 752 | |
smut@google.com | 27c9c8a | 2014-09-11 19:57:55 +0000 | [diff] [blame] | 753 | def getCurrentBranch(self): |
| 754 | # Returns name of current branch or HEAD for detached HEAD |
| 755 | branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'], |
| 756 | cwd=self.base_path) |
| 757 | if branch == 'HEAD': |
| 758 | return None |
| 759 | return branch |
| 760 | |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 761 | def testUpdateClone(self): |
| 762 | if not self.enabled: |
| 763 | return |
| 764 | options = self.Options() |
| 765 | |
| 766 | origin_root_dir = self.root_dir |
| 767 | self.root_dir = tempfile.mkdtemp() |
| 768 | self.relpath = '.' |
| 769 | self.base_path = join(self.root_dir, self.relpath) |
| 770 | |
| 771 | scm = gclient_scm.CreateSCM(url=origin_root_dir, |
| 772 | root_dir=self.root_dir, |
| 773 | relpath=self.relpath) |
| 774 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 775 | expected_file_list = [join(self.base_path, "a"), |
| 776 | join(self.base_path, "b")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 777 | file_list = [] |
| 778 | options.revision = 'unmanaged' |
| 779 | scm.update(options, (), file_list) |
| 780 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 781 | self.assertEquals(file_list, expected_file_list) |
| 782 | self.assertEquals(scm.revinfo(options, (), None), |
| 783 | '069c602044c5388d2d15c3f875b057c852003458') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 784 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 785 | self.assertEquals(self.getCurrentBranch(), None) |
| 786 | self.checkInStdout( |
| 787 | 'Checked out refs/remotes/origin/master to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 788 | |
| 789 | rmtree(origin_root_dir) |
| 790 | |
| 791 | def testUpdateCloneOnCommit(self): |
| 792 | if not self.enabled: |
| 793 | return |
| 794 | options = self.Options() |
| 795 | |
| 796 | origin_root_dir = self.root_dir |
| 797 | self.root_dir = tempfile.mkdtemp() |
| 798 | self.relpath = '.' |
| 799 | self.base_path = join(self.root_dir, self.relpath) |
| 800 | url_with_commit_ref = origin_root_dir +\ |
| 801 | '@a7142dc9f0009350b96a11f372b6ea658592aa95' |
| 802 | |
| 803 | scm = gclient_scm.CreateSCM(url=url_with_commit_ref, |
| 804 | root_dir=self.root_dir, |
| 805 | relpath=self.relpath) |
| 806 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 807 | expected_file_list = [join(self.base_path, "a"), |
| 808 | join(self.base_path, "b")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 809 | file_list = [] |
| 810 | options.revision = 'unmanaged' |
| 811 | scm.update(options, (), file_list) |
| 812 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 813 | self.assertEquals(file_list, expected_file_list) |
| 814 | self.assertEquals(scm.revinfo(options, (), None), |
| 815 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 816 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 817 | self.assertEquals(self.getCurrentBranch(), None) |
| 818 | self.checkInStdout( |
| 819 | 'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 820 | |
| 821 | rmtree(origin_root_dir) |
| 822 | |
| 823 | def testUpdateCloneOnBranch(self): |
| 824 | if not self.enabled: |
| 825 | return |
| 826 | options = self.Options() |
| 827 | |
| 828 | origin_root_dir = self.root_dir |
| 829 | self.root_dir = tempfile.mkdtemp() |
| 830 | self.relpath = '.' |
| 831 | self.base_path = join(self.root_dir, self.relpath) |
| 832 | url_with_branch_ref = origin_root_dir + '@feature' |
| 833 | |
| 834 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 835 | root_dir=self.root_dir, |
| 836 | relpath=self.relpath) |
| 837 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 838 | expected_file_list = [join(self.base_path, "a"), |
| 839 | join(self.base_path, "b"), |
| 840 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 841 | file_list = [] |
| 842 | options.revision = 'unmanaged' |
| 843 | scm.update(options, (), file_list) |
| 844 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 845 | self.assertEquals(file_list, expected_file_list) |
| 846 | self.assertEquals(scm.revinfo(options, (), None), |
| 847 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
| 848 | self.assertEquals(self.getCurrentBranch(), 'feature') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 849 | self.checkNotInStdout('Checked out feature to a detached HEAD') |
| 850 | |
| 851 | rmtree(origin_root_dir) |
| 852 | |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 853 | def testUpdateCloneOnFetchedRemoteBranch(self): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 854 | if not self.enabled: |
| 855 | return |
| 856 | options = self.Options() |
| 857 | |
| 858 | origin_root_dir = self.root_dir |
| 859 | self.root_dir = tempfile.mkdtemp() |
| 860 | self.relpath = '.' |
| 861 | self.base_path = join(self.root_dir, self.relpath) |
| 862 | url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature' |
| 863 | |
| 864 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 865 | root_dir=self.root_dir, |
| 866 | relpath=self.relpath) |
| 867 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 868 | expected_file_list = [join(self.base_path, "a"), |
| 869 | join(self.base_path, "b"), |
| 870 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 871 | file_list = [] |
| 872 | options.revision = 'unmanaged' |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 873 | scm.update(options, (), file_list) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 874 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 875 | self.assertEquals(file_list, expected_file_list) |
| 876 | self.assertEquals(scm.revinfo(options, (), None), |
| 877 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 878 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 879 | self.assertEquals(self.getCurrentBranch(), None) |
| 880 | self.checkInStdout( |
| 881 | 'Checked out refs/remotes/origin/feature to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 882 | |
| 883 | rmtree(origin_root_dir) |
| 884 | |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 885 | def testUpdateCloneOnTrueRemoteBranch(self): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 886 | if not self.enabled: |
| 887 | return |
| 888 | options = self.Options() |
| 889 | |
| 890 | origin_root_dir = self.root_dir |
| 891 | self.root_dir = tempfile.mkdtemp() |
| 892 | self.relpath = '.' |
| 893 | self.base_path = join(self.root_dir, self.relpath) |
| 894 | url_with_branch_ref = origin_root_dir + '@refs/heads/feature' |
| 895 | |
| 896 | scm = gclient_scm.CreateSCM(url=url_with_branch_ref, |
| 897 | root_dir=self.root_dir, |
| 898 | relpath=self.relpath) |
| 899 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 900 | expected_file_list = [join(self.base_path, "a"), |
| 901 | join(self.base_path, "b"), |
| 902 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 903 | file_list = [] |
| 904 | options.revision = 'unmanaged' |
| 905 | scm.update(options, (), file_list) |
| 906 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 907 | self.assertEquals(file_list, expected_file_list) |
| 908 | self.assertEquals(scm.revinfo(options, (), None), |
| 909 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 910 | # @refs/heads/feature is AKA @refs/remotes/origin/feature in the clone, so |
| 911 | # should be treated as such by gclient. |
| 912 | # TODO(mmoss): Though really, we should only allow DEPS to specify branches |
| 913 | # as they are known in the upstream repo, since the mapping into the local |
| 914 | # repo can be modified by users (or we might even want to change the gclient |
| 915 | # defaults at some point). But that will take more work to stop using |
| 916 | # refs/remotes/ everywhere that we do (and to stop assuming a DEPS ref will |
| 917 | # always resolve locally, like when passing them to show-ref or rev-list). |
| 918 | self.assertEquals(self.getCurrentBranch(), None) |
| 919 | self.checkInStdout( |
| 920 | 'Checked out refs/remotes/origin/feature to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 921 | |
| 922 | rmtree(origin_root_dir) |
| 923 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 924 | def testUpdateUpdate(self): |
| 925 | if not self.enabled: |
| 926 | return |
| 927 | options = self.Options() |
| 928 | expected_file_list = [] |
| 929 | scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir, |
| 930 | relpath=self.relpath) |
| 931 | file_list = [] |
| 932 | options.revision = 'unmanaged' |
| 933 | scm.update(options, (), file_list) |
| 934 | self.assertEquals(file_list, expected_file_list) |
| 935 | self.assertEquals(scm.revinfo(options, (), None), |
| 936 | '069c602044c5388d2d15c3f875b057c852003458') |
| 937 | self.checkstdout('________ unmanaged solution; skipping .\n') |
| 938 | |
| 939 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 940 | if __name__ == '__main__': |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 941 | level = logging.DEBUG if '-v' in sys.argv else logging.FATAL |
| 942 | logging.basicConfig( |
| 943 | level=level, |
| 944 | format='%(asctime).19s %(levelname)s %(filename)s:' |
| 945 | '%(lineno)s %(message)s') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 946 | unittest.main() |
| 947 | |
| 948 | # vim: ts=2:sw=2:tw=80:et: |