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 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 14 | import json |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 15 | import logging |
| 16 | import os |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 17 | import re |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 18 | import sys |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 19 | import tempfile |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 20 | import unittest |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 21 | |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 22 | 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] | 23 | |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 24 | from testing_support import fake_repos |
maruel@chromium.org | 0927b7e | 2011-11-11 16:06:22 +0000 | [diff] [blame] | 25 | from testing_support.super_mox import mox, StdoutCheck, SuperMoxTestBase |
| 26 | from testing_support.super_mox import TestCaseUtils |
maruel@chromium.org | 428342a | 2011-11-10 15:46:33 +0000 | [diff] [blame] | 27 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 28 | import gclient_scm |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 29 | import git_cache |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 30 | import subprocess2 |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 31 | |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 32 | # Disable global git cache |
| 33 | git_cache.Mirror.SetCachePath(None) |
| 34 | |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 35 | # Shortcut since this function is used often |
| 36 | join = gclient_scm.os.path.join |
| 37 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 38 | TIMESTAMP_RE = re.compile('\[[0-9]{1,2}:[0-9]{2}:[0-9]{2}\] (.*)', re.DOTALL) |
| 39 | def strip_timestamps(value): |
| 40 | lines = value.splitlines(True) |
| 41 | for i in xrange(len(lines)): |
| 42 | m = TIMESTAMP_RE.match(lines[i]) |
| 43 | if m: |
| 44 | lines[i] = m.group(1) |
| 45 | return ''.join(lines) |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 46 | |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 47 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 48 | class GCBaseTestCase(object): |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 49 | def assertRaisesError(self, msg, fn, *args, **kwargs): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 50 | """Like unittest's assertRaises() but checks for Gclient.Error.""" |
maruel@chromium.org | 96913eb | 2010-06-01 16:22:47 +0000 | [diff] [blame] | 51 | try: |
| 52 | fn(*args, **kwargs) |
| 53 | except gclient_scm.gclient_utils.Error, e: |
| 54 | self.assertEquals(e.args[0], msg) |
| 55 | else: |
| 56 | self.fail('%s not raised' % msg) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 57 | |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 58 | |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 59 | class BaseTestCase(GCBaseTestCase, SuperMoxTestBase): |
| 60 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 61 | SuperMoxTestBase.setUp(self) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 62 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter') |
| 63 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, |
| 64 | 'CheckCallAndFilterAndHeader') |
| 65 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead') |
| 66 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite') |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 67 | self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'rmtree') |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 68 | self.mox.StubOutWithMock(subprocess2, 'communicate') |
| 69 | self.mox.StubOutWithMock(subprocess2, 'Popen') |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 70 | self._scm_wrapper = gclient_scm.GitWrapper |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 71 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 72 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 73 | # Absolute path of the fake checkout directory. |
| 74 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 75 | |
| 76 | def tearDown(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 77 | SuperMoxTestBase.tearDown(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 78 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 79 | |
| 80 | |
hinoka@chromium.org | fa2b9b4 | 2014-08-22 18:08:53 +0000 | [diff] [blame] | 81 | class BasicTests(SuperMoxTestBase): |
| 82 | def setUp(self): |
| 83 | SuperMoxTestBase.setUp(self) |
| 84 | |
| 85 | def testGetFirstRemoteUrl(self): |
| 86 | REMOTE_STRINGS = [('remote.origin.url E:\\foo\\bar', 'E:\\foo\\bar'), |
| 87 | ('remote.origin.url /b/foo/bar', '/b/foo/bar'), |
| 88 | ('remote.origin.url https://foo/bar', 'https://foo/bar'), |
| 89 | ('remote.origin.url E:\\Fo Bar\\bax', 'E:\\Fo Bar\\bax'), |
| 90 | ('remote.origin.url git://what/"do', 'git://what/"do')] |
| 91 | FAKE_PATH = '/fake/path' |
| 92 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'Capture') |
| 93 | for question, _ in REMOTE_STRINGS: |
| 94 | gclient_scm.scm.GIT.Capture( |
| 95 | ['config', '--local', '--get-regexp', r'remote.*.url'], |
| 96 | cwd=FAKE_PATH).AndReturn(question) |
| 97 | |
| 98 | self.mox.ReplayAll() |
| 99 | |
| 100 | for _, answer in REMOTE_STRINGS: |
| 101 | self.assertEquals(gclient_scm.SCMWrapper._get_first_remote_url(FAKE_PATH), |
| 102 | answer) |
| 103 | |
| 104 | def tearDown(self): |
| 105 | SuperMoxTestBase.tearDown(self) |
| 106 | |
| 107 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 108 | class BaseGitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils, |
| 109 | unittest.TestCase): |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 110 | """This class doesn't use pymox.""" |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 111 | class OptionsObject(object): |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 112 | def __init__(self, verbose=False, revision=None): |
dnj@chromium.org | 5b23e87 | 2015-02-20 21:25:57 +0000 | [diff] [blame] | 113 | self.auto_rebase = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 114 | self.verbose = verbose |
| 115 | self.revision = revision |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 116 | self.deps_os = None |
| 117 | self.force = False |
davemoore@chromium.org | 8bf2731 | 2010-02-19 17:29:44 +0000 | [diff] [blame] | 118 | self.reset = False |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 119 | self.nohooks = False |
primiano@chromium.org | 5439ea5 | 2014-08-06 17:18:18 +0000 | [diff] [blame] | 120 | self.no_history = False |
iannucci@chromium.org | d4fffee | 2013-06-28 00:35:26 +0000 | [diff] [blame] | 121 | self.upstream = False |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 122 | self.cache_dir = None |
bauerb@chromium.org | 4dd0937 | 2011-07-22 14:41:51 +0000 | [diff] [blame] | 123 | self.merge = False |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 124 | self.jobs = 1 |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 125 | self.break_repo_locks = False |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 126 | self.delete_unversioned_trees = False |
Edward Lesmes | c621b21 | 2018-03-21 20:26:56 -0400 | [diff] [blame] | 127 | self.patch_ref = None |
| 128 | self.patch_repo = None |
| 129 | self.rebase_patch_ref = True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 130 | |
| 131 | sample_git_import = """blob |
| 132 | mark :1 |
| 133 | data 6 |
| 134 | Hello |
| 135 | |
| 136 | blob |
| 137 | mark :2 |
| 138 | data 4 |
| 139 | Bye |
| 140 | |
| 141 | reset refs/heads/master |
| 142 | commit refs/heads/master |
| 143 | mark :3 |
| 144 | author Bob <bob@example.com> 1253744361 -0700 |
| 145 | committer Bob <bob@example.com> 1253744361 -0700 |
| 146 | data 8 |
| 147 | A and B |
| 148 | M 100644 :1 a |
| 149 | M 100644 :2 b |
| 150 | |
| 151 | blob |
| 152 | mark :4 |
| 153 | data 10 |
| 154 | Hello |
| 155 | You |
| 156 | |
| 157 | blob |
| 158 | mark :5 |
| 159 | data 8 |
| 160 | Bye |
| 161 | You |
| 162 | |
| 163 | commit refs/heads/origin |
| 164 | mark :6 |
| 165 | author Alice <alice@example.com> 1253744424 -0700 |
| 166 | committer Alice <alice@example.com> 1253744424 -0700 |
| 167 | data 13 |
| 168 | Personalized |
| 169 | from :3 |
| 170 | M 100644 :4 a |
| 171 | M 100644 :5 b |
| 172 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 173 | blob |
| 174 | mark :7 |
| 175 | data 5 |
| 176 | Mooh |
| 177 | |
| 178 | commit refs/heads/feature |
| 179 | mark :8 |
| 180 | author Bob <bob@example.com> 1390311986 -0000 |
| 181 | committer Bob <bob@example.com> 1390311986 -0000 |
| 182 | data 6 |
| 183 | Add C |
| 184 | from :3 |
| 185 | M 100644 :7 c |
| 186 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 187 | reset refs/heads/master |
| 188 | from :3 |
| 189 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 190 | def Options(self, *args, **kwargs): |
maruel@chromium.org | 8071c28 | 2010-09-20 19:44:19 +0000 | [diff] [blame] | 191 | return self.OptionsObject(*args, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 192 | |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 193 | def checkstdout(self, expected): |
| 194 | value = sys.stdout.getvalue() |
| 195 | sys.stdout.close() |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 196 | # pylint: disable=no-member |
szager@chromium.org | fe0d190 | 2014-04-08 20:50:44 +0000 | [diff] [blame] | 197 | self.assertEquals(expected, strip_timestamps(value)) |
| 198 | |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 199 | @staticmethod |
| 200 | def CreateGitRepo(git_import, path): |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 201 | """Do it for real.""" |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 202 | try: |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 203 | Popen(['git', 'init', '-q'], stdout=PIPE, stderr=STDOUT, |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 204 | cwd=path).communicate() |
| 205 | except OSError: |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 206 | # git is not available, skip this test. |
| 207 | return False |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 208 | Popen(['git', 'fast-import', '--quiet'], stdin=PIPE, stdout=PIPE, |
| 209 | stderr=STDOUT, cwd=path).communicate(input=git_import) |
| 210 | Popen(['git', 'checkout', '-q'], stdout=PIPE, stderr=STDOUT, |
| 211 | cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 212 | Popen(['git', 'remote', 'add', '-f', 'origin', '.'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 213 | stderr=STDOUT, cwd=path).communicate() |
| 214 | Popen(['git', 'checkout', '-b', 'new', 'origin/master', '-q'], stdout=PIPE, |
| 215 | stderr=STDOUT, cwd=path).communicate() |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 216 | Popen(['git', 'push', 'origin', 'origin/origin:origin/master', '-q'], |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 217 | stdout=PIPE, stderr=STDOUT, cwd=path).communicate() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 218 | Popen(['git', 'config', '--unset', 'remote.origin.fetch'], stdout=PIPE, |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 219 | stderr=STDOUT, cwd=path).communicate() |
iannucci@chromium.org | 1e7187a | 2013-02-17 20:54:05 +0000 | [diff] [blame] | 220 | Popen(['git', 'config', 'user.email', 'someuser@chromium.org'], stdout=PIPE, |
| 221 | stderr=STDOUT, cwd=path).communicate() |
| 222 | Popen(['git', 'config', 'user.name', 'Some User'], stdout=PIPE, |
| 223 | stderr=STDOUT, cwd=path).communicate() |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 224 | return True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 225 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 226 | def _GetAskForDataCallback(self, expected_prompt, return_value): |
| 227 | def AskForData(prompt, options): |
| 228 | self.assertEquals(prompt, expected_prompt) |
| 229 | return return_value |
| 230 | return AskForData |
| 231 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 232 | def setUp(self): |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 233 | TestCaseUtils.setUp(self) |
| 234 | unittest.TestCase.setUp(self) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 235 | self.url = 'git://foo' |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 236 | # The .git suffix allows gclient_scm to recognize the dir as a git repo |
| 237 | # when cloning it locally |
| 238 | self.root_dir = tempfile.mkdtemp('.git') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 239 | self.relpath = '.' |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 240 | self.base_path = join(self.root_dir, self.relpath) |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 241 | self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path) |
maruel@chromium.org | dd057f3 | 2010-09-20 19:33:31 +0000 | [diff] [blame] | 242 | StdoutCheck.setUp(self) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 243 | self._original_GitBinaryExists = gclient_scm.GitWrapper.BinaryExists |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 244 | gclient_scm.GitWrapper.BinaryExists = staticmethod(lambda : True) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 245 | |
| 246 | def tearDown(self): |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 247 | try: |
| 248 | rmtree(self.root_dir) |
| 249 | StdoutCheck.tearDown(self) |
| 250 | TestCaseUtils.tearDown(self) |
| 251 | unittest.TestCase.tearDown(self) |
| 252 | finally: |
| 253 | # TODO(maruel): Use auto_stub.TestCase. |
| 254 | gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 255 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 256 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 257 | class ManagedGitWrapperTestCase(BaseGitWrapperTestCase): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 258 | |
| 259 | def testRevertMissing(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 260 | if not self.enabled: |
| 261 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 262 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 263 | file_path = join(self.base_path, 'a') |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 264 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 265 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 266 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 267 | scm.update(options, None, file_list) |
| 268 | gclient_scm.os.remove(file_path) |
| 269 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 270 | scm.revert(options, self.args, file_list) |
| 271 | self.assertEquals(file_list, [file_path]) |
| 272 | file_list = [] |
| 273 | scm.diff(options, self.args, file_list) |
| 274 | self.assertEquals(file_list, []) |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 275 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 276 | |
| 277 | def testRevertNone(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 278 | if not self.enabled: |
| 279 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 280 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 281 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 282 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 283 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 284 | scm.update(options, None, file_list) |
| 285 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 286 | scm.revert(options, self.args, file_list) |
| 287 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 288 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 289 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 290 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 291 | |
| 292 | def testRevertModified(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 293 | if not self.enabled: |
| 294 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 295 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 296 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 297 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 298 | file_list = [] |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 299 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 300 | file_path = join(self.base_path, 'a') |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 301 | open(file_path, 'a').writelines('touched\n') |
| 302 | file_list = [] |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 303 | scm.revert(options, self.args, file_list) |
| 304 | self.assertEquals(file_list, [file_path]) |
| 305 | file_list = [] |
| 306 | scm.diff(options, self.args, file_list) |
| 307 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 308 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 309 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 310 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 311 | |
| 312 | def testRevertNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 313 | if not self.enabled: |
| 314 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 315 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 316 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 317 | self.relpath) |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 318 | file_list = [] |
| 319 | scm.update(options, None, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 320 | file_path = join(self.base_path, 'c') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 321 | f = open(file_path, 'w') |
| 322 | f.writelines('new\n') |
| 323 | f.close() |
maruel@chromium.org | 8ef5f54 | 2009-11-12 02:05:02 +0000 | [diff] [blame] | 324 | Popen(['git', 'add', 'c'], stdout=PIPE, |
| 325 | stderr=STDOUT, cwd=self.base_path).communicate() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 326 | file_list = [] |
| 327 | scm.revert(options, self.args, file_list) |
| 328 | self.assertEquals(file_list, [file_path]) |
| 329 | file_list = [] |
| 330 | scm.diff(options, self.args, file_list) |
| 331 | self.assertEquals(file_list, []) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 332 | self.assertEquals(scm.revinfo(options, self.args, None), |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 333 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 334 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 335 | |
| 336 | def testStatusNew(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 337 | if not self.enabled: |
| 338 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 339 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 340 | file_path = join(self.base_path, 'a') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 341 | open(file_path, 'a').writelines('touched\n') |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 342 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 343 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 344 | file_list = [] |
| 345 | scm.status(options, self.args, file_list) |
| 346 | self.assertEquals(file_list, [file_path]) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 347 | self.checkstdout( |
Aaron Gable | f4068aa | 2017-12-12 15:14:09 -0800 | [diff] [blame] | 348 | ('\n________ running \'git -c core.quotePath=false diff --name-status ' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 349 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 350 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 351 | |
| 352 | def testStatus2New(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 353 | if not self.enabled: |
| 354 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 355 | options = self.Options() |
| 356 | expected_file_list = [] |
| 357 | for f in ['a', 'b']: |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 358 | file_path = join(self.base_path, f) |
| 359 | open(file_path, 'a').writelines('touched\n') |
| 360 | expected_file_list.extend([file_path]) |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 361 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 362 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 363 | file_list = [] |
| 364 | scm.status(options, self.args, file_list) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 365 | 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] | 366 | self.assertEquals(sorted(file_list), expected_file_list) |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 367 | self.checkstdout( |
Aaron Gable | f4068aa | 2017-12-12 15:14:09 -0800 | [diff] [blame] | 368 | ('\n________ running \'git -c core.quotePath=false diff --name-status ' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 369 | '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') % |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 370 | join(self.root_dir, '.')) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 371 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 372 | def testUpdateUpdate(self): |
maruel@chromium.org | ea6c2c5 | 2009-10-09 20:38:14 +0000 | [diff] [blame] | 373 | if not self.enabled: |
| 374 | return |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 375 | options = self.Options() |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 376 | expected_file_list = [join(self.base_path, x) for x in ['a', 'b']] |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 377 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 378 | self.relpath) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 379 | file_list = [] |
| 380 | scm.update(options, (), file_list) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 381 | self.assertEquals(file_list, expected_file_list) |
| 382 | self.assertEquals(scm.revinfo(options, (), None), |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 383 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 384 | sys.stdout.close() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 385 | |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 386 | def testUpdateMerge(self): |
| 387 | if not self.enabled: |
| 388 | return |
| 389 | options = self.Options() |
| 390 | options.merge = True |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 391 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 392 | self.relpath) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 393 | scm._Run(['checkout', '-q', 'feature'], options) |
| 394 | rev = scm.revinfo(options, (), None) |
| 395 | file_list = [] |
| 396 | scm.update(options, (), file_list) |
| 397 | self.assertEquals(file_list, [join(self.base_path, x) |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 398 | for x in ['a', 'b', 'c']]) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 399 | # The actual commit that is created is unstable, so we verify its tree and |
| 400 | # parents instead. |
| 401 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 402 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 403 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^1']), rev) |
| 404 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^2']), |
| 405 | scm._Capture(['rev-parse', 'origin/master'])) |
| 406 | sys.stdout.close() |
| 407 | |
| 408 | def testUpdateRebase(self): |
| 409 | if not self.enabled: |
| 410 | return |
| 411 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 412 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 413 | self.relpath) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 414 | scm._Run(['checkout', '-q', 'feature'], options) |
| 415 | file_list = [] |
| 416 | # Fake a 'y' key press. |
| 417 | scm._AskForData = self._GetAskForDataCallback( |
| 418 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 419 | '(y)es / (q)uit / (s)kip : ', 'y') |
| 420 | scm.update(options, (), file_list) |
| 421 | self.assertEquals(file_list, [join(self.base_path, x) |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 422 | for x in ['a', 'b', 'c']]) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 423 | # The actual commit that is created is unstable, so we verify its tree and |
| 424 | # parent instead. |
| 425 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD:']), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 426 | 'd2e35c10ac24d6c621e14a1fcadceb533155627d') |
| 427 | self.assertEquals(scm._Capture(['rev-parse', 'HEAD^']), |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 428 | scm._Capture(['rev-parse', 'origin/master'])) |
| 429 | sys.stdout.close() |
| 430 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 431 | def testUpdateReset(self): |
| 432 | if not self.enabled: |
| 433 | return |
| 434 | options = self.Options() |
| 435 | options.reset = True |
| 436 | |
| 437 | dir_path = join(self.base_path, 'c') |
| 438 | os.mkdir(dir_path) |
| 439 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 440 | |
| 441 | file_path = join(self.base_path, 'file') |
| 442 | open(file_path, 'w').writelines('new\n') |
| 443 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 444 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 445 | self.relpath) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 446 | file_list = [] |
| 447 | scm.update(options, (), file_list) |
| 448 | self.assert_(gclient_scm.os.path.isdir(dir_path)) |
| 449 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 450 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 451 | |
| 452 | def testUpdateResetDeleteUnversionedTrees(self): |
| 453 | if not self.enabled: |
| 454 | return |
| 455 | options = self.Options() |
| 456 | options.reset = True |
| 457 | options.delete_unversioned_trees = True |
| 458 | |
| 459 | dir_path = join(self.base_path, 'dir') |
| 460 | os.mkdir(dir_path) |
| 461 | open(join(dir_path, 'nested'), 'w').writelines('new\n') |
| 462 | |
| 463 | file_path = join(self.base_path, 'file') |
| 464 | open(file_path, 'w').writelines('new\n') |
| 465 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 466 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 467 | self.relpath) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 468 | file_list = [] |
| 469 | scm.update(options, (), file_list) |
| 470 | self.assert_(not gclient_scm.os.path.isdir(dir_path)) |
| 471 | self.assert_(gclient_scm.os.path.isfile(file_path)) |
maruel@chromium.org | c6ca3a1 | 2012-06-20 14:46:02 +0000 | [diff] [blame] | 472 | sys.stdout.close() |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 473 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 474 | def testUpdateUnstagedConflict(self): |
| 475 | if not self.enabled: |
| 476 | return |
| 477 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 478 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 479 | self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 480 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 481 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 482 | try: |
| 483 | scm.update(options, (), []) |
| 484 | self.fail() |
maruel@chromium.org | fae707b | 2011-09-15 18:57:58 +0000 | [diff] [blame] | 485 | except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | cdbecc4 | 2011-02-09 04:31:47 +0000 | [diff] [blame] | 486 | # The exact exception text varies across git versions so it's not worth |
| 487 | # verifying it. It's fine as long as it throws. |
| 488 | pass |
| 489 | # Manually flush stdout since we can't verify it's content accurately across |
| 490 | # git versions. |
| 491 | sys.stdout.getvalue() |
| 492 | sys.stdout.close() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 493 | |
Mike Stipicevic | e992b61 | 2016-12-02 15:32:55 -0800 | [diff] [blame] | 494 | @unittest.skip('Skipping until crbug.com/670884 is resolved.') |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 495 | def testUpdateLocked(self): |
| 496 | if not self.enabled: |
| 497 | return |
| 498 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 499 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 500 | self.relpath) |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 501 | file_path = join(self.base_path, '.git', 'index.lock') |
| 502 | with open(file_path, 'w'): |
| 503 | pass |
Robert Iannucci | 53f3555 | 2016-12-15 19:09:16 -0800 | [diff] [blame] | 504 | with self.assertRaises(subprocess2.CalledProcessError): |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 505 | scm.update(options, (), []) |
| 506 | sys.stdout.close() |
| 507 | |
| 508 | def testUpdateLockedBreak(self): |
| 509 | if not self.enabled: |
| 510 | return |
| 511 | options = self.Options() |
| 512 | options.break_repo_locks = True |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 513 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 514 | self.relpath) |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 515 | file_path = join(self.base_path, '.git', 'index.lock') |
| 516 | with open(file_path, 'w'): |
| 517 | pass |
| 518 | scm.update(options, (), []) |
| 519 | self.assertRegexpMatches(sys.stdout.getvalue(), |
| 520 | "breaking lock.*\.git/index\.lock") |
| 521 | self.assertFalse(os.path.exists(file_path)) |
| 522 | sys.stdout.close() |
| 523 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 524 | def testUpdateConflict(self): |
| 525 | if not self.enabled: |
| 526 | return |
| 527 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 528 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 529 | self.relpath) |
maruel@chromium.org | 795a8c1 | 2010-10-05 19:54:29 +0000 | [diff] [blame] | 530 | file_path = join(self.base_path, 'b') |
maruel@chromium.org | bf38a7e | 2010-12-14 18:15:54 +0000 | [diff] [blame] | 531 | open(file_path, 'w').writelines('conflict\n') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 532 | scm._Run(['commit', '-am', 'test'], options) |
bauerb@chromium.org | 30c46d6 | 2014-01-23 12:11:56 +0000 | [diff] [blame] | 533 | scm._AskForData = self._GetAskForDataCallback( |
| 534 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 535 | '(y)es / (q)uit / (s)kip : ', 'y') |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 536 | exception = ('Conflict while rebasing this branch.\n' |
| 537 | 'Fix the conflict and run gclient again.\n' |
| 538 | 'See \'man git-rebase\' for details.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 539 | self.assertRaisesError(exception, scm.update, options, (), []) |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 540 | exception = ('\n____ . at refs/remotes/origin/master\n' |
maruel@chromium.org | 389d6de | 2010-09-09 14:14:37 +0000 | [diff] [blame] | 541 | '\tYou have unstaged changes.\n' |
| 542 | '\tPlease commit, stash, or reset.\n') |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 543 | self.assertRaisesError(exception, scm.update, options, (), []) |
maruel@chromium.org | cb2985f | 2010-11-03 14:08:31 +0000 | [diff] [blame] | 544 | sys.stdout.close() |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 545 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 546 | def testRevinfo(self): |
| 547 | if not self.enabled: |
| 548 | return |
| 549 | options = self.Options() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 550 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 551 | self.relpath) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 552 | rev_info = scm.revinfo(options, (), None) |
| 553 | self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458') |
| 554 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 555 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 556 | class ManagedGitWrapperTestCaseMox(BaseTestCase): |
| 557 | class OptionsObject(object): |
| 558 | def __init__(self, verbose=False, revision=None, force=False): |
| 559 | self.verbose = verbose |
| 560 | self.revision = revision |
| 561 | self.deps_os = None |
| 562 | self.force = force |
| 563 | self.reset = False |
| 564 | self.nohooks = False |
iannucci@chromium.org | 30a0798 | 2016-04-07 21:35:19 +0000 | [diff] [blame] | 565 | self.break_repo_locks = False |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 566 | # TODO(maruel): Test --jobs > 1. |
| 567 | self.jobs = 1 |
Edward Lesmes | c621b21 | 2018-03-21 20:26:56 -0400 | [diff] [blame] | 568 | self.patch_ref = None |
| 569 | self.patch_repo = None |
| 570 | self.rebase_patch_ref = True |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 571 | |
| 572 | def Options(self, *args, **kwargs): |
| 573 | return self.OptionsObject(*args, **kwargs) |
| 574 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 575 | def checkstdout(self, expected): |
| 576 | value = sys.stdout.getvalue() |
primiano@chromium.org | 5439ea5 | 2014-08-06 17:18:18 +0000 | [diff] [blame] | 577 | sys.stdout.close() |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 578 | # pylint: disable=no-member |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 579 | self.assertEquals(expected, strip_timestamps(value)) |
| 580 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 581 | def setUp(self): |
| 582 | BaseTestCase.setUp(self) |
| 583 | self.fake_hash_1 = 't0ta11yf4k3' |
| 584 | self.fake_hash_2 = '3v3nf4k3r' |
| 585 | self.url = 'git://foo' |
maruel@chromium.org | 9717013 | 2013-05-08 14:58:34 +0000 | [diff] [blame] | 586 | self.root_dir = '/tmp' if sys.platform != 'win32' else 't:\\tmp' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 587 | self.relpath = 'fake' |
| 588 | self.base_path = os.path.join(self.root_dir, self.relpath) |
primiano@chromium.org | 1c12738 | 2015-02-17 11:15:40 +0000 | [diff] [blame] | 589 | self.backup_base_path = os.path.join(self.root_dir, |
| 590 | 'old_%s.git' % self.relpath) |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 591 | |
| 592 | def tearDown(self): |
| 593 | BaseTestCase.tearDown(self) |
| 594 | |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 595 | def testGetUsableRevGit(self): |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 596 | # pylint: disable=no-member |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 597 | options = self.Options(verbose=True) |
| 598 | |
| 599 | self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True) |
| 600 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1 |
| 601 | ).AndReturn(True) |
agable | 41e3a6c | 2016-10-20 11:36:56 -0700 | [diff] [blame] | 602 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev='1' |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 603 | ).AndReturn(False) |
agable | 41e3a6c | 2016-10-20 11:36:56 -0700 | [diff] [blame] | 604 | gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev='1' |
| 605 | ).AndReturn(False) |
| 606 | |
| 607 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Fetch', True) |
| 608 | # pylint: disable=no-value-for-parameter |
| 609 | gclient_scm.GitWrapper._Fetch(options).AndReturn(None) |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 610 | |
| 611 | gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True) |
| 612 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 613 | |
| 614 | self.mox.ReplayAll() |
| 615 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 616 | git_scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 617 | self.relpath) |
smut | ae7ea31 | 2016-07-18 11:59:41 -0700 | [diff] [blame] | 618 | # A [fake] git sha1 with a git repo should work (this is in the case that |
| 619 | # the LKGR gets flipped to git sha1's some day). |
| 620 | self.assertEquals(git_scm.GetUsableRev(self.fake_hash_1, options), |
| 621 | self.fake_hash_1) |
| 622 | # An SVN rev with an existing purely git repo should raise an exception. |
| 623 | self.assertRaises(gclient_scm.gclient_utils.Error, |
| 624 | git_scm.GetUsableRev, '1', options) |
| 625 | |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 626 | def testUpdateNoDotGit(self): |
| 627 | options = self.Options() |
| 628 | |
szager@chromium.org | 8a13970 | 2014-06-20 15:55:01 +0000 | [diff] [blame] | 629 | gclient_scm.os.path.isdir( |
| 630 | os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False) |
primiano@chromium.org | 1c12738 | 2015-02-17 11:15:40 +0000 | [diff] [blame] | 631 | gclient_scm.os.path.exists(self.backup_base_path).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 632 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 633 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 634 | gclient_scm.os.path.exists(os.path.join(self.base_path, '.git') |
| 635 | ).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 636 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True) |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 637 | # pylint: disable=no-value-for-parameter |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 638 | gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url, |
| 639 | options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 640 | self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True) |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 641 | gclient_scm.subprocess2.check_output( |
Aaron Gable | 7817f02 | 2017-12-12 09:43:17 -0800 | [diff] [blame] | 642 | ['git', '-c', 'core.quotePath=false', 'ls-files'], cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 643 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('') |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 644 | gclient_scm.subprocess2.check_output( |
| 645 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 646 | cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 647 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 648 | stderr=-1, |
| 649 | ).AndReturn('') |
| 650 | |
| 651 | self.mox.ReplayAll() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 652 | scm = self._scm_wrapper(self.url, self.root_dir, |
| 653 | self.relpath) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 654 | scm.update(options, None, []) |
| 655 | self.checkstdout('\n') |
| 656 | |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 657 | def testUpdateConflict(self): |
| 658 | options = self.Options() |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 659 | |
szager@chromium.org | 8a13970 | 2014-06-20 15:55:01 +0000 | [diff] [blame] | 660 | gclient_scm.os.path.isdir( |
| 661 | os.path.join(self.base_path, '.git', 'hooks')).AndReturn(False) |
primiano@chromium.org | 1c12738 | 2015-02-17 11:15:40 +0000 | [diff] [blame] | 662 | gclient_scm.os.path.exists(self.backup_base_path).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 663 | gclient_scm.os.path.exists(self.base_path).AndReturn(True) |
| 664 | gclient_scm.os.path.isdir(self.base_path).AndReturn(True) |
| 665 | gclient_scm.os.path.exists(os.path.join(self.base_path, '.git') |
| 666 | ).AndReturn(False) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 667 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True) |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 668 | # pylint: disable=no-value-for-parameter |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 669 | gclient_scm.GitWrapper._Clone( |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 670 | 'refs/remotes/origin/master', self.url, options |
borenet@google.com | 90fe58b | 2014-05-01 18:22:00 +0000 | [diff] [blame] | 671 | ).AndRaise(gclient_scm.subprocess2.CalledProcessError(None, None, None, |
| 672 | None, None)) |
| 673 | self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_DeleteOrMove', True) |
| 674 | gclient_scm.GitWrapper._DeleteOrMove(False) |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 675 | gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url, |
| 676 | options) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 677 | self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True) |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 678 | gclient_scm.subprocess2.check_output( |
Aaron Gable | 7817f02 | 2017-12-12 09:43:17 -0800 | [diff] [blame] | 679 | ['git', '-c', 'core.quotePath=false', 'ls-files'], cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 680 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('') |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 681 | gclient_scm.subprocess2.check_output( |
| 682 | ['git', 'rev-parse', '--verify', 'HEAD'], |
| 683 | cwd=self.base_path, |
szager@chromium.org | 6d8115d | 2014-04-23 20:59:23 +0000 | [diff] [blame] | 684 | env=gclient_scm.scm.GIT.ApplyEnvVars({}), |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 685 | stderr=-1, |
| 686 | ).AndReturn('') |
| 687 | |
| 688 | self.mox.ReplayAll() |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 689 | scm = self._scm_wrapper(self.url, self.root_dir, |
| 690 | self.relpath) |
borenet@google.com | b09097a | 2014-04-09 19:09:08 +0000 | [diff] [blame] | 691 | scm.update(options, None, []) |
| 692 | self.checkstdout('\n') |
| 693 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 694 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 695 | class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 696 | def checkInStdout(self, expected): |
| 697 | value = sys.stdout.getvalue() |
| 698 | sys.stdout.close() |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 699 | # pylint: disable=no-member |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 700 | self.assertIn(expected, value) |
| 701 | |
| 702 | def checkNotInStdout(self, expected): |
| 703 | value = sys.stdout.getvalue() |
| 704 | sys.stdout.close() |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 705 | # pylint: disable=no-member |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 706 | self.assertNotIn(expected, value) |
| 707 | |
smut@google.com | 27c9c8a | 2014-09-11 19:57:55 +0000 | [diff] [blame] | 708 | def getCurrentBranch(self): |
| 709 | # Returns name of current branch or HEAD for detached HEAD |
| 710 | branch = gclient_scm.scm.GIT.Capture(['rev-parse', '--abbrev-ref', 'HEAD'], |
| 711 | cwd=self.base_path) |
| 712 | if branch == 'HEAD': |
| 713 | return None |
| 714 | return branch |
| 715 | |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 716 | def testUpdateClone(self): |
| 717 | if not self.enabled: |
| 718 | return |
| 719 | options = self.Options() |
| 720 | |
| 721 | origin_root_dir = self.root_dir |
| 722 | self.root_dir = tempfile.mkdtemp() |
| 723 | self.relpath = '.' |
| 724 | self.base_path = join(self.root_dir, self.relpath) |
| 725 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 726 | scm = gclient_scm.GitWrapper(origin_root_dir, |
| 727 | self.root_dir, |
| 728 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 729 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 730 | expected_file_list = [join(self.base_path, "a"), |
| 731 | join(self.base_path, "b")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 732 | file_list = [] |
| 733 | options.revision = 'unmanaged' |
| 734 | scm.update(options, (), file_list) |
| 735 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 736 | self.assertEquals(file_list, expected_file_list) |
| 737 | self.assertEquals(scm.revinfo(options, (), None), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 738 | '069c602044c5388d2d15c3f875b057c852003458') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 739 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 740 | self.assertEquals(self.getCurrentBranch(), None) |
| 741 | self.checkInStdout( |
| 742 | 'Checked out refs/remotes/origin/master to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 743 | |
| 744 | rmtree(origin_root_dir) |
| 745 | |
| 746 | def testUpdateCloneOnCommit(self): |
| 747 | if not self.enabled: |
| 748 | return |
| 749 | options = self.Options() |
| 750 | |
| 751 | origin_root_dir = self.root_dir |
| 752 | self.root_dir = tempfile.mkdtemp() |
| 753 | self.relpath = '.' |
| 754 | self.base_path = join(self.root_dir, self.relpath) |
| 755 | url_with_commit_ref = origin_root_dir +\ |
| 756 | '@a7142dc9f0009350b96a11f372b6ea658592aa95' |
| 757 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 758 | scm = gclient_scm.GitWrapper(url_with_commit_ref, |
| 759 | self.root_dir, |
| 760 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 761 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 762 | expected_file_list = [join(self.base_path, "a"), |
| 763 | join(self.base_path, "b")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 764 | file_list = [] |
| 765 | options.revision = 'unmanaged' |
| 766 | scm.update(options, (), file_list) |
| 767 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 768 | self.assertEquals(file_list, expected_file_list) |
| 769 | self.assertEquals(scm.revinfo(options, (), None), |
| 770 | 'a7142dc9f0009350b96a11f372b6ea658592aa95') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 771 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 772 | self.assertEquals(self.getCurrentBranch(), None) |
| 773 | self.checkInStdout( |
| 774 | 'Checked out a7142dc9f0009350b96a11f372b6ea658592aa95 to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 775 | |
| 776 | rmtree(origin_root_dir) |
| 777 | |
| 778 | def testUpdateCloneOnBranch(self): |
| 779 | if not self.enabled: |
| 780 | return |
| 781 | options = self.Options() |
| 782 | |
| 783 | origin_root_dir = self.root_dir |
| 784 | self.root_dir = tempfile.mkdtemp() |
| 785 | self.relpath = '.' |
| 786 | self.base_path = join(self.root_dir, self.relpath) |
| 787 | url_with_branch_ref = origin_root_dir + '@feature' |
| 788 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 789 | scm = gclient_scm.GitWrapper(url_with_branch_ref, |
| 790 | self.root_dir, |
| 791 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 792 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 793 | expected_file_list = [join(self.base_path, "a"), |
| 794 | join(self.base_path, "b"), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 795 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 796 | file_list = [] |
| 797 | options.revision = 'unmanaged' |
| 798 | scm.update(options, (), file_list) |
| 799 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 800 | self.assertEquals(file_list, expected_file_list) |
| 801 | self.assertEquals(scm.revinfo(options, (), None), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 802 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
Paweł Hajdan, Jr | 63b8c2a | 2017-09-05 17:59:08 +0200 | [diff] [blame] | 803 | # indicates detached HEAD |
| 804 | self.assertEquals(self.getCurrentBranch(), None) |
| 805 | self.checkInStdout( |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 806 | 'Checked out 9a51244740b25fa2ded5252ca00a3178d3f665a9 ' |
Paweł Hajdan, Jr | 63b8c2a | 2017-09-05 17:59:08 +0200 | [diff] [blame] | 807 | 'to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 808 | |
| 809 | rmtree(origin_root_dir) |
| 810 | |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 811 | def testUpdateCloneOnFetchedRemoteBranch(self): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 812 | if not self.enabled: |
| 813 | return |
| 814 | options = self.Options() |
| 815 | |
| 816 | origin_root_dir = self.root_dir |
| 817 | self.root_dir = tempfile.mkdtemp() |
| 818 | self.relpath = '.' |
| 819 | self.base_path = join(self.root_dir, self.relpath) |
| 820 | url_with_branch_ref = origin_root_dir + '@refs/remotes/origin/feature' |
| 821 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 822 | scm = gclient_scm.GitWrapper(url_with_branch_ref, |
| 823 | self.root_dir, |
| 824 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 825 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 826 | expected_file_list = [join(self.base_path, "a"), |
| 827 | join(self.base_path, "b"), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 828 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 829 | file_list = [] |
| 830 | options.revision = 'unmanaged' |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 831 | scm.update(options, (), file_list) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 832 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 833 | self.assertEquals(file_list, expected_file_list) |
| 834 | self.assertEquals(scm.revinfo(options, (), None), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 835 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 836 | # indicates detached HEAD |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 837 | self.assertEquals(self.getCurrentBranch(), None) |
| 838 | self.checkInStdout( |
| 839 | 'Checked out refs/remotes/origin/feature to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 840 | |
| 841 | rmtree(origin_root_dir) |
| 842 | |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 843 | def testUpdateCloneOnTrueRemoteBranch(self): |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 844 | if not self.enabled: |
| 845 | return |
| 846 | options = self.Options() |
| 847 | |
| 848 | origin_root_dir = self.root_dir |
| 849 | self.root_dir = tempfile.mkdtemp() |
| 850 | self.relpath = '.' |
| 851 | self.base_path = join(self.root_dir, self.relpath) |
| 852 | url_with_branch_ref = origin_root_dir + '@refs/heads/feature' |
| 853 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 854 | scm = gclient_scm.GitWrapper(url_with_branch_ref, |
| 855 | self.root_dir, |
| 856 | self.relpath) |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 857 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 858 | expected_file_list = [join(self.base_path, "a"), |
| 859 | join(self.base_path, "b"), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 860 | join(self.base_path, "c")] |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 861 | file_list = [] |
| 862 | options.revision = 'unmanaged' |
| 863 | scm.update(options, (), file_list) |
| 864 | |
szager@chromium.org | 3dc5cb7 | 2014-06-17 15:06:05 +0000 | [diff] [blame] | 865 | self.assertEquals(file_list, expected_file_list) |
| 866 | self.assertEquals(scm.revinfo(options, (), None), |
John Budorick | 882c91e | 2018-07-12 22:11:41 +0000 | [diff] [blame^] | 867 | '9a51244740b25fa2ded5252ca00a3178d3f665a9') |
| 868 | # @refs/heads/feature is AKA @refs/remotes/origin/feature in the clone, so |
mmoss@chromium.org | 6e7202b | 2014-09-09 18:23:39 +0000 | [diff] [blame] | 869 | # should be treated as such by gclient. |
| 870 | # TODO(mmoss): Though really, we should only allow DEPS to specify branches |
| 871 | # as they are known in the upstream repo, since the mapping into the local |
| 872 | # repo can be modified by users (or we might even want to change the gclient |
| 873 | # defaults at some point). But that will take more work to stop using |
| 874 | # refs/remotes/ everywhere that we do (and to stop assuming a DEPS ref will |
| 875 | # always resolve locally, like when passing them to show-ref or rev-list). |
| 876 | self.assertEquals(self.getCurrentBranch(), None) |
| 877 | self.checkInStdout( |
| 878 | 'Checked out refs/remotes/origin/feature to a detached HEAD') |
romain.pokrzywka@gmail.com | 483a0ba | 2014-05-30 00:06:07 +0000 | [diff] [blame] | 879 | |
| 880 | rmtree(origin_root_dir) |
| 881 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 882 | def testUpdateUpdate(self): |
| 883 | if not self.enabled: |
| 884 | return |
| 885 | options = self.Options() |
| 886 | expected_file_list = [] |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 887 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, |
| 888 | self.relpath) |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 889 | file_list = [] |
| 890 | options.revision = 'unmanaged' |
| 891 | scm.update(options, (), file_list) |
| 892 | self.assertEquals(file_list, expected_file_list) |
| 893 | self.assertEquals(scm.revinfo(options, (), None), |
| 894 | '069c602044c5388d2d15c3f875b057c852003458') |
| 895 | self.checkstdout('________ unmanaged solution; skipping .\n') |
| 896 | |
| 897 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 898 | class CipdWrapperTestCase(BaseTestCase): |
| 899 | |
| 900 | def setUp(self): |
| 901 | # Create this before setting up mocks. |
| 902 | self._cipd_root_dir = tempfile.mkdtemp() |
| 903 | self._workdir = tempfile.mkdtemp() |
| 904 | BaseTestCase.setUp(self) |
| 905 | |
| 906 | self._cipd_instance_url = 'https://chrome-infra-packages.appspot.com' |
| 907 | self._cipd_root = gclient_scm.CipdRoot( |
| 908 | self._cipd_root_dir, |
| 909 | self._cipd_instance_url) |
| 910 | self._cipd_packages = [ |
| 911 | self._cipd_root.add_package('f', 'foo_package', 'foo_version'), |
| 912 | self._cipd_root.add_package('b', 'bar_package', 'bar_version'), |
| 913 | self._cipd_root.add_package('b', 'baz_package', 'baz_version'), |
| 914 | ] |
John Budorick | fb5286f | 2018-01-26 11:49:07 -0800 | [diff] [blame] | 915 | self.mox.StubOutWithMock(self._cipd_root, 'add_package') |
| 916 | self.mox.StubOutWithMock(self._cipd_root, 'clobber') |
| 917 | self.mox.StubOutWithMock(self._cipd_root, 'ensure') |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 918 | |
| 919 | def tearDown(self): |
| 920 | BaseTestCase.tearDown(self) |
| 921 | rmtree(self._cipd_root_dir) |
| 922 | rmtree(self._workdir) |
| 923 | |
| 924 | def createScmWithPackageThatSatisfies(self, condition): |
| 925 | return gclient_scm.CipdWrapper( |
| 926 | url=self._cipd_instance_url, |
| 927 | root_dir=self._cipd_root_dir, |
| 928 | relpath='fake_relpath', |
| 929 | root=self._cipd_root, |
| 930 | package=self.getPackageThatSatisfies(condition)) |
| 931 | |
| 932 | def getPackageThatSatisfies(self, condition): |
| 933 | for p in self._cipd_packages: |
| 934 | if condition(p): |
| 935 | return p |
| 936 | |
| 937 | self.fail('Unable to find a satisfactory package.') |
| 938 | |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 939 | def testRevert(self): |
John Budorick | d3ba72b | 2018-03-20 12:27:42 -0700 | [diff] [blame] | 940 | """Checks that revert does nothing.""" |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 941 | scm = self.createScmWithPackageThatSatisfies( |
John Budorick | d3ba72b | 2018-03-20 12:27:42 -0700 | [diff] [blame] | 942 | lambda _: True) |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 943 | |
| 944 | self.mox.ReplayAll() |
| 945 | |
| 946 | scm.revert(None, (), []) |
| 947 | |
| 948 | def testRevinfo(self): |
| 949 | """Checks that revinfo uses the JSON from cipd describe.""" |
| 950 | scm = self.createScmWithPackageThatSatisfies(lambda _: True) |
| 951 | |
| 952 | expected_revinfo = '0123456789abcdef0123456789abcdef01234567' |
| 953 | json_contents = { |
| 954 | 'result': { |
| 955 | 'pin': { |
| 956 | 'instance_id': expected_revinfo, |
| 957 | } |
| 958 | } |
| 959 | } |
| 960 | describe_json_path = join(self._workdir, 'describe.json') |
| 961 | with open(describe_json_path, 'w') as describe_json: |
| 962 | json.dump(json_contents, describe_json) |
| 963 | |
| 964 | cmd = [ |
| 965 | 'cipd', 'describe', 'foo_package', |
| 966 | '-log-level', 'error', |
| 967 | '-version', 'foo_version', |
| 968 | '-json-output', describe_json_path, |
| 969 | ] |
| 970 | |
| 971 | self.mox.StubOutWithMock(tempfile, 'mkdtemp') |
| 972 | |
| 973 | tempfile.mkdtemp().AndReturn(self._workdir) |
| 974 | gclient_scm.gclient_utils.CheckCallAndFilter( |
| 975 | cmd, filter_fn=mox.IgnoreArg(), print_stdout=False) |
| 976 | gclient_scm.gclient_utils.rmtree(self._workdir) |
| 977 | |
| 978 | self.mox.ReplayAll() |
| 979 | |
| 980 | revinfo = scm.revinfo(None, (), []) |
| 981 | self.assertEquals(revinfo, expected_revinfo) |
| 982 | |
| 983 | def testUpdate(self): |
John Budorick | d3ba72b | 2018-03-20 12:27:42 -0700 | [diff] [blame] | 984 | """Checks that update does nothing.""" |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 985 | scm = self.createScmWithPackageThatSatisfies( |
John Budorick | d3ba72b | 2018-03-20 12:27:42 -0700 | [diff] [blame] | 986 | lambda _: True) |
John Budorick | 0f7b200 | 2018-01-19 15:46:17 -0800 | [diff] [blame] | 987 | |
| 988 | self.mox.ReplayAll() |
| 989 | |
| 990 | scm.update(None, (), []) |
| 991 | |
| 992 | |
Edward Lemur | d64781e | 2018-07-11 23:09:55 +0000 | [diff] [blame] | 993 | class GerritChangesFakeRepo(fake_repos.FakeReposBase): |
| 994 | def populateGit(self): |
| 995 | # Creates a tree that looks like this: |
| 996 | # |
| 997 | # 6 refs/changes/35/1235/1 |
| 998 | # / |
| 999 | # 5 refs/changes/34/1234/1 |
| 1000 | # / |
| 1001 | # 1--2--3--4 refs/heads/master |
| 1002 | |
| 1003 | |
| 1004 | self._commit_git('repo_1', {'commit 1': 'touched'}) |
| 1005 | self._commit_git('repo_1', {'commit 2': 'touched'}) |
| 1006 | self._commit_git('repo_1', {'commit 3': 'touched'}) |
| 1007 | self._commit_git('repo_1', {'commit 4': 'touched'}) |
| 1008 | self._create_ref('repo_1', 'refs/heads/master', 4) |
| 1009 | |
| 1010 | # Create a change on top of commit 3 that consists of two commits. |
| 1011 | self._commit_git('repo_1', |
| 1012 | {'commit 5': 'touched', |
| 1013 | 'change': '1234'}, |
| 1014 | base=3) |
| 1015 | self._create_ref('repo_1', 'refs/changes/34/1234/1', 5) |
| 1016 | self._commit_git('repo_1', |
| 1017 | {'commit 6': 'touched', |
| 1018 | 'change': '1235'}) |
| 1019 | self._create_ref('repo_1', 'refs/changes/35/1235/1', 6) |
| 1020 | |
| 1021 | |
| 1022 | class GerritChangesTest(fake_repos.FakeReposTestBase): |
| 1023 | FAKE_REPOS_CLASS = GerritChangesFakeRepo |
| 1024 | |
| 1025 | def setUp(self): |
| 1026 | super(GerritChangesTest, self).setUp() |
| 1027 | self.enabled = self.FAKE_REPOS.set_up_git() |
| 1028 | self.options = BaseGitWrapperTestCase.OptionsObject() |
| 1029 | self.url = self.git_base + 'repo_1' |
| 1030 | self.mirror = None |
| 1031 | |
| 1032 | def setUpMirror(self): |
| 1033 | self.mirror = tempfile.mkdtemp() |
| 1034 | git_cache.Mirror.SetCachePath(self.mirror) |
| 1035 | self.addCleanup(rmtree, self.mirror) |
| 1036 | self.addCleanup(git_cache.Mirror.SetCachePath, None) |
| 1037 | |
| 1038 | def testCanCloneGerritChange(self): |
| 1039 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1040 | file_list = [] |
| 1041 | |
| 1042 | self.options.revision = 'refs/changes/35/1235/1' |
| 1043 | scm.update(self.options, None, file_list) |
| 1044 | self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir)) |
| 1045 | |
| 1046 | def testCanSyncToGerritChange(self): |
| 1047 | scm = gclient_scm.GitWrapper(self.url, self.root_dir, '.') |
| 1048 | file_list = [] |
| 1049 | |
| 1050 | self.options.revision = self.githash('repo_1', 1) |
| 1051 | scm.update(self.options, None, file_list) |
| 1052 | self.assertEqual(self.githash('repo_1', 1), self.gitrevparse(self.root_dir)) |
| 1053 | |
| 1054 | self.options.revision = 'refs/changes/35/1235/1' |
| 1055 | scm.update(self.options, None, file_list) |
| 1056 | self.assertEqual(self.githash('repo_1', 6), self.gitrevparse(self.root_dir)) |
| 1057 | |
| 1058 | def testCanCloneGerritChangeMirror(self): |
| 1059 | self.setUpMirror() |
| 1060 | self.testCanCloneGerritChange() |
| 1061 | |
| 1062 | def testCanSyncToGerritChangeMirror(self): |
| 1063 | self.setUpMirror() |
| 1064 | self.testCanSyncToGerritChange() |
| 1065 | |
| 1066 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1067 | if __name__ == '__main__': |
szager@chromium.org | b0a13a2 | 2014-06-18 00:52:25 +0000 | [diff] [blame] | 1068 | level = logging.DEBUG if '-v' in sys.argv else logging.FATAL |
| 1069 | logging.basicConfig( |
| 1070 | level=level, |
| 1071 | format='%(asctime).19s %(levelname)s %(filename)s:' |
| 1072 | '%(lineno)s %(message)s') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1073 | unittest.main() |
| 1074 | |
| 1075 | # vim: ts=2:sw=2:tw=80:et: |