maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 2 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +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. |
| 5 | |
| 6 | """Unit tests for git_cl.py.""" |
| 7 | |
| 8 | import os |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 9 | import StringIO |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 10 | import stat |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 11 | import sys |
| 12 | import unittest |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 13 | import urlparse |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 14 | |
| 15 | sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) |
| 16 | |
| 17 | from testing_support.auto_stub import TestCase |
| 18 | |
| 19 | import git_cl |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 20 | import git_common |
tandrii@chromium.org | 57d8654 | 2016-03-04 16:11:32 +0000 | [diff] [blame] | 21 | import git_footers |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 22 | import subprocess2 |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 23 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 24 | def callError(code=1, cmd='', cwd='', stdout='', stderr=''): |
| 25 | return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr) |
| 26 | |
| 27 | |
| 28 | CERR1 = callError(1) |
| 29 | |
| 30 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 31 | class ChangelistMock(object): |
| 32 | # A class variable so we can access it when we don't have access to the |
| 33 | # instance that's being set. |
| 34 | desc = "" |
| 35 | def __init__(self, **kwargs): |
| 36 | pass |
| 37 | def GetIssue(self): |
| 38 | return 1 |
| 39 | def GetDescription(self): |
| 40 | return ChangelistMock.desc |
| 41 | def UpdateDescription(self, desc): |
| 42 | ChangelistMock.desc = desc |
| 43 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 44 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 45 | class PresubmitMock(object): |
| 46 | def __init__(self, *args, **kwargs): |
| 47 | self.reviewers = [] |
| 48 | @staticmethod |
| 49 | def should_continue(): |
| 50 | return True |
| 51 | |
| 52 | |
| 53 | class RietveldMock(object): |
| 54 | def __init__(self, *args, **kwargs): |
| 55 | pass |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 56 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 57 | @staticmethod |
| 58 | def get_description(issue): |
| 59 | return 'Issue: %d' % issue |
| 60 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 61 | @staticmethod |
| 62 | def get_issue_properties(_issue, _messages): |
| 63 | return { |
| 64 | 'reviewers': ['joe@chromium.org', 'john@chromium.org'], |
| 65 | 'messages': [ |
| 66 | { |
| 67 | 'approval': True, |
| 68 | 'sender': 'john@chromium.org', |
| 69 | }, |
| 70 | ], |
| 71 | } |
| 72 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 73 | @staticmethod |
| 74 | def close_issue(_issue): |
| 75 | return 'Closed' |
| 76 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 77 | |
| 78 | class WatchlistsMock(object): |
| 79 | def __init__(self, _): |
| 80 | pass |
| 81 | @staticmethod |
| 82 | def GetWatchersForPaths(_): |
| 83 | return ['joe@example.com'] |
| 84 | |
| 85 | |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 86 | class CodereviewSettingsFileMock(object): |
| 87 | def __init__(self): |
| 88 | pass |
| 89 | # pylint: disable=R0201 |
| 90 | def read(self): |
| 91 | return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" + |
andybons@chromium.org | 11f46eb | 2016-02-02 19:26:51 +0000 | [diff] [blame] | 92 | "GERRIT_HOST: True\n") |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 93 | |
| 94 | |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 95 | class AuthenticatorMock(object): |
| 96 | def __init__(self, *_args): |
| 97 | pass |
| 98 | def has_cached_credentials(self): |
| 99 | return True |
| 100 | |
| 101 | |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 102 | def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False): |
| 103 | """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies. |
| 104 | |
| 105 | Usage: |
| 106 | >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator", |
| 107 | CookiesAuthenticatorMockFactory({'host1': 'cookie1'})) |
| 108 | |
| 109 | OR |
| 110 | >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator", |
| 111 | CookiesAuthenticatorMockFactory(cookie='cookie')) |
| 112 | """ |
| 113 | class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator): |
| 114 | def __init__(self): # pylint: disable=W0231 |
| 115 | # Intentionally not calling super() because it reads actual cookie files. |
| 116 | pass |
| 117 | @classmethod |
| 118 | def get_gitcookies_path(cls): |
| 119 | return '~/.gitcookies' |
| 120 | @classmethod |
| 121 | def get_netrc_path(cls): |
| 122 | return '~/.netrc' |
| 123 | def get_auth_header(self, host): |
| 124 | if same_cookie: |
| 125 | return same_cookie |
| 126 | return (hosts_with_creds or {}).get(host) |
| 127 | return CookiesAuthenticatorMock |
| 128 | |
| 129 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 130 | class TestGitClBasic(unittest.TestCase): |
| 131 | def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail): |
| 132 | parsed = urlparse.urlparse(url) |
| 133 | result = func(parsed) |
| 134 | if fail: |
| 135 | self.assertIsNone(result) |
| 136 | return None |
| 137 | self.assertIsNotNone(result) |
| 138 | self.assertEqual(result.issue, issue) |
| 139 | self.assertEqual(result.patchset, patchset) |
| 140 | self.assertEqual(result.hostname, hostname) |
| 141 | return result |
| 142 | |
| 143 | def test_ParseIssueURL_rietveld(self): |
| 144 | def test(url, issue=None, patchset=None, hostname=None, patch_url=None, |
| 145 | fail=None): |
| 146 | result = self._test_ParseIssueUrl( |
| 147 | git_cl._RietveldChangelistImpl.ParseIssueURL, |
| 148 | url, issue, patchset, hostname, fail) |
| 149 | if not fail: |
| 150 | self.assertEqual(result.patch_url, patch_url) |
| 151 | |
| 152 | test('http://codereview.chromium.org/123', |
| 153 | 123, None, 'codereview.chromium.org') |
| 154 | test('https://codereview.chromium.org/123', |
| 155 | 123, None, 'codereview.chromium.org') |
| 156 | test('https://codereview.chromium.org/123/', |
| 157 | 123, None, 'codereview.chromium.org') |
| 158 | test('https://codereview.chromium.org/123/whatever', |
| 159 | 123, None, 'codereview.chromium.org') |
wychen | 3c1c172 | 2016-08-04 11:46:36 -0700 | [diff] [blame] | 160 | test('https://codereview.chromium.org/123/#ps20001', |
| 161 | 123, 20001, 'codereview.chromium.org') |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 162 | test('http://codereview.chromium.org/download/issue123_4.diff', |
| 163 | 123, 4, 'codereview.chromium.org', |
| 164 | patch_url='https://codereview.chromium.org/download/issue123_4.diff') |
| 165 | # This looks like bad Gerrit, but is actually valid Rietveld. |
| 166 | test('https://chrome-review.source.com/123/4/', |
| 167 | 123, None, 'chrome-review.source.com') |
| 168 | |
| 169 | test('https://codereview.chromium.org/deadbeaf', fail=True) |
| 170 | test('https://codereview.chromium.org/api/123', fail=True) |
| 171 | test('bad://codereview.chromium.org/123', fail=True) |
| 172 | test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True) |
| 173 | |
| 174 | def test_ParseIssueURL_gerrit(self): |
| 175 | def test(url, issue=None, patchset=None, hostname=None, fail=None): |
| 176 | self._test_ParseIssueUrl( |
| 177 | git_cl._GerritChangelistImpl.ParseIssueURL, |
| 178 | url, issue, patchset, hostname, fail) |
| 179 | |
| 180 | test('http://chrome-review.source.com/c/123', |
| 181 | 123, None, 'chrome-review.source.com') |
| 182 | test('https://chrome-review.source.com/c/123/', |
| 183 | 123, None, 'chrome-review.source.com') |
| 184 | test('https://chrome-review.source.com/c/123/4', |
| 185 | 123, 4, 'chrome-review.source.com') |
| 186 | test('https://chrome-review.source.com/#/c/123/4', |
| 187 | 123, 4, 'chrome-review.source.com') |
| 188 | test('https://chrome-review.source.com/c/123/4', |
| 189 | 123, 4, 'chrome-review.source.com') |
| 190 | test('https://chrome-review.source.com/123', |
| 191 | 123, None, 'chrome-review.source.com') |
| 192 | test('https://chrome-review.source.com/123/4', |
| 193 | 123, 4, 'chrome-review.source.com') |
| 194 | |
| 195 | test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True) |
| 196 | test('https://chrome-review.source.com/c/abc/', fail=True) |
| 197 | test('ssh://chrome-review.source.com/c/123/1/', fail=True) |
| 198 | |
| 199 | def test_ParseIssueNumberArgument(self): |
| 200 | def test(arg, issue=None, patchset=None, hostname=None, fail=False): |
| 201 | result = git_cl.ParseIssueNumberArgument(arg) |
| 202 | self.assertIsNotNone(result) |
| 203 | if fail: |
| 204 | self.assertFalse(result.valid) |
| 205 | else: |
| 206 | self.assertEqual(result.issue, issue) |
| 207 | self.assertEqual(result.patchset, patchset) |
| 208 | self.assertEqual(result.hostname, hostname) |
| 209 | |
| 210 | test('123', 123) |
| 211 | test('', fail=True) |
| 212 | test('abc', fail=True) |
| 213 | test('123/1', fail=True) |
| 214 | test('123a', fail=True) |
| 215 | test('ssh://chrome-review.source.com/#/c/123/4/', fail=True) |
| 216 | # Rietveld. |
| 217 | test('https://codereview.source.com/123', |
| 218 | 123, None, 'codereview.source.com') |
| 219 | test('https://codereview.source.com/www123', fail=True) |
| 220 | # Gerrrit. |
| 221 | test('https://chrome-review.source.com/c/123/4', |
| 222 | 123, 4, 'chrome-review.source.com') |
| 223 | test('https://chrome-review.source.com/bad/123/4', fail=True) |
| 224 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 225 | def test_get_bug_line_values(self): |
| 226 | f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs)) |
| 227 | self.assertEqual(f('', ''), []) |
| 228 | self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456']) |
| 229 | self.assertEqual(f('v8', '456'), ['v8:456']) |
| 230 | self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123']) |
| 231 | # Not nice, but not worth carying. |
| 232 | self.assertEqual(f('v8', 'chromium:123,456,v8:123'), |
| 233 | ['v8:456', 'chromium:123', 'v8:123']) |
| 234 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 235 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 236 | class TestGitCl(TestCase): |
| 237 | def setUp(self): |
| 238 | super(TestGitCl, self).setUp() |
| 239 | self.calls = [] |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 240 | self._calls_done = [] |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 241 | self.mock(subprocess2, 'call', self._mocked_call) |
| 242 | self.mock(subprocess2, 'check_call', self._mocked_call) |
| 243 | self.mock(subprocess2, 'check_output', self._mocked_call) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 244 | self.mock(subprocess2, 'communicate', |
| 245 | lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0)) |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 246 | self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call) |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 247 | self.mock(git_common, 'is_dirty_git_tree', lambda x: False) |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 248 | self.mock(git_common, 'get_or_create_merge_base', |
| 249 | lambda *a: ( |
| 250 | self._mocked_call(['get_or_create_merge_base']+list(a)))) |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 251 | self.mock(git_cl, 'BranchExists', lambda _: True) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 252 | self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '') |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 253 | self.mock(git_cl, 'ask_for_data', self._mocked_call) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 254 | self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 255 | self.mock(git_cl.rietveld, 'Rietveld', RietveldMock) |
maruel@chromium.org | 4bac4b5 | 2012-11-27 20:33:52 +0000 | [diff] [blame] | 256 | self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 257 | self.mock(git_cl.upload, 'RealMain', self.fail) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 258 | self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock) |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 259 | self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 260 | self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce', |
| 261 | classmethod(lambda _: False)) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 262 | # It's important to reset settings to not have inter-tests interference. |
| 263 | git_cl.settings = None |
| 264 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 265 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 266 | def tearDown(self): |
wychen@chromium.org | 445c896 | 2015-04-28 23:30:05 +0000 | [diff] [blame] | 267 | try: |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 268 | # Note: has_failed returns True if at least 1 test ran so far, current |
| 269 | # included, has failed. That means current test may have actually ran |
| 270 | # fine, and the check for no leftover calls would be skipped. |
wychen@chromium.org | 445c896 | 2015-04-28 23:30:05 +0000 | [diff] [blame] | 271 | if not self.has_failed(): |
| 272 | self.assertEquals([], self.calls) |
| 273 | finally: |
| 274 | super(TestGitCl, self).tearDown() |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 275 | |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 276 | def _mocked_call(self, *args, **_kwargs): |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 277 | self.assertTrue( |
| 278 | self.calls, |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 279 | '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args)) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 280 | top = self.calls.pop(0) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 281 | expected_args, result = top |
| 282 | |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 283 | # Also logs otherwise it could get caught in a try/finally and be hard to |
| 284 | # diagnose. |
| 285 | if expected_args != args: |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 286 | N = 5 |
| 287 | prior_calls = '\n '.join( |
| 288 | '@%d: %r' % (len(self._calls_done) - N + i, c[0]) |
| 289 | for i, c in enumerate(self._calls_done[-N:])) |
| 290 | following_calls = '\n '.join( |
| 291 | '@%d: %r' % (len(self._calls_done) + i + 1, c[0]) |
| 292 | for i, c in enumerate(self.calls[:N])) |
| 293 | extended_msg = ( |
| 294 | 'A few prior calls:\n %s\n\n' |
| 295 | 'This (expected):\n @%d: %r\n' |
| 296 | 'This (actual):\n @%d: %r\n\n' |
| 297 | 'A few following expected calls:\n %s' % |
| 298 | (prior_calls, len(self._calls_done), expected_args, |
| 299 | len(self._calls_done), args, following_calls)) |
| 300 | git_cl.logging.error(extended_msg) |
| 301 | |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 302 | self.fail('@%d\n' |
| 303 | ' Expected: %r\n' |
| 304 | ' Actual: %r' % ( |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 305 | len(self._calls_done), expected_args, args)) |
| 306 | |
| 307 | self._calls_done.append(top) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 308 | if isinstance(result, Exception): |
| 309 | raise result |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 310 | return result |
| 311 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 312 | @classmethod |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 313 | def _is_gerrit_calls(cls, gerrit=False): |
| 314 | return [((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 315 | ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')] |
| 316 | |
| 317 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 318 | def _upload_calls(cls, similarity, find_copies, private): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 319 | return (cls._git_base_calls(similarity, find_copies) + |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 320 | cls._git_upload_calls(private)) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 321 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 322 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 323 | def _upload_no_rev_calls(cls, similarity, find_copies): |
| 324 | return (cls._git_base_calls(similarity, find_copies) + |
| 325 | cls._git_upload_no_rev_calls()) |
| 326 | |
| 327 | @classmethod |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 328 | def _git_base_calls(cls, similarity, find_copies): |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 329 | if similarity is None: |
| 330 | similarity = '50' |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 331 | similarity_call = ((['git', 'config', '--int', |
| 332 | 'branch.master.git-cl-similarity'],), CERR1) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 333 | else: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 334 | similarity_call = ((['git', 'config', '--int', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 335 | 'branch.master.git-cl-similarity', similarity],), '') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 336 | |
| 337 | if find_copies is None: |
| 338 | find_copies = True |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 339 | find_copies_call = ((['git', 'config', '--bool', |
| 340 | 'branch.master.git-find-copies'],), CERR1) |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 341 | else: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 342 | val = str(find_copies).lower() |
| 343 | find_copies_call = ((['git', 'config', '--bool', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 344 | 'branch.master.git-find-copies', val],), '') |
| 345 | |
| 346 | if find_copies: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 347 | stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 348 | '--find-copies-harder', '-l100000', '-C'+similarity, |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 349 | 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 350 | else: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 351 | stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 352 | '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 353 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 354 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 355 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 356 | similarity_call, |
| 357 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 358 | find_copies_call, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 359 | ] + cls._is_gerrit_calls() + [ |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 360 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 361 | ((['git', 'config', '--int', 'branch.master.rietveldissue'],), CERR1), |
| 362 | ((['git', 'config', '--int', 'branch.master.gerritissue'],), CERR1), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 363 | ((['git', 'config', 'rietveld.server'],), |
| 364 | 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 365 | ((['git', 'config', 'branch.master.merge'],), 'master'), |
| 366 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 367 | ((['get_or_create_merge_base', 'master', 'master'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 368 | 'fake_ancestor_sha'), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 369 | ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 370 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 371 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
| 372 | ((['git', 'diff', '--name-status', '--no-renames', '-r', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 373 | 'fake_ancestor_sha...', '.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 374 | 'M\t.gitignore\n'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 375 | ((['git', 'config', '--int', 'branch.master.rietveldpatchset'],), CERR1), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 376 | ((['git', 'log', '--pretty=format:%s%n%n%b', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 377 | 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 378 | 'foo'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 379 | ((['git', 'config', 'user.email'],), 'me@example.com'), |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 380 | stat_call, |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 381 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 382 | 'fake_ancestor_sha..HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 383 | 'desc\n'), |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 384 | ((['git', 'config', 'rietveld.bug-prefix'],), ''), |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 385 | ] |
| 386 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 387 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 388 | def _git_upload_no_rev_calls(cls): |
| 389 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 390 | ((['git', 'config', 'core.editor'],), ''), |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 391 | ] |
| 392 | |
| 393 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 394 | def _git_upload_calls(cls, private): |
| 395 | if private: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 396 | cc_call = [] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 397 | private_call = [] |
| 398 | else: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 399 | cc_call = [((['git', 'config', 'rietveld.cc'],), '')] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 400 | private_call = [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 401 | ((['git', 'config', 'rietveld.private'],), '')] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 402 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 403 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 404 | ((['git', 'config', 'core.editor'],), ''), |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 405 | ] + cc_call + private_call + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 406 | ((['git', 'config', 'branch.master.base-url'],), ''), |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 407 | ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 408 | ((['git', |
bratell@opera.com | 05fb911 | 2014-07-07 09:30:23 +0000 | [diff] [blame] | 409 | 'config', '--local', '--get-regexp', '^svn-remote\\.'],), |
| 410 | (('', None), 0)), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 411 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 412 | ((['git', 'svn', 'info'],), ''), |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 413 | ((['git', 'config', 'rietveld.project'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 414 | ((['git', 'config', '--int', 'branch.master.rietveldissue', '1'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 415 | ((['git', 'config', 'branch.master.rietveldserver', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 416 | 'https://codereview.example.com'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 417 | ((['git', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 418 | 'config', '--int', 'branch.master.rietveldpatchset', '2'],), ''), |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 419 | ] + cls._git_post_upload_calls() |
| 420 | |
| 421 | @classmethod |
| 422 | def _git_post_upload_calls(cls): |
| 423 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 424 | ((['git', 'rev-parse', 'HEAD'],), 'hash'), |
| 425 | ((['git', 'symbolic-ref', 'HEAD'],), 'hash'), |
| 426 | ((['git', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 427 | 'config', 'branch.hash.last-upload-hash', 'hash'],), ''), |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 428 | ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''), |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 429 | ] |
| 430 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 431 | @staticmethod |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 432 | def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True): |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 433 | fake_ancestor = 'fake_ancestor' |
| 434 | fake_cl = 'fake_cl_for_patch' |
| 435 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 436 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 437 | 'rev-parse', '--verify', diff_base],), fake_ancestor), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 438 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 439 | 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 440 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 441 | 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 442 | # Mock a config miss (error code 1) |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 443 | ((['git', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 444 | 'config', 'gitcl.remotebranch'],), CERR1), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 445 | ] + ([ |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 446 | # Call to GetRemoteBranch() |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 447 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 448 | 'config', 'branch.%s.merge' % working_branch],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 449 | 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 450 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 451 | 'config', 'branch.%s.remote' % working_branch],), 'origin'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 452 | ] if get_remote_branch else []) + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 453 | ((['git', 'rev-list', '^' + fake_ancestor, |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 454 | 'refs/remotes/origin/master'],), ''), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 455 | ] |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 456 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 457 | @classmethod |
| 458 | def _dcommit_calls_1(cls): |
| 459 | return [ |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 460 | ((['git', 'config', 'rietveld.autoupdate'],), |
| 461 | ''), |
| 462 | ((['git', 'config', 'rietveld.pending-ref-prefix'],), |
| 463 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 464 | ((['git', |
bratell@opera.com | 05fb911 | 2014-07-07 09:30:23 +0000 | [diff] [blame] | 465 | 'config', '--local', '--get-regexp', '^svn-remote\\.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 466 | ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n' |
| 467 | 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'), |
| 468 | None), |
| 469 | 0)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 470 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 471 | ((['git', 'config', '--int', |
| 472 | 'branch.working.git-cl-similarity'],), CERR1), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 473 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 474 | ((['git', 'config', '--bool', |
| 475 | 'branch.working.git-find-copies'],), CERR1), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 476 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 477 | ((['git', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 478 | 'config', '--int', 'branch.working.rietveldissue'],), '12345'), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 479 | ((['git', |
| 480 | 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 481 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 482 | 'config', 'branch.working.merge'],), 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 483 | ((['git', 'config', 'branch.working.remote'],), 'origin'), |
iannucci@chromium.org | 5724c96 | 2014-04-11 09:32:56 +0000 | [diff] [blame] | 484 | ((['git', 'config', 'branch.working.merge'],), |
| 485 | 'refs/heads/master'), |
| 486 | ((['git', 'config', 'branch.working.remote'],), 'origin'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 487 | ((['git', 'rev-list', '--merges', |
szager@chromium.org | e84b754 | 2012-06-15 21:26:58 +0000 | [diff] [blame] | 488 | '--grep=^SVN changes up to revision [0-9]*$', |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 489 | 'refs/remotes/origin/master^!'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 490 | ((['git', 'rev-list', '^refs/heads/working', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 491 | 'refs/remotes/origin/master'],), |
| 492 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 493 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 494 | 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 495 | '3fc18b62c4966193eb435baabe2d18a3810ec82e'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 496 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 497 | 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 498 | 'refs/remotes/origin/master'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 499 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 500 | 'merge-base', 'refs/remotes/origin/master', 'HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 501 | 'fake_ancestor_sha'), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 502 | ] |
| 503 | |
| 504 | @classmethod |
| 505 | def _dcommit_calls_normal(cls): |
| 506 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 507 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 508 | ((['git', 'rev-parse', 'HEAD'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 509 | '00ff397798ea57439712ed7e04ab96e13969ef40'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 510 | ((['git', |
mcgrathr@chromium.org | 9249f64 | 2013-06-03 21:36:18 +0000 | [diff] [blame] | 511 | 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 512 | '.'],), |
| 513 | 'M\tPRESUBMIT.py'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 514 | ((['git', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 515 | 'config', '--int', 'branch.working.rietveldpatchset'],), '31137'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 516 | ((['git', 'config', 'branch.working.rietveldserver'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 517 | 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 518 | ((['git', 'config', 'user.email'],), 'author@example.com'), |
| 519 | ((['git', 'config', 'rietveld.tree-status-url'],), ''), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 520 | ] |
| 521 | |
| 522 | @classmethod |
| 523 | def _dcommit_calls_bypassed(cls): |
| 524 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 525 | ((['git', 'config', 'branch.working.rietveldserver'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 526 | 'codereview.example.com'), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 527 | ] |
| 528 | |
| 529 | @classmethod |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 530 | def _dcommit_calls_3(cls): |
| 531 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 532 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 533 | 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 534 | '-l100000', '-C50', 'fake_ancestor_sha', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 535 | 'refs/heads/working'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 536 | (' PRESUBMIT.py | 2 +-\n' |
| 537 | ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 538 | ((['git', 'show-ref', '--quiet', '--verify', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 539 | 'refs/heads/git-cl-commit'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 540 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| 541 | ((['git', 'show-ref', '--quiet', '--verify', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 542 | 'refs/heads/git-cl-cherry-pick'],), CERR1), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 543 | ((['git', 'rev-parse', '--show-cdup'],), '\n'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 544 | ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''), |
| 545 | ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''), |
| 546 | ((['git', 'commit', '-m', |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 547 | 'Issue: 12345\n\nR=john@chromium.org\n\n' |
sergiyb@chromium.org | 4b39c5f | 2015-07-07 10:33:12 +0000 | [diff] [blame] | 548 | 'Review URL: https://codereview.example.com/12345 .'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 549 | ''), |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 550 | ((['git', 'config', 'rietveld.force-https-commit-url'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 551 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 552 | 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],), |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 553 | (('', None), 0)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 554 | ((['git', 'checkout', '-q', 'working'],), ''), |
| 555 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 556 | ] |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 557 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 558 | @staticmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 559 | def _cmd_line(description, args, similarity, find_copies, private): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 560 | """Returns the upload command line passed to upload.RealMain().""" |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 561 | return [ |
| 562 | 'upload', '--assume_yes', '--server', |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 563 | 'https://codereview.example.com', |
maruel@chromium.org | 71e12a9 | 2012-02-14 02:34:15 +0000 | [diff] [blame] | 564 | '--message', description |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 565 | ] + args + [ |
| 566 | '--cc', 'joe@example.com', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 567 | ] + (['--private'] if private else []) + [ |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 568 | '--git_similarity', similarity or '50' |
| 569 | ] + (['--git_no_find_copies'] if find_copies == False else []) + [ |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 570 | 'fake_ancestor_sha', 'HEAD' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 571 | ] |
| 572 | |
| 573 | def _run_reviewer_test( |
| 574 | self, |
| 575 | upload_args, |
| 576 | expected_description, |
| 577 | returned_description, |
| 578 | final_description, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 579 | reviewers, |
| 580 | private=False): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 581 | """Generic reviewer test framework.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 582 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 583 | try: |
| 584 | similarity = upload_args[upload_args.index('--similarity')+1] |
| 585 | except ValueError: |
| 586 | similarity = None |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 587 | |
| 588 | if '--find-copies' in upload_args: |
| 589 | find_copies = True |
| 590 | elif '--no-find-copies' in upload_args: |
| 591 | find_copies = False |
| 592 | else: |
| 593 | find_copies = None |
| 594 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 595 | private = '--private' in upload_args |
| 596 | |
| 597 | self.calls = self._upload_calls(similarity, find_copies, private) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 598 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 599 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 600 | self.assertEquals( |
| 601 | '# Enter a description of the change.\n' |
janx@chromium.org | 104b2db | 2013-04-18 12:58:40 +0000 | [diff] [blame] | 602 | '# This will be displayed on the codereview site.\n' |
alancutter@chromium.org | 63a4d7f | 2013-05-31 02:22:45 +0000 | [diff] [blame] | 603 | '# The first line will also be used as the subject of the review.\n' |
alancutter@chromium.org | bd1073e | 2013-06-01 00:34:38 +0000 | [diff] [blame] | 604 | '#--------------------This line is 72 characters long' |
| 605 | '--------------------\n' + |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 606 | expected_description, |
| 607 | desc) |
| 608 | return returned_description |
| 609 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 610 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 611 | def check_upload(args): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 612 | cmd_line = self._cmd_line(final_description, reviewers, similarity, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 613 | find_copies, private) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 614 | self.assertEquals(cmd_line, args) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 615 | return 1, 2 |
| 616 | self.mock(git_cl.upload, 'RealMain', check_upload) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 617 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 618 | git_cl.main(['upload'] + upload_args) |
| 619 | |
| 620 | def test_no_reviewer(self): |
| 621 | self._run_reviewer_test( |
| 622 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 623 | 'desc\n\nBUG=', |
| 624 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 625 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 626 | []) |
| 627 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 628 | def test_keep_similarity(self): |
| 629 | self._run_reviewer_test( |
| 630 | ['--similarity', '70'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 631 | 'desc\n\nBUG=', |
| 632 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 633 | 'desc\n\nBUG=', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 634 | []) |
| 635 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 636 | def test_keep_find_copies(self): |
| 637 | self._run_reviewer_test( |
| 638 | ['--no-find-copies'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 639 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 640 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 641 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 642 | []) |
| 643 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 644 | def test_private(self): |
| 645 | self._run_reviewer_test( |
| 646 | ['--private'], |
| 647 | 'desc\n\nBUG=', |
| 648 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
| 649 | 'desc\n\nBUG=', |
| 650 | []) |
| 651 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 652 | def test_reviewers_cmd_line(self): |
| 653 | # Reviewer is passed as-is |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 654 | description = 'desc\n\nR=foo@example.com\nBUG=' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 655 | self._run_reviewer_test( |
| 656 | ['-r' 'foo@example.com'], |
| 657 | description, |
| 658 | '\n%s\n' % description, |
| 659 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 660 | ['--reviewers=foo@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 661 | |
| 662 | def test_reviewer_tbr_overriden(self): |
| 663 | # Reviewer is overriden with TBR |
| 664 | # Also verifies the regexp work without a trailing LF |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 665 | description = 'Foo Bar\n\nTBR=reviewer@example.com' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 666 | self._run_reviewer_test( |
| 667 | ['-r' 'foo@example.com'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 668 | 'desc\n\nR=foo@example.com\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 669 | description.strip('\n'), |
| 670 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 671 | ['--reviewers=reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 672 | |
| 673 | def test_reviewer_multiple(self): |
| 674 | # Handles multiple R= or TBR= lines. |
| 675 | description = ( |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 676 | 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com') |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 677 | self._run_reviewer_test( |
| 678 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 679 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 680 | description, |
| 681 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 682 | ['--reviewers=another@example.com,reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 683 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 684 | def test_reviewer_send_mail(self): |
| 685 | # --send-mail can be used without -r if R= is used |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 686 | description = 'Foo Bar\nR=reviewer@example.com' |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 687 | self._run_reviewer_test( |
| 688 | ['--send-mail'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 689 | 'desc\n\nBUG=', |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 690 | description.strip('\n'), |
| 691 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 692 | ['--reviewers=reviewer@example.com', '--send_mail']) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 693 | |
| 694 | def test_reviewer_send_mail_no_rev(self): |
| 695 | # Fails without a reviewer. |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 696 | stdout = StringIO.StringIO() |
| 697 | stderr = StringIO.StringIO() |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 698 | try: |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 699 | self.calls = self._upload_no_rev_calls(None, None) |
| 700 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 701 | return desc |
| 702 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 703 | self.mock(sys, 'stdout', stdout) |
| 704 | self.mock(sys, 'stderr', stderr) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 705 | git_cl.main(['upload', '--send-mail']) |
| 706 | self.fail() |
| 707 | except SystemExit: |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 708 | self.assertEqual( |
| 709 | 'Using 50% similarity for rename/copy detection. Override with ' |
| 710 | '--similarity.\n', |
| 711 | stdout.getvalue()) |
| 712 | self.assertEqual( |
| 713 | 'Must specify reviewers to send email.\n', stderr.getvalue()) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 714 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 715 | def test_bug_on_cmd(self): |
| 716 | self._run_reviewer_test( |
| 717 | ['--bug=500658,proj:123'], |
| 718 | 'desc\n\nBUG=500658\nBUG=proj:123', |
| 719 | '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234', |
| 720 | 'desc\n\nBUG=500658\nBUG=proj:1234', |
| 721 | []) |
| 722 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 723 | def test_dcommit(self): |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 724 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 725 | self.calls = ( |
| 726 | self._dcommit_calls_1() + |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 727 | self._git_sanity_checks('fake_ancestor_sha', 'working') + |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 728 | self._dcommit_calls_normal() + |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 729 | self._dcommit_calls_3()) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 730 | git_cl.main(['dcommit']) |
| 731 | |
| 732 | def test_dcommit_bypass_hooks(self): |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 733 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 734 | self.calls = ( |
| 735 | self._dcommit_calls_1() + |
| 736 | self._dcommit_calls_bypassed() + |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 737 | self._dcommit_calls_3()) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 738 | git_cl.main(['dcommit', '--bypass-hooks']) |
| 739 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 740 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 741 | @classmethod |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 742 | def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False): |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 743 | cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated'] |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 744 | if skip_auth_check: |
| 745 | return [((cmd, ), 'true')] |
| 746 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 747 | calls = [((cmd, ), CERR1)] |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 748 | if issue: |
| 749 | calls.extend([ |
| 750 | ((['git', 'config', 'branch.master.gerritserver'],), ''), |
| 751 | ]) |
| 752 | calls.extend([ |
| 753 | ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
| 754 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| 755 | ((['git', 'config', 'remote.origin.url'],), |
| 756 | 'https://chromium.googlesource.com/my/repo'), |
| 757 | ((['git', 'config', 'remote.origin.url'],), |
| 758 | 'https://chromium.googlesource.com/my/repo'), |
| 759 | ]) |
| 760 | return calls |
| 761 | |
| 762 | @classmethod |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 763 | def _gerrit_base_calls(cls, issue=None): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 764 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 765 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 766 | ((['git', 'config', '--int', 'branch.master.git-cl-similarity'],), |
| 767 | CERR1), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 768 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 769 | ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), |
| 770 | CERR1), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 771 | ] + cls._is_gerrit_calls(True) + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 772 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 773 | ((['git', 'config', '--int', 'branch.master.rietveldissue'],), CERR1), |
| 774 | ((['git', 'config', '--int', 'branch.master.gerritissue'],), |
| 775 | CERR1 if issue is None else str(issue)), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 776 | ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 777 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 778 | ((['get_or_create_merge_base', 'master', |
| 779 | 'refs/remotes/origin/master'],), |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 780 | 'fake_ancestor_sha'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 781 | # Calls to verify branch point is ancestor |
| 782 | ] + (cls._gerrit_ensure_auth_calls(issue=issue) + |
| 783 | cls._git_sanity_checks('fake_ancestor_sha', 'master', |
| 784 | get_remote_branch=False)) + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 785 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 786 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 787 | |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 788 | ((['git', |
mcgrathr@chromium.org | 9249f64 | 2013-06-03 21:36:18 +0000 | [diff] [blame] | 789 | 'diff', '--name-status', '--no-renames', '-r', |
| 790 | 'fake_ancestor_sha...', '.'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 791 | 'M\t.gitignore\n'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 792 | ((['git', 'config', '--int', 'branch.master.gerritpatchset'],), CERR1), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 793 | ] + ([] if issue else [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 794 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 795 | 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 796 | 'foo'), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 797 | ]) + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 798 | ((['git', 'config', 'user.email'],), 'me@example.com'), |
| 799 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 800 | 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 801 | '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 802 | '+dat'), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 803 | ] |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 804 | |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 805 | @classmethod |
| 806 | def _gerrit_upload_calls(cls, description, reviewers, squash, |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 807 | squash_mode='default', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 808 | expected_upstream_ref='origin/refs/heads/master', |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 809 | ref_suffix='', notify=False, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 810 | post_amend_description=None, issue=None): |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 811 | if post_amend_description is None: |
| 812 | post_amend_description = description |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 813 | calls = [] |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 814 | |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 815 | if squash_mode == 'default': |
| 816 | calls.extend([ |
| 817 | ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''), |
| 818 | ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''), |
| 819 | ]) |
| 820 | elif squash_mode in ('override_squash', 'override_nosquash'): |
| 821 | calls.extend([ |
| 822 | ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), |
| 823 | 'true' if squash_mode == 'override_squash' else 'false'), |
| 824 | ]) |
| 825 | else: |
| 826 | assert squash_mode in ('squash', 'nosquash') |
| 827 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 828 | # If issue is given, then description is fetched from Gerrit instead. |
| 829 | if issue is None: |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 830 | calls += [ |
| 831 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
| 832 | 'fake_ancestor_sha..HEAD'],), |
| 833 | description)] |
tandrii@chromium.org | 57d8654 | 2016-03-04 16:11:32 +0000 | [diff] [blame] | 834 | if not git_footers.get_footer_change_id(description) and not squash: |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 835 | calls += [ |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 836 | # DownloadGerritHook(False) |
| 837 | ((False, ), |
| 838 | ''), |
| 839 | # Amending of commit message to get the Change-Id. |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 840 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 841 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 842 | description), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 843 | ((['git', 'commit', '--amend', '-m', description],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 844 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 845 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 846 | 'fake_ancestor_sha..HEAD'],), |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 847 | post_amend_description) |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 848 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 849 | if squash: |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 850 | if not issue: |
| 851 | # Prompting to edit description on first upload. |
| 852 | calls += [ |
| 853 | ((['git', 'config', 'core.editor'],), ''), |
| 854 | ((['RunEditor'],), description), |
| 855 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 856 | ref_to_push = 'abcdef0123456789' |
| 857 | calls += [ |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 858 | ((['git', 'config', 'branch.master.merge'],), |
| 859 | 'refs/heads/master'), |
| 860 | ((['git', 'config', 'branch.master.remote'],), |
| 861 | 'origin'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 862 | ((['get_or_create_merge_base', 'master', |
| 863 | 'refs/remotes/origin/master'],), |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 864 | 'origin/master'), |
| 865 | ((['git', 'rev-parse', 'HEAD:'],), |
| 866 | '0123456789abcdef'), |
| 867 | ((['git', 'commit-tree', '0123456789abcdef', '-p', |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 868 | 'origin/master', '-m', description],), |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 869 | ref_to_push), |
| 870 | ] |
| 871 | else: |
| 872 | ref_to_push = 'HEAD' |
| 873 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 874 | calls += [ |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 875 | ((['git', 'rev-list', |
| 876 | expected_upstream_ref + '..' + ref_to_push],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 877 | ((['git', 'config', 'rietveld.cc'],), '') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 878 | ] |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 879 | |
| 880 | notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE') |
| 881 | if ref_suffix: |
| 882 | ref_suffix += ',' + notify_suffix |
| 883 | else: |
| 884 | ref_suffix = '%' + notify_suffix |
tandrii@chromium.org | 074c2af | 2016-06-03 23:18:40 +0000 | [diff] [blame] | 885 | |
| 886 | # Add cc from watch list. |
| 887 | ref_suffix += ',cc=joe@example.com' |
| 888 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 889 | if reviewers: |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 890 | ref_suffix += ',' + ','.join('r=%s' % email |
| 891 | for email in sorted(reviewers)) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 892 | calls += [ |
tandrii@chromium.org | 8acd833 | 2016-04-13 12:56:03 +0000 | [diff] [blame] | 893 | ((['git', 'push', 'origin', |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 894 | ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],), |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 895 | ('remote:\n' |
| 896 | 'remote: Processing changes: (\)\n' |
| 897 | 'remote: Processing changes: (|)\n' |
| 898 | 'remote: Processing changes: (/)\n' |
| 899 | 'remote: Processing changes: (-)\n' |
| 900 | 'remote: Processing changes: new: 1 (/)\n' |
| 901 | 'remote: Processing changes: new: 1, done\n' |
| 902 | 'remote:\n' |
| 903 | 'remote: New Changes:\n' |
| 904 | 'remote: https://chromium-review.googlesource.com/123456 XXX.\n' |
| 905 | 'remote:\n' |
| 906 | 'To https://chromium.googlesource.com/yyy/zzz\n' |
| 907 | ' * [new branch] hhhh -> refs/for/refs/heads/master\n')), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 908 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 909 | if squash: |
| 910 | calls += [ |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 911 | ((['git', 'config', '--int', 'branch.master.gerritissue', '123456'],), |
| 912 | ''), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 913 | ((['git', 'config', 'branch.master.gerritserver', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 914 | 'https://chromium-review.googlesource.com'],), ''), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 915 | ((['git', 'config', 'branch.master.gerritsquashhash', |
| 916 | 'abcdef0123456789'],), ''), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 917 | ] |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 918 | calls += cls._git_post_upload_calls() |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 919 | return calls |
| 920 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 921 | def _run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 922 | self, |
| 923 | upload_args, |
| 924 | description, |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 925 | reviewers=None, |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 926 | squash=True, |
| 927 | squash_mode=None, |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 928 | expected_upstream_ref='origin/refs/heads/master', |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 929 | ref_suffix='', |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 930 | notify=False, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 931 | post_amend_description=None, |
| 932 | issue=None): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 933 | """Generic gerrit upload test framework.""" |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 934 | if squash_mode is None: |
| 935 | if '--no-squash' in upload_args: |
| 936 | squash_mode = 'nosquash' |
| 937 | elif '--squash' in upload_args: |
| 938 | squash_mode = 'squash' |
| 939 | else: |
| 940 | squash_mode = 'default' |
| 941 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 942 | reviewers = reviewers or [] |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 943 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 944 | self.mock(git_cl.gerrit_util, 'CookiesAuthenticator', |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 945 | CookiesAuthenticatorMockFactory(same_cookie='same_cred')) |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 946 | self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck', |
| 947 | lambda _, offer_removal: None) |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 948 | self.mock(git_cl.gclient_utils, 'RunEditor', |
| 949 | lambda *_, **__: self._mocked_call(['RunEditor'])) |
| 950 | self.mock(git_cl, 'DownloadGerritHook', self._mocked_call) |
| 951 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 952 | self.calls = self._gerrit_base_calls(issue=issue) |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 953 | self.calls += self._gerrit_upload_calls( |
| 954 | description, reviewers, squash, |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 955 | squash_mode=squash_mode, |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 956 | expected_upstream_ref=expected_upstream_ref, |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 957 | ref_suffix=ref_suffix, notify=notify, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 958 | post_amend_description=post_amend_description, |
| 959 | issue=issue) |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 960 | # Uncomment when debugging. |
| 961 | # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 962 | git_cl.main(['upload'] + upload_args) |
| 963 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 964 | def test_gerrit_upload_without_change_id(self): |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 965 | self._run_gerrit_upload_test( |
| 966 | ['--no-squash'], |
| 967 | 'desc\n\nBUG=\n', |
| 968 | [], |
| 969 | squash=False, |
| 970 | post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx') |
| 971 | |
| 972 | def test_gerrit_upload_without_change_id_override_nosquash(self): |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 973 | self.mock(git_cl, 'DownloadGerritHook', self._mocked_call) |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 974 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 975 | [], |
jamesr@chromium.org | 35d1a84 | 2012-07-27 00:20:43 +0000 | [diff] [blame] | 976 | 'desc\n\nBUG=\n', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 977 | [], |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 978 | squash=False, |
| 979 | squash_mode='override_nosquash', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 980 | post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 981 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 982 | def test_gerrit_no_reviewer(self): |
| 983 | self._run_gerrit_upload_test( |
| 984 | [], |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 985 | 'desc\n\nBUG=\n\nChange-Id: I123456789\n', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 986 | [], |
| 987 | squash=False, |
| 988 | squash_mode='override_nosquash') |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 989 | |
tandrii | eefe832 | 2016-08-17 10:12:24 -0700 | [diff] [blame] | 990 | def test_gerrit_patch_bad_chars(self): |
| 991 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 992 | self._run_gerrit_upload_test( |
tandrii | eefe832 | 2016-08-17 10:12:24 -0700 | [diff] [blame] | 993 | ['-f', '-t', 'Don\'t put bad cha,.rs'], |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 994 | 'desc\n\nBUG=\n\nChange-Id: I123456789', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 995 | squash=False, |
| 996 | squash_mode='override_nosquash', |
tandrii | eefe832 | 2016-08-17 10:12:24 -0700 | [diff] [blame] | 997 | ref_suffix='%m=Dont_put_bad_chars') |
| 998 | self.assertIn( |
| 999 | 'WARNING: Patchset title may only contain alphanumeric chars ' |
| 1000 | 'and spaces. Cleaned up title:\nDont put bad chars\n', |
| 1001 | git_cl.sys.stdout.getvalue()) |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 1002 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1003 | def test_gerrit_reviewers_cmd_line(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1004 | self._run_gerrit_upload_test( |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1005 | ['-r', 'foo@example.com', '--send-mail'], |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 1006 | 'desc\n\nBUG=\n\nChange-Id: I123456789', |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1007 | ['foo@example.com'], |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1008 | squash=False, |
| 1009 | squash_mode='override_nosquash', |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1010 | notify=True) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1011 | |
| 1012 | def test_gerrit_reviewer_multiple(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1013 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1014 | [], |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 1015 | 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n' |
| 1016 | 'Change-Id: 123456789\n', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1017 | ['reviewer@example.com', 'another@example.com'], |
| 1018 | squash=False, |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 1019 | squash_mode='override_nosquash', |
| 1020 | ref_suffix='%l=Code-Review+1') |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1021 | |
| 1022 | def test_gerrit_upload_squash_first_is_default(self): |
| 1023 | # Mock Gerrit CL description to indicate the first upload. |
| 1024 | self.mock(git_cl.Changelist, 'GetDescription', |
| 1025 | lambda *_: None) |
| 1026 | self._run_gerrit_upload_test( |
| 1027 | [], |
| 1028 | 'desc\nBUG=\n\nChange-Id: 123456789', |
| 1029 | [], |
| 1030 | expected_upstream_ref='origin/master') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1031 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1032 | def test_gerrit_upload_squash_first(self): |
| 1033 | # Mock Gerrit CL description to indicate the first upload. |
| 1034 | self.mock(git_cl.Changelist, 'GetDescription', |
| 1035 | lambda *_: None) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1036 | self._run_gerrit_upload_test( |
| 1037 | ['--squash'], |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1038 | 'desc\nBUG=\n\nChange-Id: 123456789', |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1039 | [], |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 1040 | squash=True, |
| 1041 | expected_upstream_ref='origin/master') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1042 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1043 | def test_gerrit_upload_squash_reupload(self): |
| 1044 | description = 'desc\nBUG=\n\nChange-Id: 123456789' |
| 1045 | # Mock Gerrit CL description to indicate re-upload. |
| 1046 | self.mock(git_cl.Changelist, 'GetDescription', |
| 1047 | lambda *args: description) |
| 1048 | self.mock(git_cl.Changelist, 'GetMostRecentPatchset', |
| 1049 | lambda *args: 1) |
| 1050 | self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail', |
| 1051 | lambda *args: {'change_id': '123456789'}) |
| 1052 | self._run_gerrit_upload_test( |
| 1053 | ['--squash'], |
| 1054 | description, |
| 1055 | [], |
| 1056 | squash=True, |
| 1057 | expected_upstream_ref='origin/master', |
| 1058 | issue=123456) |
| 1059 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1060 | def test_upload_branch_deps(self): |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1061 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1062 | def mock_run_git(*args, **_kwargs): |
| 1063 | if args[0] == ['for-each-ref', |
| 1064 | '--format=%(refname:short) %(upstream:short)', |
| 1065 | 'refs/heads']: |
| 1066 | # Create a local branch dependency tree that looks like this: |
| 1067 | # test1 -> test2 -> test3 -> test4 -> test5 |
| 1068 | # -> test3.1 |
| 1069 | # test6 -> test0 |
| 1070 | branch_deps = [ |
| 1071 | 'test2 test1', # test1 -> test2 |
| 1072 | 'test3 test2', # test2 -> test3 |
| 1073 | 'test3.1 test2', # test2 -> test3.1 |
| 1074 | 'test4 test3', # test3 -> test4 |
| 1075 | 'test5 test4', # test4 -> test5 |
| 1076 | 'test6 test0', # test0 -> test6 |
| 1077 | 'test7', # test7 |
| 1078 | ] |
| 1079 | return '\n'.join(branch_deps) |
| 1080 | self.mock(git_cl, 'RunGit', mock_run_git) |
| 1081 | |
| 1082 | class RecordCalls: |
| 1083 | times_called = 0 |
| 1084 | record_calls = RecordCalls() |
| 1085 | def mock_CMDupload(*args, **_kwargs): |
| 1086 | record_calls.times_called += 1 |
| 1087 | return 0 |
| 1088 | self.mock(git_cl, 'CMDupload', mock_CMDupload) |
| 1089 | |
| 1090 | self.calls = [ |
| 1091 | (('[Press enter to continue or ctrl-C to quit]',), ''), |
| 1092 | ] |
| 1093 | |
| 1094 | class MockChangelist(): |
| 1095 | def __init__(self): |
| 1096 | pass |
| 1097 | def GetBranch(self): |
| 1098 | return 'test1' |
| 1099 | def GetIssue(self): |
| 1100 | return '123' |
| 1101 | def GetPatchset(self): |
| 1102 | return '1001' |
tandrii@chromium.org | 4c72b08 | 2016-03-31 22:26:35 +0000 | [diff] [blame] | 1103 | def IsGerrit(self): |
| 1104 | return False |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1105 | |
| 1106 | ret = git_cl.upload_branch_deps(MockChangelist(), []) |
| 1107 | # CMDupload should have been called 5 times because of 5 dependent branches. |
| 1108 | self.assertEquals(5, record_calls.times_called) |
| 1109 | self.assertEquals(0, ret) |
| 1110 | |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 1111 | def test_gerrit_change_id(self): |
| 1112 | self.calls = [ |
| 1113 | ((['git', 'write-tree'], ), |
| 1114 | 'hashtree'), |
| 1115 | ((['git', 'rev-parse', 'HEAD~0'], ), |
| 1116 | 'branch-parent'), |
| 1117 | ((['git', 'var', 'GIT_AUTHOR_IDENT'], ), |
| 1118 | 'A B <a@b.org> 1456848326 +0100'), |
| 1119 | ((['git', 'var', 'GIT_COMMITTER_IDENT'], ), |
| 1120 | 'C D <c@d.org> 1456858326 +0100'), |
| 1121 | ((['git', 'hash-object', '-t', 'commit', '--stdin'], ), |
| 1122 | 'hashchange'), |
| 1123 | ] |
| 1124 | change_id = git_cl.GenerateGerritChangeId('line1\nline2\n') |
| 1125 | self.assertEqual(change_id, 'Ihashchange') |
| 1126 | |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 1127 | def test_desecription_append_footer(self): |
| 1128 | for init_desc, footer_line, expected_desc in [ |
| 1129 | # Use unique desc first lines for easy test failure identification. |
| 1130 | ('foo', 'R=one', 'foo\n\nR=one'), |
| 1131 | ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='), |
| 1132 | ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'), |
| 1133 | ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'), |
| 1134 | ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two', |
| 1135 | 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'), |
| 1136 | ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz', |
| 1137 | 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'), |
| 1138 | ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz', |
| 1139 | 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'), |
| 1140 | ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'), |
| 1141 | ]: |
| 1142 | desc = git_cl.ChangeDescription(init_desc) |
| 1143 | desc.append_footer(footer_line) |
| 1144 | self.assertEqual(desc.description, expected_desc) |
| 1145 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1146 | def test_update_reviewers(self): |
| 1147 | data = [ |
| 1148 | ('foo', [], 'foo'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1149 | ('foo\nR=xx', [], 'foo\nR=xx'), |
| 1150 | ('foo\nTBR=xx', [], 'foo\nTBR=xx'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1151 | ('foo', ['a@c'], 'foo\n\nR=a@c'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1152 | ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'), |
| 1153 | ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'), |
| 1154 | ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1155 | ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1156 | ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1157 | ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'), |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1158 | ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 1159 | ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 1160 | # Same as the line before, but full of whitespaces. |
| 1161 | ( |
| 1162 | 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], |
| 1163 | 'foo\nBar\n\nR=c@c\n BUG =', |
| 1164 | ), |
| 1165 | # Whitespaces aren't interpreted as new lines. |
| 1166 | ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1167 | ] |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1168 | expected = [i[2] for i in data] |
| 1169 | actual = [] |
| 1170 | for orig, reviewers, _expected in data: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1171 | obj = git_cl.ChangeDescription(orig) |
| 1172 | obj.update_reviewers(reviewers) |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1173 | actual.append(obj.description) |
| 1174 | self.assertEqual(expected, actual) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1175 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1176 | def test_get_target_ref(self): |
| 1177 | # Check remote or remote branch not present. |
| 1178 | self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None)) |
| 1179 | self.assertEqual(None, git_cl.GetTargetRef(None, |
| 1180 | 'refs/remotes/origin/master', |
| 1181 | 'master', None)) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1182 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1183 | # Check default target refs for branches. |
| 1184 | self.assertEqual('refs/heads/master', |
| 1185 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
| 1186 | None, None)) |
| 1187 | self.assertEqual('refs/heads/master', |
| 1188 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr', |
| 1189 | None, None)) |
| 1190 | self.assertEqual('refs/heads/master', |
| 1191 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr', |
| 1192 | None, None)) |
| 1193 | self.assertEqual('refs/branch-heads/123', |
| 1194 | git_cl.GetTargetRef('origin', |
| 1195 | 'refs/remotes/branch-heads/123', |
| 1196 | None, None)) |
| 1197 | self.assertEqual('refs/diff/test', |
| 1198 | git_cl.GetTargetRef('origin', |
| 1199 | 'refs/remotes/origin/refs/diff/test', |
| 1200 | None, None)) |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 1201 | self.assertEqual('refs/heads/chrome/m42', |
| 1202 | git_cl.GetTargetRef('origin', |
| 1203 | 'refs/remotes/origin/chrome/m42', |
| 1204 | None, None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1205 | |
| 1206 | # Check target refs for user-specified target branch. |
| 1207 | for branch in ('branch-heads/123', 'remotes/branch-heads/123', |
| 1208 | 'refs/remotes/branch-heads/123'): |
| 1209 | self.assertEqual('refs/branch-heads/123', |
| 1210 | git_cl.GetTargetRef('origin', |
| 1211 | 'refs/remotes/origin/master', |
| 1212 | branch, None)) |
| 1213 | for branch in ('origin/master', 'remotes/origin/master', |
| 1214 | 'refs/remotes/origin/master'): |
| 1215 | self.assertEqual('refs/heads/master', |
| 1216 | git_cl.GetTargetRef('origin', |
| 1217 | 'refs/remotes/branch-heads/123', |
| 1218 | branch, None)) |
| 1219 | for branch in ('master', 'heads/master', 'refs/heads/master'): |
| 1220 | self.assertEqual('refs/heads/master', |
| 1221 | git_cl.GetTargetRef('origin', |
| 1222 | 'refs/remotes/branch-heads/123', |
| 1223 | branch, None)) |
| 1224 | |
| 1225 | # Check target refs for pending prefix. |
| 1226 | self.assertEqual('prefix/heads/master', |
| 1227 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
| 1228 | None, 'prefix/')) |
| 1229 | |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1230 | def test_patch_when_dirty(self): |
| 1231 | # Patch when local tree is dirty |
| 1232 | self.mock(git_common, 'is_dirty_git_tree', lambda x: True) |
| 1233 | self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
| 1234 | |
| 1235 | def test_diff_when_dirty(self): |
| 1236 | # Do 'git cl diff' when local tree is dirty |
| 1237 | self.mock(git_common, 'is_dirty_git_tree', lambda x: True) |
| 1238 | self.assertNotEqual(git_cl.main(['diff']), 0) |
| 1239 | |
tandrii | df09a46 | 2016-08-18 16:23:55 -0700 | [diff] [blame] | 1240 | def _patch_common(self, is_gerrit=False, force_codereview=False, |
| 1241 | new_branch=False): |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1242 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1243 | self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset', |
| 1244 | lambda x: '60001') |
| 1245 | self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff', |
| 1246 | lambda *args: None) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1247 | self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail', |
| 1248 | lambda *args: { |
| 1249 | 'current_revision': '7777777777', |
| 1250 | 'revisions': { |
| 1251 | '1111111111': { |
| 1252 | '_number': 1, |
| 1253 | 'fetch': {'http': { |
| 1254 | 'url': 'https://chromium.googlesource.com/my/repo', |
| 1255 | 'ref': 'refs/changes/56/123456/1', |
| 1256 | }}, |
| 1257 | }, |
| 1258 | '7777777777': { |
| 1259 | '_number': 7, |
| 1260 | 'fetch': {'http': { |
| 1261 | 'url': 'https://chromium.googlesource.com/my/repo', |
| 1262 | 'ref': 'refs/changes/56/123456/7', |
| 1263 | }}, |
| 1264 | }, |
| 1265 | }, |
| 1266 | }) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1267 | self.mock(git_cl.Changelist, 'GetDescription', |
| 1268 | lambda *args: 'Description') |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1269 | self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True) |
| 1270 | |
tandrii | df09a46 | 2016-08-18 16:23:55 -0700 | [diff] [blame] | 1271 | if new_branch: |
| 1272 | self.calls = [((['git', 'new-branch', 'master'],), ''),] |
| 1273 | else: |
| 1274 | self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')] |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1275 | if not force_codereview: |
| 1276 | # These calls detect codereview to use. |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 1277 | self.calls += [ |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1278 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1279 | ((['git', 'config', '--int', 'branch.master.rietveldissue'],), CERR1), |
| 1280 | ((['git', 'config', '--int', 'branch.master.gerritissue'],), CERR1), |
| 1281 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1282 | ] |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1283 | |
| 1284 | if is_gerrit: |
| 1285 | if not force_codereview: |
| 1286 | self.calls += [ |
| 1287 | ((['git', 'config', 'gerrit.host'],), 'true'), |
| 1288 | ] |
| 1289 | else: |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1290 | self.calls += [ |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1291 | ((['git', 'config', 'gerrit.host'],), CERR1), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1292 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 1293 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 1294 | ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''), |
| 1295 | ] |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1296 | |
tandrii | df09a46 | 2016-08-18 16:23:55 -0700 | [diff] [blame] | 1297 | def _common_patch_successful(self, new_branch=False): |
| 1298 | self._patch_common(new_branch=new_branch) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1299 | self.calls += [ |
| 1300 | ((['git', 'apply', '--index', '-p0', '--3way'],), ''), |
| 1301 | ((['git', 'commit', '-m', |
wychen@chromium.org | 5b3bebb | 2015-05-28 21:41:43 +0000 | [diff] [blame] | 1302 | 'Description\n\n' + |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1303 | 'patch from issue 123456 at patchset 60001 ' + |
| 1304 | '(http://crrev.com/123456#ps60001)'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1305 | ((['git', 'config', '--int', 'branch.master.rietveldissue', '123456'],), |
| 1306 | ''), |
| 1307 | ((['git', 'config', 'branch.master.rietveldserver'],), CERR1), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1308 | ((['git', 'config', 'branch.master.rietveldserver', |
| 1309 | 'https://codereview.example.com'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1310 | ((['git', 'config', '--int', 'branch.master.rietveldpatchset', '60001'],), |
| 1311 | ''), |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1312 | ] |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 1313 | |
| 1314 | def test_patch_successful(self): |
| 1315 | self._common_patch_successful() |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1316 | self.assertEqual(git_cl.main(['patch', '123456']), 0) |
| 1317 | |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 1318 | def test_patch_successful_new_branch(self): |
tandrii | df09a46 | 2016-08-18 16:23:55 -0700 | [diff] [blame] | 1319 | self._common_patch_successful(new_branch=True) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 1320 | self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0) |
| 1321 | |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1322 | def test_patch_conflict(self): |
| 1323 | self._patch_common() |
| 1324 | self.calls += [ |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1325 | ((['git', 'apply', '--index', '-p0', '--3way'],), CERR1), |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1326 | ] |
| 1327 | self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1328 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1329 | def test_gerrit_patch_successful(self): |
| 1330 | self._patch_common(is_gerrit=True) |
| 1331 | self.calls += [ |
| 1332 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 1333 | 'refs/changes/56/123456/7'],), ''), |
| 1334 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1335 | ((['git', 'config', '--int', 'branch.master.gerritissue', '123456'],), |
| 1336 | ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1337 | ((['git', 'config', 'branch.master.gerritserver'],), ''), |
| 1338 | ((['git', 'config', 'branch.master.merge'],), 'master'), |
| 1339 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| 1340 | ((['git', 'config', 'remote.origin.url'],), |
| 1341 | 'https://chromium.googlesource.com/my/repo'), |
| 1342 | ((['git', 'config', 'branch.master.gerritserver', |
| 1343 | 'https://chromium-review.googlesource.com'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1344 | ((['git', 'config', '--int', 'branch.master.gerritpatchset', '7'],), ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1345 | ] |
| 1346 | self.assertEqual(git_cl.main(['patch', '123456']), 0) |
| 1347 | |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1348 | def test_patch_force_codereview(self): |
| 1349 | self._patch_common(is_gerrit=True, force_codereview=True) |
| 1350 | self.calls += [ |
| 1351 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 1352 | 'refs/changes/56/123456/7'],), ''), |
| 1353 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
| 1354 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1355 | ((['git', 'config', '--int', 'branch.master.gerritissue', '123456'],), |
| 1356 | ''), |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1357 | ((['git', 'config', 'branch.master.gerritserver'],), ''), |
| 1358 | ((['git', 'config', 'branch.master.merge'],), 'master'), |
| 1359 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| 1360 | ((['git', 'config', 'remote.origin.url'],), |
| 1361 | 'https://chromium.googlesource.com/my/repo'), |
| 1362 | ((['git', 'config', 'branch.master.gerritserver', |
| 1363 | 'https://chromium-review.googlesource.com'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1364 | ((['git', 'config', '--int', 'branch.master.gerritpatchset', '7'],), ''), |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1365 | ] |
| 1366 | self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0) |
| 1367 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1368 | def test_gerrit_patch_url_successful(self): |
| 1369 | self._patch_common(is_gerrit=True) |
| 1370 | self.calls += [ |
| 1371 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 1372 | 'refs/changes/56/123456/1'],), ''), |
| 1373 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1374 | ((['git', 'config', '--int', 'branch.master.gerritissue', '123456'],), |
| 1375 | ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1376 | ((['git', 'config', 'branch.master.gerritserver', |
| 1377 | 'https://chromium-review.googlesource.com'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1378 | ((['git', 'config', '--int', 'branch.master.gerritpatchset', '1'],), ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1379 | ] |
| 1380 | self.assertEqual(git_cl.main( |
| 1381 | ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0) |
| 1382 | |
| 1383 | def test_gerrit_patch_conflict(self): |
| 1384 | self._patch_common(is_gerrit=True) |
| 1385 | self.mock(git_cl, 'DieWithError', |
| 1386 | lambda msg: self._mocked_call(['DieWithError', msg])) |
| 1387 | class SystemExitMock(Exception): |
| 1388 | pass |
| 1389 | self.calls += [ |
| 1390 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 1391 | 'refs/changes/56/123456/1'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1392 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1), |
| 1393 | ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],), |
| 1394 | SystemExitMock()), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1395 | ] |
| 1396 | with self.assertRaises(SystemExitMock): |
| 1397 | git_cl.main(['patch', |
| 1398 | 'https://chromium-review.googlesource.com/#/c/123456/1']) |
| 1399 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1400 | def _checkout_calls(self): |
| 1401 | return [ |
| 1402 | ((['git', 'config', '--local', '--get-regexp', |
| 1403 | 'branch\\..*\\.rietveldissue'], ), |
| 1404 | ('branch.retrying.rietveldissue 1111111111\n' |
| 1405 | 'branch.some-fix.rietveldissue 2222222222\n')), |
| 1406 | ((['git', 'config', '--local', '--get-regexp', |
| 1407 | 'branch\\..*\\.gerritissue'], ), |
| 1408 | ('branch.ger-branch.gerritissue 123456\n' |
| 1409 | 'branch.gbranch654.gerritissue 654321\n')), |
| 1410 | ] |
| 1411 | |
| 1412 | def test_checkout_gerrit(self): |
| 1413 | """Tests git cl checkout <issue>.""" |
| 1414 | self.calls = self._checkout_calls() |
| 1415 | self.calls += [((['git', 'checkout', 'ger-branch'], ), '')] |
| 1416 | self.assertEqual(0, git_cl.main(['checkout', '123456'])) |
| 1417 | |
| 1418 | def test_checkout_rietveld(self): |
| 1419 | """Tests git cl checkout <issue>.""" |
| 1420 | self.calls = self._checkout_calls() |
| 1421 | self.calls += [((['git', 'checkout', 'some-fix'], ), '')] |
| 1422 | self.assertEqual(0, git_cl.main(['checkout', '2222222222'])) |
| 1423 | |
| 1424 | def test_checkout_not_found(self): |
| 1425 | """Tests git cl checkout <issue>.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1426 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1427 | self.calls = self._checkout_calls() |
| 1428 | self.assertEqual(1, git_cl.main(['checkout', '99999'])) |
| 1429 | |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 1430 | def test_checkout_no_branch_issues(self): |
| 1431 | """Tests git cl checkout <issue>.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1432 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 1433 | self.calls = [ |
| 1434 | ((['git', 'config', '--local', '--get-regexp', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1435 | 'branch\\..*\\.rietveldissue'], ), CERR1), |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 1436 | ((['git', 'config', '--local', '--get-regexp', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1437 | 'branch\\..*\\.gerritissue'], ), CERR1), |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 1438 | ] |
| 1439 | self.assertEqual(1, git_cl.main(['checkout', '99999'])) |
| 1440 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1441 | def _test_gerrit_ensure_authenticated_common(self, auth, |
| 1442 | skip_auth_check=False): |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1443 | self.mock(git_cl.gerrit_util, 'CookiesAuthenticator', |
| 1444 | CookiesAuthenticatorMockFactory(hosts_with_creds=auth)) |
| 1445 | self.mock(git_cl, 'DieWithError', |
| 1446 | lambda msg: self._mocked_call(['DieWithError', msg])) |
| 1447 | self.mock(git_cl, 'ask_for_data', |
| 1448 | lambda msg: self._mocked_call(['ask_for_data', msg])) |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1449 | self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1450 | cl = git_cl.Changelist(codereview='gerrit') |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1451 | cl.branch = 'master' |
| 1452 | cl.branchref = 'refs/heads/master' |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1453 | cl.lookedup_issue = True |
| 1454 | return cl |
| 1455 | |
| 1456 | def test_gerrit_ensure_authenticated_missing(self): |
| 1457 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
| 1458 | 'chromium.googlesource.com': 'git is ok, but gerrit one is missing', |
| 1459 | }) |
| 1460 | self.calls.append( |
| 1461 | ((['DieWithError', |
| 1462 | 'Credentials for the following hosts are required:\n' |
| 1463 | ' chromium-review.googlesource.com\n' |
| 1464 | 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n' |
| 1465 | 'You can (re)generate your credentails by visiting ' |
| 1466 | 'https://chromium-review.googlesource.com/new-password'],), ''),) |
| 1467 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1468 | |
| 1469 | def test_gerrit_ensure_authenticated_conflict(self): |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1470 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1471 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
| 1472 | 'chromium.googlesource.com': 'one', |
| 1473 | 'chromium-review.googlesource.com': 'other', |
| 1474 | }) |
| 1475 | self.calls.append( |
| 1476 | ((['ask_for_data', 'If you know what you are doing, ' |
| 1477 | 'press Enter to continue, Ctrl+C to abort.'],), '')) |
| 1478 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1479 | |
| 1480 | def test_gerrit_ensure_authenticated_ok(self): |
| 1481 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
| 1482 | 'chromium.googlesource.com': 'same', |
| 1483 | 'chromium-review.googlesource.com': 'same', |
| 1484 | }) |
| 1485 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1486 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1487 | def test_gerrit_ensure_authenticated_skipped(self): |
| 1488 | cl = self._test_gerrit_ensure_authenticated_common( |
| 1489 | auth={}, skip_auth_check=True) |
| 1490 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1491 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1492 | def test_cmd_set_commit_rietveld(self): |
tandrii | 4d84359 | 2016-07-27 08:22:56 -0700 | [diff] [blame] | 1493 | self.mock(git_cl._RietveldChangelistImpl, 'SetFlags', |
| 1494 | lambda _, v: self._mocked_call(['SetFlags', v])) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1495 | self.calls = [ |
| 1496 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1497 | ((['git', 'config', '--int', 'branch.feature.rietveldissue'],), '123'), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1498 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 1499 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1500 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1501 | ((['git', 'config', 'branch.feature.rietveldserver'],), |
| 1502 | 'https://codereview.chromium.org'), |
tandrii | 4d84359 | 2016-07-27 08:22:56 -0700 | [diff] [blame] | 1503 | ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1504 | ] |
| 1505 | self.assertEqual(0, git_cl.main(['set-commit'])) |
| 1506 | |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 1507 | def _cmd_set_commit_gerrit_common(self, vote): |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1508 | self.mock(git_cl.gerrit_util, 'SetReview', |
| 1509 | lambda h, i, labels: self._mocked_call( |
| 1510 | ['SetReview', h, i, labels])) |
| 1511 | self.calls = [ |
| 1512 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1513 | ((['git', 'config', '--int', 'branch.feature.rietveldissue'],), CERR1), |
| 1514 | ((['git', 'config', '--int', 'branch.feature.gerritissue'],), '123'), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1515 | ((['git', 'config', 'branch.feature.gerritserver'],), |
| 1516 | 'https://chromium-review.googlesource.com'), |
| 1517 | ((['SetReview', 'chromium-review.googlesource.com', 123, |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 1518 | {'Commit-Queue': vote}],), ''), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1519 | ] |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 1520 | |
| 1521 | def test_cmd_set_commit_gerrit_clear(self): |
| 1522 | self._cmd_set_commit_gerrit_common(0) |
| 1523 | self.assertEqual(0, git_cl.main(['set-commit', '-c'])) |
| 1524 | |
| 1525 | def test_cmd_set_commit_gerrit_dry(self): |
| 1526 | self._cmd_set_commit_gerrit_common(1) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1527 | self.assertEqual(0, git_cl.main(['set-commit', '-d'])) |
| 1528 | |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 1529 | def test_cmd_set_commit_gerrit(self): |
| 1530 | self._cmd_set_commit_gerrit_common(2) |
| 1531 | self.assertEqual(0, git_cl.main(['set-commit'])) |
| 1532 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1533 | def test_description_display(self): |
| 1534 | out = StringIO.StringIO() |
| 1535 | self.mock(git_cl.sys, 'stdout', out) |
| 1536 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 1537 | self.mock(git_cl, 'Changelist', ChangelistMock) |
| 1538 | ChangelistMock.desc = 'foo\n' |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1539 | |
| 1540 | self.assertEqual(0, git_cl.main(['description', '-d'])) |
| 1541 | self.assertEqual('foo\n', out.getvalue()) |
| 1542 | |
| 1543 | def test_description_rietveld(self): |
| 1544 | out = StringIO.StringIO() |
| 1545 | self.mock(git_cl.sys, 'stdout', out) |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 1546 | self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1547 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1548 | self.assertEqual(0, git_cl.main([ |
| 1549 | 'description', 'https://code.review.org/123123', '-d', '--rietveld'])) |
| 1550 | self.assertEqual('foobar\n', out.getvalue()) |
| 1551 | |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1552 | def test_StatusFieldOverrideIssueMissingArgs(self): |
| 1553 | out = StringIO.StringIO() |
| 1554 | self.mock(git_cl.sys, 'stderr', out) |
| 1555 | |
| 1556 | try: |
| 1557 | self.assertEqual(git_cl.main(['status', '--issue', '1']), 0) |
| 1558 | except SystemExit as ex: |
| 1559 | self.assertEqual(ex.code, 2) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 1560 | self.assertRegexpMatches(out.getvalue(), r'--issue must be specified') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1561 | |
| 1562 | out = StringIO.StringIO() |
| 1563 | self.mock(git_cl.sys, 'stderr', out) |
| 1564 | |
| 1565 | try: |
| 1566 | self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0) |
| 1567 | except SystemExit as ex: |
| 1568 | self.assertEqual(ex.code, 2) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 1569 | self.assertRegexpMatches(out.getvalue(), r'--field must be specified') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1570 | |
| 1571 | def test_StatusFieldOverrideIssue(self): |
| 1572 | out = StringIO.StringIO() |
| 1573 | self.mock(git_cl.sys, 'stdout', out) |
| 1574 | |
| 1575 | def assertIssue(cl_self, *_args): |
| 1576 | self.assertEquals(cl_self.issue, 1) |
| 1577 | return 'foobar' |
| 1578 | |
| 1579 | self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| 1580 | self.calls = [ |
| 1581 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 1582 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1583 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1584 | ] |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 1585 | self.assertEqual( |
| 1586 | git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']), |
| 1587 | 0) |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1588 | self.assertEqual(out.getvalue(), 'foobar\n') |
| 1589 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 1590 | def test_SetCloseOverrideIssue(self): |
| 1591 | def assertIssue(cl_self, *_args): |
| 1592 | self.assertEquals(cl_self.issue, 1) |
| 1593 | return 'foobar' |
| 1594 | |
| 1595 | self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| 1596 | self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None) |
| 1597 | self.calls = [ |
| 1598 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 1599 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1600 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1601 | ] |
| 1602 | self.assertEqual( |
| 1603 | git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0) |
| 1604 | |
| 1605 | def test_SetCommitOverrideIssue(self): |
| 1606 | def assertIssue(cl_self, *_args): |
| 1607 | self.assertEquals(cl_self.issue, 1) |
| 1608 | return 'foobar' |
| 1609 | |
| 1610 | self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| 1611 | self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None) |
| 1612 | self.calls = [ |
| 1613 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 1614 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1615 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1616 | ((['git', 'symbolic-ref', 'HEAD'],), ''), |
| 1617 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1618 | ((['git', 'config', 'rietveld.server'],), ''), |
| 1619 | ] |
| 1620 | self.assertEqual( |
| 1621 | git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0) |
| 1622 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1623 | def test_description_gerrit(self): |
| 1624 | out = StringIO.StringIO() |
| 1625 | self.mock(git_cl.sys, 'stdout', out) |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 1626 | self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1627 | |
| 1628 | self.assertEqual(0, git_cl.main([ |
| 1629 | 'description', 'https://code.review.org/123123', '-d', '--gerrit'])) |
| 1630 | self.assertEqual('foobar\n', out.getvalue()) |
| 1631 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 1632 | def test_description_set_raw(self): |
| 1633 | out = StringIO.StringIO() |
| 1634 | self.mock(git_cl.sys, 'stdout', out) |
| 1635 | |
| 1636 | self.mock(git_cl, 'Changelist', ChangelistMock) |
| 1637 | self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi')) |
| 1638 | |
| 1639 | self.assertEqual(0, git_cl.main(['description', '-n', 'hihi'])) |
| 1640 | self.assertEqual('hihi', ChangelistMock.desc) |
| 1641 | |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 1642 | def test_description_appends_bug_line(self): |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 1643 | current_desc = 'Some.\n\nChange-Id: xxx' |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 1644 | |
| 1645 | def RunEditor(desc, _, **kwargs): |
| 1646 | self.assertEquals( |
| 1647 | '# Enter a description of the change.\n' |
| 1648 | '# This will be displayed on the codereview site.\n' |
| 1649 | '# The first line will also be used as the subject of the review.\n' |
| 1650 | '#--------------------This line is 72 characters long' |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 1651 | '--------------------\n' |
| 1652 | 'Some.\n\nBUG=\n\nChange-Id: xxx', |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 1653 | desc) |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 1654 | # Simulate user changing something. |
| 1655 | return 'Some.\n\nBUG=123\n\nChange-Id: xxx' |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 1656 | |
| 1657 | def UpdateDescriptionRemote(_, desc): |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 1658 | self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx') |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 1659 | |
| 1660 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 1661 | self.mock(git_cl.Changelist, 'GetDescription', |
| 1662 | lambda *args: current_desc) |
| 1663 | self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote', |
| 1664 | UpdateDescriptionRemote) |
| 1665 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
| 1666 | |
| 1667 | self.calls = [ |
| 1668 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1669 | ((['git', 'config', '--int', 'branch.feature.gerritissue'],), '123'), |
| 1670 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 1671 | ((['git', 'config', 'rietveld.bug-prefix'],), CERR1), |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 1672 | ((['git', 'config', 'core.editor'],), 'vi'), |
| 1673 | ] |
| 1674 | self.assertEqual(0, git_cl.main(['description', '--gerrit'])) |
| 1675 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 1676 | def test_description_set_stdin(self): |
| 1677 | out = StringIO.StringIO() |
| 1678 | self.mock(git_cl.sys, 'stdout', out) |
| 1679 | |
| 1680 | self.mock(git_cl, 'Changelist', ChangelistMock) |
| 1681 | self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman')) |
| 1682 | |
| 1683 | self.assertEqual(0, git_cl.main(['description', '-n', '-'])) |
| 1684 | self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc) |
| 1685 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 1686 | def test_archive(self): |
tandrii | 1c67da6 | 2016-06-10 07:35:53 -0700 | [diff] [blame] | 1687 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 1688 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 1689 | self.calls = \ |
| 1690 | [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 1691 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1692 | ((['git', 'config', '--int', 'branch.master.rietveldissue'],), '1'), |
| 1693 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 1694 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 1695 | ((['git', 'config', '--int', 'branch.foo.rietveldissue'],), '456'), |
| 1696 | ((['git', 'config', '--int', 'branch.bar.rietveldissue'],), CERR1), |
| 1697 | ((['git', 'config', '--int', 'branch.bar.gerritissue'],), '789'), |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 1698 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 1699 | ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''), |
| 1700 | ((['git', 'branch', '-D', 'foo'],), '')] |
| 1701 | |
| 1702 | class MockChangelist(): |
| 1703 | def __init__(self, branch, issue): |
| 1704 | self.branch = branch |
| 1705 | self.issue = issue |
| 1706 | def GetBranch(self): |
| 1707 | return self.branch |
| 1708 | def GetIssue(self): |
| 1709 | return self.issue |
| 1710 | |
| 1711 | self.mock(git_cl, 'get_cl_statuses', |
| 1712 | lambda branches, fine_grained, max_processes: |
| 1713 | [(MockChangelist('master', 1), 'open'), |
| 1714 | (MockChangelist('foo', 456), 'closed'), |
| 1715 | (MockChangelist('bar', 789), 'open')]) |
| 1716 | |
| 1717 | self.assertEqual(0, git_cl.main(['archive', '-f'])) |
| 1718 | |
| 1719 | def test_archive_current_branch_fails(self): |
tandrii | 1c67da6 | 2016-06-10 07:35:53 -0700 | [diff] [blame] | 1720 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 1721 | self.calls = \ |
| 1722 | [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 1723 | 'refs/heads/master'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1724 | ((['git', 'config', '--int', 'branch.master.rietveldissue'],), '1'), |
| 1725 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 1726 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 1727 | ((['git', 'symbolic-ref', 'HEAD'],), 'master')] |
| 1728 | |
| 1729 | class MockChangelist(): |
| 1730 | def __init__(self, branch, issue): |
| 1731 | self.branch = branch |
| 1732 | self.issue = issue |
| 1733 | def GetBranch(self): |
| 1734 | return self.branch |
| 1735 | def GetIssue(self): |
| 1736 | return self.issue |
| 1737 | |
| 1738 | self.mock(git_cl, 'get_cl_statuses', |
| 1739 | lambda branches, fine_grained, max_processes: |
| 1740 | [(MockChangelist('master', 1), 'closed')]) |
| 1741 | |
| 1742 | self.assertEqual(1, git_cl.main(['archive', '-f'])) |
| 1743 | |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1744 | def test_cmd_issue_erase_existing(self): |
| 1745 | out = StringIO.StringIO() |
| 1746 | self.mock(git_cl.sys, 'stdout', out) |
| 1747 | self.calls = [ |
| 1748 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1749 | ((['git', 'config', '--int', 'branch.feature.rietveldissue'],), CERR1), |
| 1750 | ((['git', 'config', '--int', 'branch.feature.gerritissue'],), '123'), |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1751 | # Let this command raise exception (retcode=1) - it should be ignored. |
| 1752 | ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1753 | CERR1), |
| 1754 | ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''), |
| 1755 | ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''), |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 1756 | ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''), |
| 1757 | ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],), |
| 1758 | ''), |
| 1759 | ] |
| 1760 | self.assertEqual(0, git_cl.main(['issue', '0'])) |
| 1761 | |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 1762 | def test_git_cl_try_default(self): |
| 1763 | self.mock(git_cl.Changelist, 'GetChange', |
| 1764 | lambda _, *a: ( |
| 1765 | self._mocked_call(['GetChange']+list(a)))) |
| 1766 | self.mock(git_cl.presubmit_support, 'DoGetTryMasters', |
| 1767 | lambda *_, **__: ( |
| 1768 | self._mocked_call(['DoGetTryMasters']))) |
| 1769 | self.mock(git_cl.presubmit_support, 'DoGetTrySlaves', |
| 1770 | lambda *_, **__: ( |
| 1771 | self._mocked_call(['DoGetTrySlaves']))) |
| 1772 | self.mock(git_cl._RietveldChangelistImpl, 'SetCQState', |
| 1773 | lambda _, s: self._mocked_call(['SetCQState', s])) |
| 1774 | self.calls = [ |
| 1775 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1776 | ((['git', 'config', '--int', 'branch.feature.rietveldissue'],), '123'), |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 1777 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 1778 | ((['git', 'config', 'rietveld.server'],), |
| 1779 | 'https://codereview.chromium.org'), |
| 1780 | ((['git', 'config', 'branch.feature.rietveldserver'],), ''), |
| 1781 | ((['git', 'config', 'branch.feature.merge'],), 'feature'), |
| 1782 | ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| 1783 | ((['get_or_create_merge_base', 'feature', 'feature'],), |
| 1784 | 'fake_ancestor_sha'), |
| 1785 | ((['GetChange', 'fake_ancestor_sha', None], ), |
| 1786 | git_cl.presubmit_support.GitChange( |
| 1787 | '', '', '', '', '', '', '', '')), |
| 1788 | ((['git', 'rev-parse', '--show-cdup'],), '../'), |
| 1789 | ((['DoGetTryMasters'], ), None), |
| 1790 | ((['DoGetTrySlaves'], ), None), |
| 1791 | ((['SetCQState', git_cl._CQState.DRY_RUN], ), None), |
| 1792 | ] |
| 1793 | out = StringIO.StringIO() |
| 1794 | self.mock(git_cl.sys, 'stdout', out) |
| 1795 | self.assertEqual(0, git_cl.main(['try'])) |
| 1796 | self.assertEqual( |
| 1797 | out.getvalue(), |
| 1798 | 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n') |
| 1799 | |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 1800 | def _common_GerritCommitMsgHookCheck(self): |
| 1801 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 1802 | self.mock(git_cl.os.path, 'abspath', |
| 1803 | lambda path: self._mocked_call(['abspath', path])) |
| 1804 | self.mock(git_cl.os.path, 'exists', |
| 1805 | lambda path: self._mocked_call(['exists', path])) |
| 1806 | self.mock(git_cl.gclient_utils, 'FileRead', |
| 1807 | lambda path: self._mocked_call(['FileRead', path])) |
| 1808 | self.mock(git_cl.gclient_utils, 'rm_file_or_tree', |
| 1809 | lambda path: self._mocked_call(['rm_file_or_tree', path])) |
| 1810 | self.calls = [ |
| 1811 | ((['git', 'rev-parse', '--show-cdup'],), '../'), |
| 1812 | ((['abspath', '../'],), '/abs/git_repo_root'), |
| 1813 | ] |
| 1814 | return git_cl.Changelist(codereview='gerrit', issue=123) |
| 1815 | |
| 1816 | def test_GerritCommitMsgHookCheck_custom_hook(self): |
| 1817 | cl = self._common_GerritCommitMsgHookCheck() |
| 1818 | self.calls += [ |
| 1819 | ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True), |
| 1820 | ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| 1821 | '#!/bin/sh\necho "custom hook"') |
| 1822 | ] |
| 1823 | cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True) |
| 1824 | |
| 1825 | def test_GerritCommitMsgHookCheck_not_exists(self): |
| 1826 | cl = self._common_GerritCommitMsgHookCheck() |
| 1827 | self.calls += [ |
| 1828 | ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False), |
| 1829 | ] |
| 1830 | cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True) |
| 1831 | |
| 1832 | def test_GerritCommitMsgHookCheck(self): |
| 1833 | cl = self._common_GerritCommitMsgHookCheck() |
| 1834 | self.calls += [ |
| 1835 | ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True), |
| 1836 | ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| 1837 | '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'), |
| 1838 | (('Do you want to remove it now? [Yes/No]',), 'Yes'), |
| 1839 | ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| 1840 | ''), |
| 1841 | ] |
| 1842 | cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True) |
| 1843 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1844 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 1845 | if __name__ == '__main__': |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1846 | git_cl.logging.basicConfig( |
| 1847 | level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 1848 | unittest.main() |