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