blob: 9177b55d60e4809e32e1e4631cc5502562bc6101 [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# 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
tandriide281ae2016-10-12 06:02:30 -07008import json
maruel@chromium.orgddd59412011-11-30 14:20:38 +00009import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000010import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000011import sys
12import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000013import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014
15sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
16
17from testing_support.auto_stub import TestCase
18
19import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000020import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000021import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000022import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000023
tandrii5d48c322016-08-18 16:19:37 -070024def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
25 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
26
27
28CERR1 = callError(1)
29
30
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000031class 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
dsansomee2d6fd92016-09-08 00:10:47 -070041 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000042 ChangelistMock.desc = desc
43
tandrii5d48c322016-08-18 16:19:37 -070044
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000045class PresubmitMock(object):
46 def __init__(self, *args, **kwargs):
47 self.reviewers = []
48 @staticmethod
49 def should_continue():
50 return True
51
52
53class RietveldMock(object):
54 def __init__(self, *args, **kwargs):
55 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000056
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000057 @staticmethod
58 def get_description(issue):
59 return 'Issue: %d' % issue
60
maruel@chromium.org78936cb2013-04-11 00:17:52 +000061 @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 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010071 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000072 }
73
iannuccie53c9352016-08-17 14:40:40 -070074 @staticmethod
75 def close_issue(_issue):
76 return 'Closed'
77
skobes6468b902016-10-24 08:45:10 -070078 @staticmethod
79 def get_patch(issue, patchset):
80 return 'patch set from issue %s patchset %s' % (issue, patchset)
81
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010082 @staticmethod
83 def update_description(_issue, _description):
84 return 'Updated'
85
86 @staticmethod
87 def add_comment(_issue, _comment):
88 return 'Commented'
89
90
91
skobes6468b902016-10-24 08:45:10 -070092
93class GitCheckoutMock(object):
94 def __init__(self, *args, **kwargs):
95 pass
96
97 @staticmethod
98 def reset():
99 GitCheckoutMock.conflict = False
100
101 def apply_patch(self, p):
102 if GitCheckoutMock.conflict:
103 raise Exception('failed')
104
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000105
106class WatchlistsMock(object):
107 def __init__(self, _):
108 pass
109 @staticmethod
110 def GetWatchersForPaths(_):
111 return ['joe@example.com']
112
113
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000114class CodereviewSettingsFileMock(object):
115 def __init__(self):
116 pass
117 # pylint: disable=R0201
118 def read(self):
119 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000120 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000121
122
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000123class AuthenticatorMock(object):
124 def __init__(self, *_args):
125 pass
126 def has_cached_credentials(self):
127 return True
tandrii221ab252016-10-06 08:12:04 -0700128 def authorize(self, http):
129 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000130
131
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000132def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
133 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
134
135 Usage:
136 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
137 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
138
139 OR
140 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
141 CookiesAuthenticatorMockFactory(cookie='cookie'))
142 """
143 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
144 def __init__(self): # pylint: disable=W0231
145 # Intentionally not calling super() because it reads actual cookie files.
146 pass
147 @classmethod
148 def get_gitcookies_path(cls):
149 return '~/.gitcookies'
150 @classmethod
151 def get_netrc_path(cls):
152 return '~/.netrc'
153 def get_auth_header(self, host):
154 if same_cookie:
155 return same_cookie
156 return (hosts_with_creds or {}).get(host)
157 return CookiesAuthenticatorMock
158
kmarshall9249e012016-08-23 12:02:16 -0700159class MockChangelistWithBranchAndIssue():
160 def __init__(self, branch, issue):
161 self.branch = branch
162 self.issue = issue
163 def GetBranch(self):
164 return self.branch
165 def GetIssue(self):
166 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000167
tandriic2405f52016-10-10 08:13:15 -0700168
169class SystemExitMock(Exception):
170 pass
171
172
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000173class TestGitClBasic(unittest.TestCase):
174 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
175 parsed = urlparse.urlparse(url)
176 result = func(parsed)
177 if fail:
178 self.assertIsNone(result)
179 return None
180 self.assertIsNotNone(result)
181 self.assertEqual(result.issue, issue)
182 self.assertEqual(result.patchset, patchset)
183 self.assertEqual(result.hostname, hostname)
184 return result
185
186 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700187 def test(url, issue=None, patchset=None, hostname=None, fail=None):
188 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000189 git_cl._RietveldChangelistImpl.ParseIssueURL,
190 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000191
192 test('http://codereview.chromium.org/123',
193 123, None, 'codereview.chromium.org')
194 test('https://codereview.chromium.org/123',
195 123, None, 'codereview.chromium.org')
196 test('https://codereview.chromium.org/123/',
197 123, None, 'codereview.chromium.org')
198 test('https://codereview.chromium.org/123/whatever',
199 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700200 test('https://codereview.chromium.org/123/#ps20001',
201 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000202 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700203 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000204 # This looks like bad Gerrit, but is actually valid Rietveld.
205 test('https://chrome-review.source.com/123/4/',
206 123, None, 'chrome-review.source.com')
207
208 test('https://codereview.chromium.org/deadbeaf', fail=True)
209 test('https://codereview.chromium.org/api/123', fail=True)
210 test('bad://codereview.chromium.org/123', fail=True)
211 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
212
213 def test_ParseIssueURL_gerrit(self):
214 def test(url, issue=None, patchset=None, hostname=None, fail=None):
215 self._test_ParseIssueUrl(
216 git_cl._GerritChangelistImpl.ParseIssueURL,
217 url, issue, patchset, hostname, fail)
218
219 test('http://chrome-review.source.com/c/123',
220 123, None, 'chrome-review.source.com')
221 test('https://chrome-review.source.com/c/123/',
222 123, None, 'chrome-review.source.com')
223 test('https://chrome-review.source.com/c/123/4',
224 123, 4, 'chrome-review.source.com')
225 test('https://chrome-review.source.com/#/c/123/4',
226 123, 4, 'chrome-review.source.com')
227 test('https://chrome-review.source.com/c/123/4',
228 123, 4, 'chrome-review.source.com')
229 test('https://chrome-review.source.com/123',
230 123, None, 'chrome-review.source.com')
231 test('https://chrome-review.source.com/123/4',
232 123, 4, 'chrome-review.source.com')
233
234 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
235 test('https://chrome-review.source.com/c/abc/', fail=True)
236 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
237
238 def test_ParseIssueNumberArgument(self):
239 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
240 result = git_cl.ParseIssueNumberArgument(arg)
241 self.assertIsNotNone(result)
242 if fail:
243 self.assertFalse(result.valid)
244 else:
245 self.assertEqual(result.issue, issue)
246 self.assertEqual(result.patchset, patchset)
247 self.assertEqual(result.hostname, hostname)
248
249 test('123', 123)
250 test('', fail=True)
251 test('abc', fail=True)
252 test('123/1', fail=True)
253 test('123a', fail=True)
254 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
255 # Rietveld.
256 test('https://codereview.source.com/123',
257 123, None, 'codereview.source.com')
258 test('https://codereview.source.com/www123', fail=True)
259 # Gerrrit.
260 test('https://chrome-review.source.com/c/123/4',
261 123, 4, 'chrome-review.source.com')
262 test('https://chrome-review.source.com/bad/123/4', fail=True)
263
tandriif9aefb72016-07-01 09:06:51 -0700264 def test_get_bug_line_values(self):
265 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
266 self.assertEqual(f('', ''), [])
267 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
268 self.assertEqual(f('v8', '456'), ['v8:456'])
269 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
270 # Not nice, but not worth carying.
271 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
272 ['v8:456', 'chromium:123', 'v8:123'])
273
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100274 def _test_git_number(self, parent_msg, dest_ref, child_msg,
275 parent_hash='parenthash'):
276 desc = git_cl.ChangeDescription(child_msg)
277 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
278 return desc.description
279
280 def assertEqualByLine(self, actual, expected):
281 self.assertEqual(actual.splitlines(), expected.splitlines())
282
283 def test_git_number_bad_parent(self):
284 with self.assertRaises(ValueError):
285 self._test_git_number('Parent', 'refs/heads/master', 'Child')
286
287 def test_git_number_bad_parent_footer(self):
288 with self.assertRaises(AssertionError):
289 self._test_git_number(
290 'Parent\n'
291 '\n'
292 'Cr-Commit-Position: wrong',
293 'refs/heads/master', 'Child')
294
295 def test_git_number_bad_lineage_ignored(self):
296 actual = self._test_git_number(
297 'Parent\n'
298 '\n'
299 'Cr-Commit-Position: refs/heads/master@{#1}\n'
300 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
301 'refs/heads/master', 'Child')
302 self.assertEqualByLine(
303 actual,
304 'Child\n'
305 '\n'
306 'Cr-Commit-Position: refs/heads/master@{#2}\n'
307 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
308
309 def test_git_number_same_branch(self):
310 actual = self._test_git_number(
311 'Parent\n'
312 '\n'
313 'Cr-Commit-Position: refs/heads/master@{#12}',
314 dest_ref='refs/heads/master',
315 child_msg='Child')
316 self.assertEqualByLine(
317 actual,
318 'Child\n'
319 '\n'
320 'Cr-Commit-Position: refs/heads/master@{#13}')
321
322 def test_git_number_same_branch_with_originals(self):
323 actual = self._test_git_number(
324 'Parent\n'
325 '\n'
326 'Cr-Commit-Position: refs/heads/master@{#12}',
327 dest_ref='refs/heads/master',
328 child_msg='Child\n'
329 '\n'
330 'Some users are smart and insert their own footers\n'
331 '\n'
332 'Cr-Whatever: value\n'
333 'Cr-Commit-Position: refs/copy/paste@{#22}')
334 self.assertEqualByLine(
335 actual,
336 'Child\n'
337 '\n'
338 'Some users are smart and insert their own footers\n'
339 '\n'
340 'Cr-Original-Whatever: value\n'
341 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
342 'Cr-Commit-Position: refs/heads/master@{#13}')
343
344 def test_git_number_new_branch(self):
345 actual = self._test_git_number(
346 'Parent\n'
347 '\n'
348 'Cr-Commit-Position: refs/heads/master@{#12}',
349 dest_ref='refs/heads/branch',
350 child_msg='Child')
351 self.assertEqualByLine(
352 actual,
353 'Child\n'
354 '\n'
355 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
356 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
357
358 def test_git_number_lineage(self):
359 actual = self._test_git_number(
360 'Parent\n'
361 '\n'
362 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
363 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
364 dest_ref='refs/heads/branch',
365 child_msg='Child')
366 self.assertEqualByLine(
367 actual,
368 'Child\n'
369 '\n'
370 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
371 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
372
373 def test_git_number_moooooooore_lineage(self):
374 actual = self._test_git_number(
375 'Parent\n'
376 '\n'
377 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
378 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
379 dest_ref='refs/heads/mooore',
380 child_msg='Child')
381 self.assertEqualByLine(
382 actual,
383 'Child\n'
384 '\n'
385 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
386 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
387 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
388
389
390 def test_git_number_cherry_pick(self):
391 actual = self._test_git_number(
392 'Parent\n'
393 '\n'
394 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
395 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
396 dest_ref='refs/heads/branch',
397 child_msg='Child, which is cherry-pick from master\n'
398 '\n'
399 'Cr-Commit-Position: refs/heads/master@{#100}\n'
400 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
401 self.assertEqualByLine(
402 actual,
403 'Child, which is cherry-pick from master\n'
404 '\n'
405 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
406 '\n'
407 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
408 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
409 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
410
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000411
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000412class TestGitCl(TestCase):
413 def setUp(self):
414 super(TestGitCl, self).setUp()
415 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700416 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000417 self.mock(subprocess2, 'call', self._mocked_call)
418 self.mock(subprocess2, 'check_call', self._mocked_call)
419 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700420 self.mock(subprocess2, 'communicate',
421 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000422 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000423 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000424 self.mock(git_common, 'get_or_create_merge_base',
425 lambda *a: (
426 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000427 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000428 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000429 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700430 self.mock(git_cl, 'write_json', lambda path, contents:
431 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000432 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000433 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000434 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700435 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
436 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000437 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000438 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000439 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000440 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
441 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700442 self.mock(git_cl, 'DieWithError',
443 lambda msg: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000444 # It's important to reset settings to not have inter-tests interference.
445 git_cl.settings = None
446
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000447
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000448 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000449 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000450 # Note: has_failed returns True if at least 1 test ran so far, current
451 # included, has failed. That means current test may have actually ran
452 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000453 if not self.has_failed():
454 self.assertEquals([], self.calls)
455 finally:
456 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000457
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000458 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000459 self.assertTrue(
460 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700461 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000462 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000463 expected_args, result = top
464
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000465 # Also logs otherwise it could get caught in a try/finally and be hard to
466 # diagnose.
467 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700468 N = 5
469 prior_calls = '\n '.join(
470 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
471 for i, c in enumerate(self._calls_done[-N:]))
472 following_calls = '\n '.join(
473 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
474 for i, c in enumerate(self.calls[:N]))
475 extended_msg = (
476 'A few prior calls:\n %s\n\n'
477 'This (expected):\n @%d: %r\n'
478 'This (actual):\n @%d: %r\n\n'
479 'A few following expected calls:\n %s' %
480 (prior_calls, len(self._calls_done), expected_args,
481 len(self._calls_done), args, following_calls))
482 git_cl.logging.error(extended_msg)
483
tandrii99a72f22016-08-17 14:33:24 -0700484 self.fail('@%d\n'
485 ' Expected: %r\n'
486 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700487 len(self._calls_done), expected_args, args))
488
489 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700490 if isinstance(result, Exception):
491 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000492 return result
493
tandrii48df5812016-10-17 03:55:37 -0700494 def test_LoadCodereviewSettingsFromFile_gerrit(self):
495 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
496 self.calls = [
497 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
498 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
499 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
500 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
501 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
502 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
503 ((['git', 'config', '--unset-all', 'rietveld.force-https-commit-url'],),
504 CERR1),
505 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
506 CERR1),
507 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
508 ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],),
509 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700510 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
511 CERR1),
512 ((['git', 'config', 'gerrit.host', 'true'],), ''),
513 ]
514 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
515
maruel@chromium.orga3353652011-11-30 14:26:57 +0000516 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000517 def _is_gerrit_calls(cls, gerrit=False):
518 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
519 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
520
521 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000522 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000523 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000524 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000525
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000526 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000527 def _upload_no_rev_calls(cls, similarity, find_copies):
528 return (cls._git_base_calls(similarity, find_copies) +
529 cls._git_upload_no_rev_calls())
530
531 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000532 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000533 if similarity is None:
534 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700535 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700536 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000537 else:
tandrii33a46ff2016-08-23 05:53:40 -0700538 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700539 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000540
541 if find_copies is None:
542 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700543 find_copies_call = ((['git', 'config', '--bool',
544 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000545 else:
tandrii5d48c322016-08-18 16:19:37 -0700546 val = str(find_copies).lower()
547 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000548 'branch.master.git-find-copies', val],), '')
549
550 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000551 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800552 '-l100000', '-C'+similarity,
553 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000554 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000555 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000556 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000557
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000558 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000559 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000560 similarity_call,
561 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
562 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000563 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000564 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700565 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
566 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000567 ((['git', 'config', 'rietveld.server'],),
568 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000569 ((['git', 'config', 'branch.master.merge'],), 'master'),
570 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000571 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000572 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000573 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000574 ((['git', 'rev-parse', '--show-cdup'],), ''),
575 ((['git', 'rev-parse', 'HEAD'],), '12345'),
576 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000577 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000578 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700579 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000580 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000581 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000582 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000583 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000584 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000585 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000586 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000587 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000588 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000589 ]
590
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000591 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000592 def _git_upload_no_rev_calls(cls):
593 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000594 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000595 ]
596
597 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000598 def _git_upload_calls(cls, private):
599 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000600 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000601 private_call = []
602 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000603 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000604 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000605 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000606
maruel@chromium.orga3353652011-11-30 14:26:57 +0000607 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000608 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000609 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000610 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000611 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000612 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000613 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
614 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000615 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000616 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000617 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700618 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000619 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000620 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000621 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700622 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000623 ] + cls._git_post_upload_calls()
624
625 @classmethod
626 def _git_post_upload_calls(cls):
627 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000628 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
629 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
630 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000631 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000632 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000633 ]
634
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000635 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000636 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000637 fake_ancestor = 'fake_ancestor'
638 fake_cl = 'fake_cl_for_patch'
639 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000640 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000641 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000642 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000643 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000644 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000645 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000646 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000647 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700648 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000649 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000650 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000651 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000652 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000653 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000654 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000655 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000656 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000657 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000658 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000659 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000660
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000661 @classmethod
662 def _dcommit_calls_1(cls):
663 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000664 ((['git', 'config', 'rietveld.autoupdate'],),
665 ''),
666 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
667 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000668 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000669 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000670 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
671 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
672 None),
673 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000674 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700675 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700676 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000677 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700678 ((['git', 'config', '--bool',
679 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000680 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
681 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700682 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000683 ((['git',
684 'config', 'rietveld.server'],), 'codereview.example.com'),
685 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000686 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000687 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000688 ((['git', 'config', 'branch.working.merge'],),
689 'refs/heads/master'),
690 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000691 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000692 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000693 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000694 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000695 'refs/remotes/origin/master'],),
696 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000697 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000698 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000699 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000700 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000701 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000702 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000703 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000704 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000705 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000706 ]
707
708 @classmethod
709 def _dcommit_calls_normal(cls):
710 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000711 ((['git', 'rev-parse', '--show-cdup'],), ''),
712 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000713 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000714 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000715 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000716 '.'],),
717 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000718 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700719 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000720 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000721 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000722 ((['git', 'config', 'user.email'],), 'author@example.com'),
723 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000724 ]
725
726 @classmethod
727 def _dcommit_calls_bypassed(cls):
728 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000729 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000730 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000731 ]
732
733 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000734 def _dcommit_calls_3(cls):
735 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000736 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -0800737 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
738 'fake_ancestor_sha', 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000739 (' PRESUBMIT.py | 2 +-\n'
740 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000741 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700742 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000743 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
744 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700745 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000746 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000747 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
748 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
749 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000750 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000751 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000752 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000753 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000755 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000756 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000757 ((['git', 'checkout', '-q', 'working'],), ''),
758 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000759 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000760
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000761 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700762 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000763 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000764 return [
765 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000766 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000767 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000768 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700769 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000770 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000771 '--git_similarity', similarity or '50'
772 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000773 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000774 ]
775
776 def _run_reviewer_test(
777 self,
778 upload_args,
779 expected_description,
780 returned_description,
781 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000782 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700783 private=False,
784 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000785 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000786 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000787 try:
788 similarity = upload_args[upload_args.index('--similarity')+1]
789 except ValueError:
790 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000791
792 if '--find-copies' in upload_args:
793 find_copies = True
794 elif '--no-find-copies' in upload_args:
795 find_copies = False
796 else:
797 find_copies = None
798
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000799 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700800 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000801
802 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000803
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000804 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000805 self.assertEquals(
806 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000807 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000808 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000809 '#--------------------This line is 72 characters long'
810 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000811 expected_description,
812 desc)
813 return returned_description
814 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000815
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000816 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000817 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700818 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000819 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000820 return 1, 2
821 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000822
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000823 git_cl.main(['upload'] + upload_args)
824
825 def test_no_reviewer(self):
826 self._run_reviewer_test(
827 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000828 'desc\n\nBUG=',
829 '# Blah blah comment.\ndesc\n\nBUG=',
830 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000831 [])
832
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000833 def test_keep_similarity(self):
834 self._run_reviewer_test(
835 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000836 'desc\n\nBUG=',
837 '# Blah blah comment.\ndesc\n\nBUG=',
838 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000839 [])
840
iannucci@chromium.org79540052012-10-19 23:15:26 +0000841 def test_keep_find_copies(self):
842 self._run_reviewer_test(
843 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000844 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000845 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000846 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000847 [])
848
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000849 def test_private(self):
850 self._run_reviewer_test(
851 ['--private'],
852 'desc\n\nBUG=',
853 '# Blah blah comment.\ndesc\n\nBUG=\n',
854 'desc\n\nBUG=',
855 [])
856
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000857 def test_reviewers_cmd_line(self):
858 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000859 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000860 self._run_reviewer_test(
861 ['-r' 'foo@example.com'],
862 description,
863 '\n%s\n' % description,
864 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000865 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000866
867 def test_reviewer_tbr_overriden(self):
868 # Reviewer is overriden with TBR
869 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000870 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000871 self._run_reviewer_test(
872 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000873 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000874 description.strip('\n'),
875 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000876 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000877
878 def test_reviewer_multiple(self):
879 # Handles multiple R= or TBR= lines.
880 description = (
bradnelsond975b302016-10-23 12:20:23 -0700881 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
882 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000883 self._run_reviewer_test(
884 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000885 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000886 description,
887 description,
bradnelsond975b302016-10-23 12:20:23 -0700888 ['--reviewers=another@example.com,reviewer@example.com'],
889 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000890
maruel@chromium.orga3353652011-11-30 14:26:57 +0000891 def test_reviewer_send_mail(self):
892 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000893 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000894 self._run_reviewer_test(
895 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000896 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000897 description.strip('\n'),
898 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000899 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000900
901 def test_reviewer_send_mail_no_rev(self):
902 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000903 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700904 self.calls = self._upload_no_rev_calls(None, None) + [
905 ((['DieWithError', 'Must specify reviewers to send email.'],),
906 SystemExitMock())
907 ]
908
909 def RunEditor(desc, _, **kwargs):
910 return desc
911 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
912 self.mock(sys, 'stdout', stdout)
913 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000914 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700915 self.assertEqual(
916 'Using 50% similarity for rename/copy detection. Override with '
917 '--similarity.\n',
918 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000919
tandriif9aefb72016-07-01 09:06:51 -0700920 def test_bug_on_cmd(self):
921 self._run_reviewer_test(
922 ['--bug=500658,proj:123'],
923 'desc\n\nBUG=500658\nBUG=proj:123',
924 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
925 'desc\n\nBUG=500658\nBUG=proj:1234',
926 [])
927
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000928 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000929 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000930 self.calls = (
931 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000932 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000933 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000934 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000935 git_cl.main(['dcommit'])
936
937 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000938 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000939 self.calls = (
940 self._dcommit_calls_1() +
941 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000942 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000943 git_cl.main(['dcommit', '--bypass-hooks'])
944
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100945 def _land_rietveld_common(self, debug_stdout=False):
946 if not debug_stdout:
947 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
948 self.mock(RietveldMock, 'update_description', staticmethod(
949 lambda i, d: self._mocked_call(['update_description', i, d])))
950 self.mock(RietveldMock, 'add_comment', staticmethod(
951 lambda i, c: self._mocked_call(['add_comment', i, c])))
952 self.calls = [
953 ((['git', 'config', 'rietveld.autoupdate'],), ''),
954 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
955 ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
956 CERR1),
957 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
958 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
959 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
960 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
961 CERR1),
962 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
963 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
964 ((['git', 'config', 'rietveld.server'],),
965 'https://codereview.chromium.org'),
966 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
967 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
968 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
969 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
970 ((['git', 'rev-list', '--merges',
971 '--grep=^SVN changes up to revision [0-9]*$',
972 'refs/remotes/origin/master^!'],), ''),
973 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
974 ''), # No commits to rebase, according to local view of origin.
975 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
976 'fake_ancestor_sha'),
977 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
978 ((['git', 'rev-parse', '--show-cdup'],), ''),
979 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
980 ((['git', 'diff', '--name-status', '--no-renames', '-r',
981 'fake_ancestor_sha...', '.'],),
982 'M\tfile1.cpp'),
983 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
984 ((['git', 'config', 'branch.feature.rietveldserver'],),
985 'https://codereview.chromium.org'),
986 ((['git', 'config', 'user.email'],), 'user@e.mail'),
987 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
988 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
989 'fake_ancestor_sha', 'feature'],),
990 # This command just prints smth like this:
991 # file1.cpp | 53 ++++++--
992 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
993 ''),
994 ((['git', 'show-ref', '--quiet', '--verify',
995 'refs/heads/git-cl-commit'],),
996 ''), # 0 return code means branch exists.
997 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
998 ((['git', 'show-ref', '--quiet', '--verify',
999 'refs/heads/git-cl-cherry-pick'],),
1000 CERR1), # This means git-cl-cherry-pick branch does not exist.
1001 ((['git', 'rev-parse', '--show-cdup'],), ''),
1002 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1003 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1004 ((['git', 'commit', '-m',
1005 'Issue: 123\n\nR=john@chromium.org\n\n'
1006 'Review URL: https://codereview.chromium.org/123 .'],), ''),
1007 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1008 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1009 ((['git', 'config', '--get', 'remote.origin.url'],),
1010 'https://chromium.googlesource.com/infra/infra'),
1011 ]
1012
1013 def test_land_rietveld(self):
1014 self._land_rietveld_common()
1015 self.calls += [
1016 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1017 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1018 ''),
1019 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1020 ((['git', 'checkout', '-q', 'feature'],), ''),
1021 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1022 ((['git', 'config', 'rietveld.viewvc-url'],),
1023 'https://chromium.googlesource.com/infra/infra/+/'),
1024 ((['update_description', 123,
1025 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1026 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1027 ''),
1028 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1029 'fake_sha_rebased (presubmit successful).'],), ''),
1030 ]
1031 git_cl.main(['land'])
1032
1033 def test_land_rietveld_gnumbd(self):
1034 self._land_rietveld_common()
1035 self.mock(git_cl, 'WaitForRealCommit',
1036 lambda *a: self._mocked_call(['WaitForRealCommit'] + list(a)))
1037 self.calls += [
1038 ((['git', 'config', 'rietveld.pending-ref-prefix'],), 'refs/pending/'),
1039 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1040 ((['git', 'retry', 'fetch', 'origin',
1041 '+refs/pending/heads/master:refs/git-cl/pending/heads/master'],), ''),
1042 ((['git', 'checkout', 'refs/git-cl/pending/heads/master'],), ''),
1043 ((['git', 'cherry-pick', 'fake_sha_rebased'],), ''),
1044
1045 ((['git', 'retry', 'push', '--porcelain', 'origin',
1046 'HEAD:refs/pending/heads/master'],),''),
1047 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased_on_pending'),
1048
1049 ((['git', 'checkout', '-q', 'feature'],), ''),
1050 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1051
1052 ((['WaitForRealCommit', 'origin', 'fake_sha_rebased_on_pending',
1053 'refs/remotes/origin/master', 'refs/heads/master'],),
1054 'fake_sha_gnumbded'),
1055
1056 ((['git', 'config', 'rietveld.viewvc-url'],),
1057 'https://chromium.googlesource.com/infra/infra/+/'),
1058 ((['update_description', 123,
1059 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1060 'https://chromium.googlesource.com/infra/infra/+/fake_sha_gnumbded'],),
1061 ''),
1062 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1063 'fake_sha_gnumbded (presubmit successful).'],),
1064 ''),
1065 ]
1066 git_cl.main(['land'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001067
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001068 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001069 self._land_rietveld_common(debug_stdout=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001070 self.mock(git_cl, 'ShouldGenerateGitNumberFooters',
1071 lambda *a: self._mocked_call(['ShouldGenerateGitNumberFooters']))
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001072
1073 # Special mocks to check validity of timestamp.
1074 original_git_amend_head = git_cl._git_amend_head
1075 def _git_amend_head_mock(msg, tstamp):
1076 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1077 return original_git_amend_head(msg, tstamp)
1078 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1079
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001080 self.calls += [
1081 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1082 ((['ShouldGenerateGitNumberFooters'],), True),
1083
1084 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1085 'This is parent commit.\n'
1086 '\n'
1087 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1088 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001089 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1090 '1480022355'), # Committer's unix timestamp.
1091 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1092 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001093
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001094 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001095 ((['git', 'commit', '--amend', '-m',
1096 'Issue: 123\n\nR=john@chromium.org\n'
1097 '\n'
1098 'Review URL: https://codereview.chromium.org/123 .\n'
1099 '\n'
1100 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1101 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1102
1103 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1104 ''),
1105 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1106 ((['git', 'checkout', '-q', 'feature'],), ''),
1107 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1108 ((['git', 'config', 'rietveld.viewvc-url'],),
1109 'https://chromium.googlesource.com/infra/infra/+/'),
1110 ((['update_description', 123,
1111 'Issue: 123\n\nR=john@chromium.org\n'
1112 '\n'
1113 'Review URL: https://codereview.chromium.org/123 .\n'
1114 '\n'
1115 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1116 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1117 'Committed: '
1118 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1119 ''),
1120 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1121 'fake_sha_rebased (presubmit successful).'],), ''),
1122 ]
1123 git_cl.main(['land'])
1124
1125 def test_land_rietveld_git_numberer_bad_parent(self):
1126 self._land_rietveld_common()
1127 self.mock(git_cl, 'ShouldGenerateGitNumberFooters',
1128 lambda *a: self._mocked_call(['ShouldGenerateGitNumberFooters']))
1129 self.calls += [
1130 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1131 ((['ShouldGenerateGitNumberFooters'],), True),
1132
1133 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1134 'This is parent commit with no footer.'),
1135
1136 ((['git', 'checkout', '-q', 'feature'],), ''),
1137 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1138 ]
1139 with self.assertRaises(ValueError) as cm:
1140 git_cl.main(['land'])
1141 self.assertEqual(cm.exception.message,
1142 'Unable to infer commit position from footers')
1143
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +01001144 def test_ShouldGenerateGitNumberFooters(self):
1145 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: StringIO.StringIO(
Andrii Shyshkalovb8c535f2016-11-24 18:01:52 +01001146 'GENERATE_GIT_NUMBER_FOOTERS: true\n'
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +01001147 ))
1148 self.assertTrue(git_cl.ShouldGenerateGitNumberFooters())
1149
1150 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: StringIO.StringIO(
Andrii Shyshkalovb8c535f2016-11-24 18:01:52 +01001151 'GENERATE_GIT_NUMBER_FOOTERS: false\n'
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +01001152 ))
1153 self.assertFalse(git_cl.ShouldGenerateGitNumberFooters())
1154
1155 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: StringIO.StringIO(
Andrii Shyshkalovb8c535f2016-11-24 18:01:52 +01001156 'GENERATE_GIT_NUMBER_FOOTERS: anything but true is false\n'
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +01001157 ))
1158 self.assertFalse(git_cl.ShouldGenerateGitNumberFooters())
1159
1160 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: StringIO.StringIO(
Andrii Shyshkalovb8c535f2016-11-24 18:01:52 +01001161 'whatever: ignored'
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +01001162 ))
1163 self.assertFalse(git_cl.ShouldGenerateGitNumberFooters())
1164
1165 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: None)
1166 self.assertFalse(git_cl.ShouldGenerateGitNumberFooters())
1167
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001168 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001169 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001170 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001171 if skip_auth_check:
1172 return [((cmd, ), 'true')]
1173
tandrii5d48c322016-08-18 16:19:37 -07001174 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001175 if issue:
1176 calls.extend([
1177 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1178 ])
1179 calls.extend([
1180 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1181 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1182 ((['git', 'config', 'remote.origin.url'],),
1183 'https://chromium.googlesource.com/my/repo'),
1184 ((['git', 'config', 'remote.origin.url'],),
1185 'https://chromium.googlesource.com/my/repo'),
1186 ])
1187 return calls
1188
1189 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001190 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001191 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001192 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001193 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001194 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001195 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001196 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1197 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001198 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001199 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001200 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1201 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001202 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001203 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001204 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001205 ((['get_or_create_merge_base', 'master',
1206 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001207 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001208 # Calls to verify branch point is ancestor
1209 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1210 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1211 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001212 ((['git', 'rev-parse', '--show-cdup'],), ''),
1213 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001214
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001215 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001216 'diff', '--name-status', '--no-renames', '-r',
1217 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001218 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001219 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001220 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001221 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001222 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001223 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001224 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001225 ((['git', 'config', 'user.email'],), 'me@example.com'),
1226 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001227 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1228 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001229 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001230 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001231
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001232 @classmethod
1233 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001234 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001235 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001236 ref_suffix='', notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001237 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001238 if post_amend_description is None:
1239 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001240 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001241 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001242
tandriia60502f2016-06-20 02:01:53 -07001243 if squash_mode == 'default':
1244 calls.extend([
1245 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1246 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1247 ])
1248 elif squash_mode in ('override_squash', 'override_nosquash'):
1249 calls.extend([
1250 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1251 'true' if squash_mode == 'override_squash' else 'false'),
1252 ])
1253 else:
1254 assert squash_mode in ('squash', 'nosquash')
1255
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001256 # If issue is given, then description is fetched from Gerrit instead.
1257 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001258 calls += [
1259 ((['git', 'log', '--pretty=format:%s\n\n%b',
1260 'fake_ancestor_sha..HEAD'],),
1261 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001262 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001263 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001264 # DownloadGerritHook(False)
1265 ((False, ),
1266 ''),
1267 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001268 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001269 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001270 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001271 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001272 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001273 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001274 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001275 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001276 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001277 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001278 if not issue:
1279 # Prompting to edit description on first upload.
1280 calls += [
1281 ((['git', 'config', 'core.editor'],), ''),
1282 ((['RunEditor'],), description),
1283 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001284 ref_to_push = 'abcdef0123456789'
1285 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001286 ((['git', 'config', 'branch.master.merge'],),
1287 'refs/heads/master'),
1288 ((['git', 'config', 'branch.master.remote'],),
1289 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001290 ((['get_or_create_merge_base', 'master',
1291 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001292 'origin/master'),
1293 ((['git', 'rev-parse', 'HEAD:'],),
1294 '0123456789abcdef'),
1295 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001296 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001297 ref_to_push),
1298 ]
1299 else:
1300 ref_to_push = 'HEAD'
1301
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001302 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001303 ((['git', 'rev-list',
1304 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001305 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001306
1307 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1308 if ref_suffix:
1309 ref_suffix += ',' + notify_suffix
1310 else:
1311 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001312
ukai@chromium.orge8077812012-02-03 03:41:46 +00001313 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001314 ref_suffix += ',' + ','.join('r=%s' % email
1315 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001316 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001317 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001318 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001319 ('remote:\n'
1320 'remote: Processing changes: (\)\n'
1321 'remote: Processing changes: (|)\n'
1322 'remote: Processing changes: (/)\n'
1323 'remote: Processing changes: (-)\n'
1324 'remote: Processing changes: new: 1 (/)\n'
1325 'remote: Processing changes: new: 1, done\n'
1326 'remote:\n'
1327 'remote: New Changes:\n'
1328 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1329 'remote:\n'
1330 'To https://chromium.googlesource.com/yyy/zzz\n'
1331 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001332 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001333 if squash:
1334 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001335 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001336 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001337 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001338 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001339 ((['git', 'config', 'branch.master.gerritsquashhash',
1340 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001341 ]
tandrii88189772016-09-29 04:29:57 -07001342 calls += [
1343 ((['git', 'config', 'rietveld.cc'],), ''),
1344 ((['AddReviewers', 'chromium-review.googlesource.com',
1345 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -07001346 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -07001347 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001348 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001349 return calls
1350
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001351 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001352 self,
1353 upload_args,
1354 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001355 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001356 squash=True,
1357 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001358 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001359 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001360 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001361 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001362 issue=None,
1363 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001364 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001365 if squash_mode is None:
1366 if '--no-squash' in upload_args:
1367 squash_mode = 'nosquash'
1368 elif '--squash' in upload_args:
1369 squash_mode = 'squash'
1370 else:
1371 squash_mode = 'default'
1372
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001373 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001374 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001375 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001376 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001377 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001378 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1379 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001380 self.mock(git_cl.gclient_utils, 'RunEditor',
1381 lambda *_, **__: self._mocked_call(['RunEditor']))
1382 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001383 self.mock(git_cl.gerrit_util, 'AddReviewers',
1384 lambda h, i, add, is_reviewer: self._mocked_call(
1385 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001386
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001387 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001388 self.calls += self._gerrit_upload_calls(
1389 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001390 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001391 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001392 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001393 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001394 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001395 # Uncomment when debugging.
1396 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001397 git_cl.main(['upload'] + upload_args)
1398
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001399 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001400 self._run_gerrit_upload_test(
1401 ['--no-squash'],
1402 'desc\n\nBUG=\n',
1403 [],
1404 squash=False,
1405 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1406
1407 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001408 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001409 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001410 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001411 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001412 [],
tandriia60502f2016-06-20 02:01:53 -07001413 squash=False,
1414 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001415 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001416
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001417 def test_gerrit_no_reviewer(self):
1418 self._run_gerrit_upload_test(
1419 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001420 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001421 [],
1422 squash=False,
1423 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001424
tandriieefe8322016-08-17 10:12:24 -07001425 def test_gerrit_patch_bad_chars(self):
1426 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001427 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001428 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001429 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001430 squash=False,
1431 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001432 ref_suffix='%m=Dont_put_bad_chars')
1433 self.assertIn(
1434 'WARNING: Patchset title may only contain alphanumeric chars '
1435 'and spaces. Cleaned up title:\nDont put bad chars\n',
1436 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001437
ukai@chromium.orge8077812012-02-03 03:41:46 +00001438 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001439 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001440 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001441 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001442 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001443 squash=False,
1444 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001445 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001446
1447 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001448 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001449 [],
bradnelsond975b302016-10-23 12:20:23 -07001450 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1451 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001452 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001453 ['reviewer@example.com', 'another@example.com'],
1454 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001455 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001456 ref_suffix='%l=Code-Review+1',
1457 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001458
1459 def test_gerrit_upload_squash_first_is_default(self):
1460 # Mock Gerrit CL description to indicate the first upload.
1461 self.mock(git_cl.Changelist, 'GetDescription',
1462 lambda *_: None)
1463 self._run_gerrit_upload_test(
1464 [],
1465 'desc\nBUG=\n\nChange-Id: 123456789',
1466 [],
1467 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001468
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001469 def test_gerrit_upload_squash_first(self):
1470 # Mock Gerrit CL description to indicate the first upload.
1471 self.mock(git_cl.Changelist, 'GetDescription',
1472 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001473 self._run_gerrit_upload_test(
1474 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001475 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001476 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001477 squash=True,
1478 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001479
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001480 def test_gerrit_upload_squash_reupload(self):
1481 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1482 # Mock Gerrit CL description to indicate re-upload.
1483 self.mock(git_cl.Changelist, 'GetDescription',
1484 lambda *args: description)
1485 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1486 lambda *args: 1)
1487 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1488 lambda *args: {'change_id': '123456789'})
1489 self._run_gerrit_upload_test(
1490 ['--squash'],
1491 description,
1492 [],
1493 squash=True,
1494 expected_upstream_ref='origin/master',
1495 issue=123456)
1496
rmistry@google.com2dd99862015-06-22 12:22:18 +00001497 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001498 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001499 def mock_run_git(*args, **_kwargs):
1500 if args[0] == ['for-each-ref',
1501 '--format=%(refname:short) %(upstream:short)',
1502 'refs/heads']:
1503 # Create a local branch dependency tree that looks like this:
1504 # test1 -> test2 -> test3 -> test4 -> test5
1505 # -> test3.1
1506 # test6 -> test0
1507 branch_deps = [
1508 'test2 test1', # test1 -> test2
1509 'test3 test2', # test2 -> test3
1510 'test3.1 test2', # test2 -> test3.1
1511 'test4 test3', # test3 -> test4
1512 'test5 test4', # test4 -> test5
1513 'test6 test0', # test0 -> test6
1514 'test7', # test7
1515 ]
1516 return '\n'.join(branch_deps)
1517 self.mock(git_cl, 'RunGit', mock_run_git)
1518
1519 class RecordCalls:
1520 times_called = 0
1521 record_calls = RecordCalls()
1522 def mock_CMDupload(*args, **_kwargs):
1523 record_calls.times_called += 1
1524 return 0
1525 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1526
1527 self.calls = [
1528 (('[Press enter to continue or ctrl-C to quit]',), ''),
1529 ]
1530
1531 class MockChangelist():
1532 def __init__(self):
1533 pass
1534 def GetBranch(self):
1535 return 'test1'
1536 def GetIssue(self):
1537 return '123'
1538 def GetPatchset(self):
1539 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001540 def IsGerrit(self):
1541 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001542
1543 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1544 # CMDupload should have been called 5 times because of 5 dependent branches.
1545 self.assertEquals(5, record_calls.times_called)
1546 self.assertEquals(0, ret)
1547
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001548 def test_gerrit_change_id(self):
1549 self.calls = [
1550 ((['git', 'write-tree'], ),
1551 'hashtree'),
1552 ((['git', 'rev-parse', 'HEAD~0'], ),
1553 'branch-parent'),
1554 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1555 'A B <a@b.org> 1456848326 +0100'),
1556 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1557 'C D <c@d.org> 1456858326 +0100'),
1558 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1559 'hashchange'),
1560 ]
1561 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1562 self.assertEqual(change_id, 'Ihashchange')
1563
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001564 def test_desecription_append_footer(self):
1565 for init_desc, footer_line, expected_desc in [
1566 # Use unique desc first lines for easy test failure identification.
1567 ('foo', 'R=one', 'foo\n\nR=one'),
1568 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1569 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1570 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1571 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1572 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1573 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1574 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1575 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1576 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1577 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1578 ]:
1579 desc = git_cl.ChangeDescription(init_desc)
1580 desc.append_footer(footer_line)
1581 self.assertEqual(desc.description, expected_desc)
1582
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001583 def test_update_reviewers(self):
1584 data = [
1585 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001586 ('foo\nR=xx', [], 'foo\nR=xx'),
1587 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001588 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001589 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1590 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1591 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001592 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001593 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001594 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001595 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1596 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1597 # Same as the line before, but full of whitespaces.
1598 (
1599 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1600 'foo\nBar\n\nR=c@c\n BUG =',
1601 ),
1602 # Whitespaces aren't interpreted as new lines.
1603 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001604 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001605 expected = [i[2] for i in data]
1606 actual = []
1607 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001608 obj = git_cl.ChangeDescription(orig)
1609 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001610 actual.append(obj.description)
1611 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001612
wittman@chromium.org455dc922015-01-26 20:15:50 +00001613 def test_get_target_ref(self):
1614 # Check remote or remote branch not present.
1615 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1616 self.assertEqual(None, git_cl.GetTargetRef(None,
1617 'refs/remotes/origin/master',
1618 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001619
wittman@chromium.org455dc922015-01-26 20:15:50 +00001620 # Check default target refs for branches.
1621 self.assertEqual('refs/heads/master',
1622 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1623 None, None))
1624 self.assertEqual('refs/heads/master',
1625 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1626 None, None))
1627 self.assertEqual('refs/heads/master',
1628 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1629 None, None))
1630 self.assertEqual('refs/branch-heads/123',
1631 git_cl.GetTargetRef('origin',
1632 'refs/remotes/branch-heads/123',
1633 None, None))
1634 self.assertEqual('refs/diff/test',
1635 git_cl.GetTargetRef('origin',
1636 'refs/remotes/origin/refs/diff/test',
1637 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001638 self.assertEqual('refs/heads/chrome/m42',
1639 git_cl.GetTargetRef('origin',
1640 'refs/remotes/origin/chrome/m42',
1641 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001642
1643 # Check target refs for user-specified target branch.
1644 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1645 'refs/remotes/branch-heads/123'):
1646 self.assertEqual('refs/branch-heads/123',
1647 git_cl.GetTargetRef('origin',
1648 'refs/remotes/origin/master',
1649 branch, None))
1650 for branch in ('origin/master', 'remotes/origin/master',
1651 'refs/remotes/origin/master'):
1652 self.assertEqual('refs/heads/master',
1653 git_cl.GetTargetRef('origin',
1654 'refs/remotes/branch-heads/123',
1655 branch, None))
1656 for branch in ('master', 'heads/master', 'refs/heads/master'):
1657 self.assertEqual('refs/heads/master',
1658 git_cl.GetTargetRef('origin',
1659 'refs/remotes/branch-heads/123',
1660 branch, None))
1661
1662 # Check target refs for pending prefix.
1663 self.assertEqual('prefix/heads/master',
1664 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1665 None, 'prefix/'))
1666
wychen@chromium.orga872e752015-04-28 23:42:18 +00001667 def test_patch_when_dirty(self):
1668 # Patch when local tree is dirty
1669 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1670 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1671
1672 def test_diff_when_dirty(self):
1673 # Do 'git cl diff' when local tree is dirty
1674 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1675 self.assertNotEqual(git_cl.main(['diff']), 0)
1676
tandriidf09a462016-08-18 16:23:55 -07001677 def _patch_common(self, is_gerrit=False, force_codereview=False,
1678 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001679 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001680 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1681 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001682 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1683 lambda *args: {
1684 'current_revision': '7777777777',
1685 'revisions': {
1686 '1111111111': {
1687 '_number': 1,
1688 'fetch': {'http': {
1689 'url': 'https://chromium.googlesource.com/my/repo',
1690 'ref': 'refs/changes/56/123456/1',
1691 }},
1692 },
1693 '7777777777': {
1694 '_number': 7,
1695 'fetch': {'http': {
1696 'url': 'https://chromium.googlesource.com/my/repo',
1697 'ref': 'refs/changes/56/123456/7',
1698 }},
1699 },
1700 },
1701 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001702 self.mock(git_cl.Changelist, 'GetDescription',
1703 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001704 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1705
tandriidf09a462016-08-18 16:23:55 -07001706 if new_branch:
1707 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1708 else:
1709 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001710 if not force_codereview:
1711 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001712 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001713 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001714 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1715 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001716 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001717 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001718
1719 if is_gerrit:
1720 if not force_codereview:
1721 self.calls += [
1722 ((['git', 'config', 'gerrit.host'],), 'true'),
1723 ]
1724 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001725 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001726 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001727 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001728 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001729 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001730 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001731
tandriidf09a462016-08-18 16:23:55 -07001732 def _common_patch_successful(self, new_branch=False):
1733 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001734 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001735 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001736 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001737 'patch from issue 123456 at patchset 60001 ' +
1738 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001739 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001740 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001741 ((['git', 'config', 'branch.master.rietveldserver',
1742 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001743 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001744 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001745 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001746
1747 def test_patch_successful(self):
1748 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001749 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1750
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001751 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001752 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001753 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1754
wychen@chromium.orga872e752015-04-28 23:42:18 +00001755 def test_patch_conflict(self):
1756 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001757 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001758 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001759
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001760 def test_gerrit_patch_successful(self):
1761 self._patch_common(is_gerrit=True)
1762 self.calls += [
1763 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1764 'refs/changes/56/123456/7'],), ''),
1765 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001766 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001767 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001768 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1769 ((['git', 'config', 'branch.master.merge'],), 'master'),
1770 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1771 ((['git', 'config', 'remote.origin.url'],),
1772 'https://chromium.googlesource.com/my/repo'),
1773 ((['git', 'config', 'branch.master.gerritserver',
1774 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001775 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001776 ]
1777 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1778
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001779 def test_patch_force_codereview(self):
1780 self._patch_common(is_gerrit=True, force_codereview=True)
1781 self.calls += [
1782 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1783 'refs/changes/56/123456/7'],), ''),
1784 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1785 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001786 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001787 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001788 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1789 ((['git', 'config', 'branch.master.merge'],), 'master'),
1790 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1791 ((['git', 'config', 'remote.origin.url'],),
1792 'https://chromium.googlesource.com/my/repo'),
1793 ((['git', 'config', 'branch.master.gerritserver',
1794 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001795 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001796 ]
1797 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1798
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001799 def test_gerrit_patch_url_successful(self):
1800 self._patch_common(is_gerrit=True)
1801 self.calls += [
1802 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1803 'refs/changes/56/123456/1'],), ''),
1804 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001805 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001806 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001807 ((['git', 'config', 'branch.master.gerritserver',
1808 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001809 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001810 ]
1811 self.assertEqual(git_cl.main(
1812 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1813
1814 def test_gerrit_patch_conflict(self):
1815 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001816 self.calls += [
1817 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1818 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001819 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1820 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1821 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001822 ]
1823 with self.assertRaises(SystemExitMock):
1824 git_cl.main(['patch',
1825 'https://chromium-review.googlesource.com/#/c/123456/1'])
1826
tandriic2405f52016-10-10 08:13:15 -07001827 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001828 def notExists(_issue, *_, **kwargs):
1829 self.assertFalse(kwargs['ignore_404'])
1830 raise git_cl.gerrit_util.GerritError(404, '')
1831 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1832
tandriic2405f52016-10-10 08:13:15 -07001833 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001834 self.calls = [
1835 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1836 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1837 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1838 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1839 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1840 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001841 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001842 'or you have no access to it'],), SystemExitMock()),
1843 ]
1844 with self.assertRaises(SystemExitMock):
1845 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1846
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001847 def _checkout_calls(self):
1848 return [
1849 ((['git', 'config', '--local', '--get-regexp',
1850 'branch\\..*\\.rietveldissue'], ),
1851 ('branch.retrying.rietveldissue 1111111111\n'
1852 'branch.some-fix.rietveldissue 2222222222\n')),
1853 ((['git', 'config', '--local', '--get-regexp',
1854 'branch\\..*\\.gerritissue'], ),
1855 ('branch.ger-branch.gerritissue 123456\n'
1856 'branch.gbranch654.gerritissue 654321\n')),
1857 ]
1858
1859 def test_checkout_gerrit(self):
1860 """Tests git cl checkout <issue>."""
1861 self.calls = self._checkout_calls()
1862 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1863 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1864
1865 def test_checkout_rietveld(self):
1866 """Tests git cl checkout <issue>."""
1867 self.calls = self._checkout_calls()
1868 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1869 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1870
1871 def test_checkout_not_found(self):
1872 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001873 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001874 self.calls = self._checkout_calls()
1875 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1876
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001877 def test_checkout_no_branch_issues(self):
1878 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001879 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001880 self.calls = [
1881 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001882 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001883 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001884 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001885 ]
1886 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1887
tandrii@chromium.org28253532016-04-14 13:46:56 +00001888 def _test_gerrit_ensure_authenticated_common(self, auth,
1889 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001890 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1891 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1892 self.mock(git_cl, 'DieWithError',
1893 lambda msg: self._mocked_call(['DieWithError', msg]))
1894 self.mock(git_cl, 'ask_for_data',
1895 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001896 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001897 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001898 cl.branch = 'master'
1899 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001900 cl.lookedup_issue = True
1901 return cl
1902
1903 def test_gerrit_ensure_authenticated_missing(self):
1904 cl = self._test_gerrit_ensure_authenticated_common(auth={
1905 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1906 })
1907 self.calls.append(
1908 ((['DieWithError',
1909 'Credentials for the following hosts are required:\n'
1910 ' chromium-review.googlesource.com\n'
1911 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1912 'You can (re)generate your credentails by visiting '
1913 'https://chromium-review.googlesource.com/new-password'],), ''),)
1914 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1915
1916 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001917 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001918 cl = self._test_gerrit_ensure_authenticated_common(auth={
1919 'chromium.googlesource.com': 'one',
1920 'chromium-review.googlesource.com': 'other',
1921 })
1922 self.calls.append(
1923 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001924 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001925 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1926
1927 def test_gerrit_ensure_authenticated_ok(self):
1928 cl = self._test_gerrit_ensure_authenticated_common(auth={
1929 'chromium.googlesource.com': 'same',
1930 'chromium-review.googlesource.com': 'same',
1931 })
1932 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1933
tandrii@chromium.org28253532016-04-14 13:46:56 +00001934 def test_gerrit_ensure_authenticated_skipped(self):
1935 cl = self._test_gerrit_ensure_authenticated_common(
1936 auth={}, skip_auth_check=True)
1937 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1938
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001939 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001940 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1941 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001942 self.calls = [
1943 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001944 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001945 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1946 ((['git', 'config', 'rietveld.server'],), ''),
1947 ((['git', 'config', 'rietveld.server'],), ''),
1948 ((['git', 'config', 'branch.feature.rietveldserver'],),
1949 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001950 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001951 ]
1952 self.assertEqual(0, git_cl.main(['set-commit']))
1953
tandriid9e5ce52016-07-13 02:32:59 -07001954 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001955 self.mock(git_cl.gerrit_util, 'SetReview',
1956 lambda h, i, labels: self._mocked_call(
1957 ['SetReview', h, i, labels]))
1958 self.calls = [
1959 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001960 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1961 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001962 ((['git', 'config', 'branch.feature.gerritserver'],),
1963 'https://chromium-review.googlesource.com'),
1964 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001965 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001966 ]
tandriid9e5ce52016-07-13 02:32:59 -07001967
1968 def test_cmd_set_commit_gerrit_clear(self):
1969 self._cmd_set_commit_gerrit_common(0)
1970 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1971
1972 def test_cmd_set_commit_gerrit_dry(self):
1973 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001974 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1975
tandriid9e5ce52016-07-13 02:32:59 -07001976 def test_cmd_set_commit_gerrit(self):
1977 self._cmd_set_commit_gerrit_common(2)
1978 self.assertEqual(0, git_cl.main(['set-commit']))
1979
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001980 def test_description_display(self):
1981 out = StringIO.StringIO()
1982 self.mock(git_cl.sys, 'stdout', out)
1983
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001984 self.mock(git_cl, 'Changelist', ChangelistMock)
1985 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001986
1987 self.assertEqual(0, git_cl.main(['description', '-d']))
1988 self.assertEqual('foo\n', out.getvalue())
1989
1990 def test_description_rietveld(self):
1991 out = StringIO.StringIO()
1992 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001993 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001994
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001995 self.assertEqual(0, git_cl.main([
1996 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1997 self.assertEqual('foobar\n', out.getvalue())
1998
iannucci3c972b92016-08-17 13:24:10 -07001999 def test_StatusFieldOverrideIssueMissingArgs(self):
2000 out = StringIO.StringIO()
2001 self.mock(git_cl.sys, 'stderr', out)
2002
2003 try:
2004 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2005 except SystemExit as ex:
2006 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002007 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002008
2009 out = StringIO.StringIO()
2010 self.mock(git_cl.sys, 'stderr', out)
2011
2012 try:
2013 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2014 except SystemExit as ex:
2015 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002016 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002017
2018 def test_StatusFieldOverrideIssue(self):
2019 out = StringIO.StringIO()
2020 self.mock(git_cl.sys, 'stdout', out)
2021
2022 def assertIssue(cl_self, *_args):
2023 self.assertEquals(cl_self.issue, 1)
2024 return 'foobar'
2025
2026 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2027 self.calls = [
2028 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2029 ((['git', 'config', 'rietveld.server'],), ''),
2030 ((['git', 'config', 'rietveld.server'],), ''),
2031 ]
iannuccie53c9352016-08-17 14:40:40 -07002032 self.assertEqual(
2033 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2034 0)
iannucci3c972b92016-08-17 13:24:10 -07002035 self.assertEqual(out.getvalue(), 'foobar\n')
2036
iannuccie53c9352016-08-17 14:40:40 -07002037 def test_SetCloseOverrideIssue(self):
2038 def assertIssue(cl_self, *_args):
2039 self.assertEquals(cl_self.issue, 1)
2040 return 'foobar'
2041
2042 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2043 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2044 self.calls = [
2045 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2046 ((['git', 'config', 'rietveld.server'],), ''),
2047 ((['git', 'config', 'rietveld.server'],), ''),
2048 ]
2049 self.assertEqual(
2050 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2051
2052 def test_SetCommitOverrideIssue(self):
2053 def assertIssue(cl_self, *_args):
2054 self.assertEquals(cl_self.issue, 1)
2055 return 'foobar'
2056
2057 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2058 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2059 self.calls = [
2060 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2061 ((['git', 'config', 'rietveld.server'],), ''),
2062 ((['git', 'config', 'rietveld.server'],), ''),
2063 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2064 ((['git', 'config', 'rietveld.server'],), ''),
2065 ((['git', 'config', 'rietveld.server'],), ''),
2066 ]
2067 self.assertEqual(
2068 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2069
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002070 def test_description_gerrit(self):
2071 out = StringIO.StringIO()
2072 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002073 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002074
2075 self.assertEqual(0, git_cl.main([
2076 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2077 self.assertEqual('foobar\n', out.getvalue())
2078
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002079 def test_description_set_raw(self):
2080 out = StringIO.StringIO()
2081 self.mock(git_cl.sys, 'stdout', out)
2082
2083 self.mock(git_cl, 'Changelist', ChangelistMock)
2084 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2085
2086 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2087 self.assertEqual('hihi', ChangelistMock.desc)
2088
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002089 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002090 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002091
2092 def RunEditor(desc, _, **kwargs):
2093 self.assertEquals(
2094 '# Enter a description of the change.\n'
2095 '# This will be displayed on the codereview site.\n'
2096 '# The first line will also be used as the subject of the review.\n'
2097 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002098 '--------------------\n'
2099 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002100 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002101 # Simulate user changing something.
2102 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002103
dsansomee2d6fd92016-09-08 00:10:47 -07002104 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002105 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002106
2107 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2108 self.mock(git_cl.Changelist, 'GetDescription',
2109 lambda *args: current_desc)
2110 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2111 UpdateDescriptionRemote)
2112 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2113
2114 self.calls = [
2115 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002116 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002117 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2118 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002119 ((['git', 'config', 'core.editor'],), 'vi'),
2120 ]
2121 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2122
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002123 def test_description_set_stdin(self):
2124 out = StringIO.StringIO()
2125 self.mock(git_cl.sys, 'stdout', out)
2126
2127 self.mock(git_cl, 'Changelist', ChangelistMock)
2128 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2129
2130 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2131 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2132
kmarshall3bff56b2016-06-06 18:31:47 -07002133 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002134 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2135
kmarshall3bff56b2016-06-06 18:31:47 -07002136 self.calls = \
2137 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2138 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002139 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002140 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2141 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002142 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2143 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2144 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002145 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2146 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2147 ((['git', 'branch', '-D', 'foo'],), '')]
2148
kmarshall3bff56b2016-06-06 18:31:47 -07002149 self.mock(git_cl, 'get_cl_statuses',
2150 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002151 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2152 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2153 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002154
2155 self.assertEqual(0, git_cl.main(['archive', '-f']))
2156
2157 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002158 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002159 self.calls = \
2160 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2161 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002162 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002163 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2164 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002165 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2166
kmarshall9249e012016-08-23 12:02:16 -07002167 self.mock(git_cl, 'get_cl_statuses',
2168 lambda branches, fine_grained, max_processes:
2169 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2170
2171 self.assertEqual(1, git_cl.main(['archive', '-f']))
2172
2173 def test_archive_dry_run(self):
2174 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2175
2176 self.calls = \
2177 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2178 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2179 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2180 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2181 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2182 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2183 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2184 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2185 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002186
2187 self.mock(git_cl, 'get_cl_statuses',
2188 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002189 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2190 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2191 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002192
kmarshall9249e012016-08-23 12:02:16 -07002193 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2194
2195 def test_archive_no_tags(self):
2196 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2197
2198 self.calls = \
2199 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2200 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2201 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2202 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2203 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2204 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2205 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2206 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2207 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2208 ((['git', 'branch', '-D', 'foo'],), '')]
2209
2210 self.mock(git_cl, 'get_cl_statuses',
2211 lambda branches, fine_grained, max_processes:
2212 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2213 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2214 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2215
2216 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002217
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002218 def test_cmd_issue_erase_existing(self):
2219 out = StringIO.StringIO()
2220 self.mock(git_cl.sys, 'stdout', out)
2221 self.calls = [
2222 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002223 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2224 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002225 # Let this command raise exception (retcode=1) - it should be ignored.
2226 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002227 CERR1),
2228 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2229 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002230 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2231 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2232 ''),
2233 ]
2234 self.assertEqual(0, git_cl.main(['issue', '0']))
2235
phajdan.jre328cf92016-08-22 04:12:17 -07002236 def test_cmd_issue_json(self):
2237 out = StringIO.StringIO()
2238 self.mock(git_cl.sys, 'stdout', out)
2239 self.calls = [
2240 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002241 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002242 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2243 ((['git', 'config', 'rietveld.server'],),
2244 'https://codereview.chromium.org'),
2245 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2246 (('write_json', 'output.json',
2247 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2248 ''),
2249 ]
2250 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2251
tandriide281ae2016-10-12 06:02:30 -07002252 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002253 self.mock(git_cl.Changelist, 'GetChange',
2254 lambda _, *a: (
2255 self._mocked_call(['GetChange']+list(a))))
2256 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2257 lambda *_, **__: (
2258 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002259 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2260 lambda _, s: self._mocked_call(['SetCQState', s]))
2261 self.calls = [
2262 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002263 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002264 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2265 ((['git', 'config', 'rietveld.server'],),
2266 'https://codereview.chromium.org'),
2267 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2268 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2269 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2270 ((['get_or_create_merge_base', 'feature', 'feature'],),
2271 'fake_ancestor_sha'),
2272 ((['GetChange', 'fake_ancestor_sha', None], ),
2273 git_cl.presubmit_support.GitChange(
2274 '', '', '', '', '', '', '', '')),
2275 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2276 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002277 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2278 ]
2279 out = StringIO.StringIO()
2280 self.mock(git_cl.sys, 'stdout', out)
2281 self.assertEqual(0, git_cl.main(['try']))
2282 self.assertEqual(
2283 out.getvalue(),
2284 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2285
tandrii8c5a3532016-11-04 07:52:02 -07002286 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2287 self.mock(git_cl.Changelist, 'GetChange',
2288 lambda _, *a: (
2289 self._mocked_call(['GetChange']+list(a))))
2290 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2291 lambda *_, **__: (
2292 self._mocked_call(['DoGetTryMasters'])))
2293 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2294 lambda _, s: self._mocked_call(['SetCQState', s]))
2295
2296 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2297 # Get realistic expectations.
2298 gerrit_change_list_impl._GetGerritHost()
2299 return self._mocked_call(['_GetChangeDetail', opts or []])
2300 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2301 _GetChangeDetail)
2302
2303 self.calls = [
2304 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2305 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2306 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2307 ((['git', 'config', 'branch.feature.gerritserver'],),
2308 'https://chromium-review.googlesource.com'),
2309 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2310 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2311 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2312 ((['get_or_create_merge_base', 'feature', 'feature'],),
2313 'fake_ancestor_sha'),
2314 ((['GetChange', 'fake_ancestor_sha', None], ),
2315 git_cl.presubmit_support.GitChange(
2316 '', '', '', '', '', '', '', '')),
2317 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2318 ((['DoGetTryMasters'], ), None),
2319 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2320 ]
2321 out = StringIO.StringIO()
2322 self.mock(git_cl.sys, 'stdout', out)
2323 self.assertEqual(0, git_cl.main(['try']))
2324 self.assertEqual(
2325 out.getvalue(),
2326 'scheduled CQ Dry Run on '
2327 'https://chromium-review.googlesource.com/123456\n')
2328
2329 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2330 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2331 lambda _: {
2332 'owner_email': 'owner@e.mail',
2333 'private': False,
2334 'closed': False,
2335 'project': 'depot_tools',
2336 'patchsets': [20001],
2337 })
tandriide281ae2016-10-12 06:02:30 -07002338 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2339 self.calls = [
2340 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2341 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2342 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2343 ((['git', 'config', 'rietveld.server'],),
2344 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002345 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002346 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002347 ]
2348
2349 def _buildbucket_retry(*_, **kw):
2350 # self.maxDiff = 10000
2351 body = json.loads(kw['body'])
2352 self.assertEqual(len(body['builds']), 1)
2353 build = body['builds'][0]
2354 params = json.loads(build.pop('parameters_json'))
2355 self.assertEqual(params, {
2356 u'builder_name': u'win',
2357 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2358 u'revision': None}],
2359 u'properties': {
2360 u'category': u'git_cl_try',
2361 u'issue': 123,
2362 u'key': u'val',
2363 u'json': [{u'a': 1}, None],
2364 u'master': u'tryserver.chromium',
2365 u'patch_project': u'depot_tools',
2366 u'patch_storage': u'rietveld',
2367 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002368 u'rietveld': u'https://codereview.chromium.org',
2369 }
2370 })
2371 self.assertEqual(build, {
2372 u'bucket': u'master.tryserver.chromium',
2373 u'client_operation_id': u'uuid4',
2374 u'tags': [u'builder:win',
2375 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002376 u'user_agent:git_cl_try',
2377 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002378 })
2379
2380 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2381
2382 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2383 self.assertEqual(0, git_cl.main([
2384 'try', '-m', 'tryserver.chromium', '-b', 'win',
2385 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2386 self.assertRegexpMatches(
2387 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002388 'Tried jobs on:\nBucket: master.tryserver.chromium')
2389
tandrii8c5a3532016-11-04 07:52:02 -07002390 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2391 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2392 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2393
2394 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2395 # Get realistic expectations.
2396 gerrit_change_list_impl._GetGerritHost()
2397 return self._mocked_call(['_GetChangeDetail', opts or []])
2398 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2399 _GetChangeDetail)
2400
2401 self.calls = [
2402 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2403 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2404 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2405 ((['git', 'config', 'branch.feature.gerritserver'],),
2406 'https://chromium-review.googlesource.com'),
2407 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002408 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2409 {'owner': {'email': 'owner@e.mail'}}),
2410 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2411 'project': 'depot_tools',
2412 'revisions': {
2413 'deadbeaf': {
2414 '_number': 6,
2415 },
2416 'beeeeeef': {
2417 '_number': 7,
2418 'fetch': {'http': {
2419 'url': 'https://chromium.googlesource.com/depot_tools',
2420 'ref': 'refs/changes/56/123456/7'
2421 }},
2422 },
2423 },
2424 }),
2425 ]
2426
2427 def _buildbucket_retry(*_, **kw):
2428 # self.maxDiff = 10000
2429 body = json.loads(kw['body'])
2430 self.assertEqual(len(body['builds']), 1)
2431 build = body['builds'][0]
2432 params = json.loads(build.pop('parameters_json'))
2433 self.assertEqual(params, {
2434 u'builder_name': u'win',
2435 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2436 u'revision': None}],
2437 u'properties': {
2438 u'category': u'git_cl_try',
2439 u'key': u'val',
2440 u'json': [{u'a': 1}, None],
2441 u'master': u'tryserver.chromium',
2442
2443 u'patch_gerrit_url':
2444 u'https://chromium-review.googlesource.com',
2445 u'patch_issue': 123456,
2446 u'patch_project': u'depot_tools',
2447 u'patch_ref': u'refs/changes/56/123456/7',
2448 u'patch_repository_url':
2449 u'https://chromium.googlesource.com/depot_tools',
2450 u'patch_set': 7,
2451 u'patch_storage': u'gerrit',
2452 }
2453 })
2454 self.assertEqual(build, {
2455 u'bucket': u'master.tryserver.chromium',
2456 u'client_operation_id': u'uuid4',
2457 u'tags': [
2458 u'builder:win',
2459 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2460 u'user_agent:git_cl_try',
2461 u'master:tryserver.chromium'],
2462 })
2463
2464 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2465
2466 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2467 self.assertEqual(0, git_cl.main([
2468 'try', '-m', 'tryserver.chromium', '-b', 'win',
2469 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2470 self.assertRegexpMatches(
2471 git_cl.sys.stdout.getvalue(),
2472 'Tried jobs on:\nBucket: master.tryserver.chromium')
2473
borenet6c0efe62016-10-19 08:13:29 -07002474 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002475 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2476 lambda _: {
2477 'owner_email': 'owner@e.mail',
2478 'private': False,
2479 'closed': False,
2480 'project': 'depot_tools',
2481 'patchsets': [20001],
2482 })
borenet6c0efe62016-10-19 08:13:29 -07002483 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2484 self.calls = [
2485 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2486 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2487 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2488 ((['git', 'config', 'rietveld.server'],),
2489 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002490 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002491 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002492 ]
2493
2494 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002495 body = json.loads(kw['body'])
2496 self.assertEqual(len(body['builds']), 1)
2497 build = body['builds'][0]
2498 params = json.loads(build.pop('parameters_json'))
2499 self.assertEqual(params, {
2500 u'builder_name': u'win',
2501 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2502 u'revision': None}],
2503 u'properties': {
2504 u'category': u'git_cl_try',
2505 u'issue': 123,
2506 u'patch_project': u'depot_tools',
2507 u'patch_storage': u'rietveld',
2508 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002509 u'rietveld': u'https://codereview.chromium.org',
2510 }
2511 })
2512 self.assertEqual(build, {
2513 u'bucket': u'test.bucket',
2514 u'client_operation_id': u'uuid4',
2515 u'tags': [u'builder:win',
2516 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2517 u'user_agent:git_cl_try'],
2518 })
2519
2520 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2521
2522 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2523 self.assertEqual(0, git_cl.main([
2524 'try', '-B', 'test.bucket', '-b', 'win']))
2525 self.assertRegexpMatches(
2526 git_cl.sys.stdout.getvalue(),
2527 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002528
qyearsley123a4682016-10-26 09:12:17 -07002529 def test_git_cl_try_bots_on_multiple_masters(self):
2530 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2531 self.calls = [
2532 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2533 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2534 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2535 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002536 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002537 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2538 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2539 ]
2540
2541 def _buildbucket_retry(*_, **kw):
2542 body = json.loads(kw['body'])
2543 self.assertEqual(len(body['builds']), 2)
2544
2545 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2546 self.assertEqual(first_build_params['builder_name'], 'builder1')
2547 self.assertEqual(first_build_params['properties']['master'], 'master1')
2548
2549 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2550 self.assertEqual(first_build_params['builder_name'], 'builder2')
2551 self.assertEqual(first_build_params['properties']['master'], 'master2')
2552
2553 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2554
2555 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2556 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2557
2558 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2559 self.assertEqual(
2560 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2561 self.assertEqual(
2562 git_cl.sys.stdout.getvalue(),
2563 'Tried jobs on:\n'
2564 'Bucket: master.master1\n'
2565 ' builder1: []\n'
2566 'Bucket: master.master2\n'
2567 ' builder2: []\n'
2568 'To see results here, run: git cl try-results\n'
2569 'To see results in browser, run: git cl web\n')
2570
tandrii16e0b4e2016-06-07 10:34:28 -07002571 def _common_GerritCommitMsgHookCheck(self):
2572 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2573 self.mock(git_cl.os.path, 'abspath',
2574 lambda path: self._mocked_call(['abspath', path]))
2575 self.mock(git_cl.os.path, 'exists',
2576 lambda path: self._mocked_call(['exists', path]))
2577 self.mock(git_cl.gclient_utils, 'FileRead',
2578 lambda path: self._mocked_call(['FileRead', path]))
2579 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2580 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2581 self.calls = [
2582 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2583 ((['abspath', '../'],), '/abs/git_repo_root'),
2584 ]
2585 return git_cl.Changelist(codereview='gerrit', issue=123)
2586
2587 def test_GerritCommitMsgHookCheck_custom_hook(self):
2588 cl = self._common_GerritCommitMsgHookCheck()
2589 self.calls += [
2590 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2591 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2592 '#!/bin/sh\necho "custom hook"')
2593 ]
2594 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2595
2596 def test_GerritCommitMsgHookCheck_not_exists(self):
2597 cl = self._common_GerritCommitMsgHookCheck()
2598 self.calls += [
2599 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2600 ]
2601 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2602
2603 def test_GerritCommitMsgHookCheck(self):
2604 cl = self._common_GerritCommitMsgHookCheck()
2605 self.calls += [
2606 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2607 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2608 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2609 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2610 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2611 ''),
2612 ]
2613 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2614
tandriic4344b52016-08-29 06:04:54 -07002615 def test_GerritCmdLand(self):
2616 self.calls += [
2617 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2618 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2619 'deadbeaf'),
2620 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2621 ((['git', 'config', 'branch.feature.gerritserver'],),
2622 'chromium-review.googlesource.com'),
2623 ]
2624 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2625 cl._codereview_impl._GetChangeDetail = lambda _: {
2626 'labels': {},
2627 'current_revision': 'deadbeaf',
2628 }
agable32978d92016-11-01 12:55:02 -07002629 cl._codereview_impl._GetChangeCommit = lambda: {
2630 'commit': 'deadbeef',
2631 'web_links': [{'name': 'gerrit',
2632 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2633 }
tandriic4344b52016-08-29 06:04:54 -07002634 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002635 out = StringIO.StringIO()
2636 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002637 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002638 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002639 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002640
tandrii221ab252016-10-06 08:12:04 -07002641 BUILDBUCKET_BUILDS_MAP = {
2642 '9000': {
2643 'id': '9000',
2644 'status': 'STARTED',
2645 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2646 'result_details_json': '{"properties": {}}',
2647 'bucket': 'master.x.y',
2648 'created_by': 'user:someone@chromium.org',
2649 'created_ts': '147200002222000',
2650 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2651 },
2652 '8000': {
2653 'id': '8000',
2654 'status': 'COMPLETED',
2655 'result': 'FAILURE',
2656 'failure_reason': 'BUILD_FAILURE',
2657 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2658 'result_details_json': '{"properties": {}}',
2659 'bucket': 'master.x.y',
2660 'created_by': 'user:someone@chromium.org',
2661 'created_ts': '147200001111000',
2662 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2663 },
2664 }
2665
2666 def test_write_try_results_json(self):
2667 expected_output = [
2668 {
2669 'buildbucket_id': '8000',
2670 'bucket': 'master.x.y',
2671 'builder_name': 'my-builder',
2672 'status': 'COMPLETED',
2673 'result': 'FAILURE',
2674 'failure_reason': 'BUILD_FAILURE',
2675 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2676 },
2677 {
2678 'buildbucket_id': '9000',
2679 'bucket': 'master.x.y',
2680 'builder_name': 'my-builder',
2681 'status': 'STARTED',
2682 'result': None,
2683 'failure_reason': None,
2684 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2685 }
2686 ]
2687 self.calls = [(('write_json', 'output.json', expected_output), '')]
2688 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2689
tandrii45b2a582016-10-11 03:14:16 -07002690 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002691 out = StringIO.StringIO()
2692 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002693 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2694 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002695 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2696 self._mocked_call(['get_authenticator_for_host', host]))
2697 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2698 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002699
2700 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2701 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002702 self.calls += [
2703 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2704 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2705 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2706 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2707 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2708 ((['git', 'config', 'branch.feature.rietveldserver'],),
2709 'codereview.example.com'),
2710 ((['get_authenticator_for_host', 'codereview.example.com'],),
2711 AuthenticatorMock()),
2712 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2713
2714 def test_fetch_try_jobs_none_rietveld(self):
2715 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002716 # Simulate that user isn't logged in.
2717 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002718 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002719 self.assertRegexpMatches(sys.stdout.getvalue(),
2720 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002721 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2722
2723 def test_fetch_try_jobs_some_rietveld(self):
2724 self._setup_fetch_try_jobs_rietveld({
2725 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2726 })
2727 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002728 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2729 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2730 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2731
2732 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2733 self._setup_fetch_try_jobs(most_recent_patchset=13)
2734 self.calls += [
2735 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2736 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2737 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002738 # TODO(tandrii): Uncomment the below if we decide to support checking
2739 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002740 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002741 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002742 ((['git', 'config', 'branch.feature.gerritserver'],),
2743 'https://x-review.googlesource.com'),
2744 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2745 AuthenticatorMock()),
2746 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2747
2748 def test_fetch_try_jobs_none_gerrit(self):
2749 self._setup_fetch_try_jobs_gerrit({})
2750 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002751 # TODO(tandrii): Uncomment the below if we decide to support checking
2752 # patchsets for Gerrit.
2753 # self.assertRegexpMatches(
2754 # sys.stdout.getvalue(),
2755 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002756 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2757
2758 def test_fetch_try_jobs_some_gerrit(self):
2759 self._setup_fetch_try_jobs_gerrit({
2760 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2761 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002762 # TODO(tandrii): Uncomment the below if we decide to support checking
2763 # patchsets for Gerrit.
2764 # self.calls.remove(
2765 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002766 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2767
2768 # ... and doesn't result in warning.
2769 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2770 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002771 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2772 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2773
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002774
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002775if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002776 git_cl.logging.basicConfig(
2777 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002778 unittest.main()