blob: 3a0acc13ea9a2611d3daacf1edd7778bdcfdb4c0 [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
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
tandriide281ae2016-10-12 06:02:30 -07009import json
maruel@chromium.orgddd59412011-11-30 14:20:38 +000010import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000011import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import sys
13import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000014import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000015
16sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
17
18from testing_support.auto_stub import TestCase
19
20import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000021import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000022import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000023import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000024
tandrii5d48c322016-08-18 16:19:37 -070025def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
26 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
27
28
29CERR1 = callError(1)
30
31
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000032class ChangelistMock(object):
33 # A class variable so we can access it when we don't have access to the
34 # instance that's being set.
35 desc = ""
36 def __init__(self, **kwargs):
37 pass
38 def GetIssue(self):
39 return 1
40 def GetDescription(self):
41 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070042 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 ChangelistMock.desc = desc
44
tandrii5d48c322016-08-18 16:19:37 -070045
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000046class PresubmitMock(object):
47 def __init__(self, *args, **kwargs):
48 self.reviewers = []
49 @staticmethod
50 def should_continue():
51 return True
52
53
54class RietveldMock(object):
55 def __init__(self, *args, **kwargs):
56 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000057
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000058 @staticmethod
59 def get_description(issue):
60 return 'Issue: %d' % issue
61
maruel@chromium.org78936cb2013-04-11 00:17:52 +000062 @staticmethod
63 def get_issue_properties(_issue, _messages):
64 return {
65 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
66 'messages': [
67 {
68 'approval': True,
69 'sender': 'john@chromium.org',
70 },
71 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010072 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000073 }
74
iannuccie53c9352016-08-17 14:40:40 -070075 @staticmethod
76 def close_issue(_issue):
77 return 'Closed'
78
skobes6468b902016-10-24 08:45:10 -070079 @staticmethod
80 def get_patch(issue, patchset):
81 return 'patch set from issue %s patchset %s' % (issue, patchset)
82
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010083 @staticmethod
84 def update_description(_issue, _description):
85 return 'Updated'
86
87 @staticmethod
88 def add_comment(_issue, _comment):
89 return 'Commented'
90
91
92
skobes6468b902016-10-24 08:45:10 -070093
94class GitCheckoutMock(object):
95 def __init__(self, *args, **kwargs):
96 pass
97
98 @staticmethod
99 def reset():
100 GitCheckoutMock.conflict = False
101
102 def apply_patch(self, p):
103 if GitCheckoutMock.conflict:
104 raise Exception('failed')
105
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000106
107class WatchlistsMock(object):
108 def __init__(self, _):
109 pass
110 @staticmethod
111 def GetWatchersForPaths(_):
112 return ['joe@example.com']
113
114
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000115class CodereviewSettingsFileMock(object):
116 def __init__(self):
117 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800118 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000119 def read(self):
120 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000121 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000122
123
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000124class AuthenticatorMock(object):
125 def __init__(self, *_args):
126 pass
127 def has_cached_credentials(self):
128 return True
tandrii221ab252016-10-06 08:12:04 -0700129 def authorize(self, http):
130 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000131
132
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000133def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
134 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
135
136 Usage:
137 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
138 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
139
140 OR
141 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
142 CookiesAuthenticatorMockFactory(cookie='cookie'))
143 """
144 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800145 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000146 # Intentionally not calling super() because it reads actual cookie files.
147 pass
148 @classmethod
149 def get_gitcookies_path(cls):
150 return '~/.gitcookies'
151 @classmethod
152 def get_netrc_path(cls):
153 return '~/.netrc'
154 def get_auth_header(self, host):
155 if same_cookie:
156 return same_cookie
157 return (hosts_with_creds or {}).get(host)
158 return CookiesAuthenticatorMock
159
kmarshall9249e012016-08-23 12:02:16 -0700160class MockChangelistWithBranchAndIssue():
161 def __init__(self, branch, issue):
162 self.branch = branch
163 self.issue = issue
164 def GetBranch(self):
165 return self.branch
166 def GetIssue(self):
167 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000168
tandriic2405f52016-10-10 08:13:15 -0700169
170class SystemExitMock(Exception):
171 pass
172
173
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000174class TestGitClBasic(unittest.TestCase):
175 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
176 parsed = urlparse.urlparse(url)
177 result = func(parsed)
178 if fail:
179 self.assertIsNone(result)
180 return None
181 self.assertIsNotNone(result)
182 self.assertEqual(result.issue, issue)
183 self.assertEqual(result.patchset, patchset)
184 self.assertEqual(result.hostname, hostname)
185 return result
186
187 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700188 def test(url, issue=None, patchset=None, hostname=None, fail=None):
189 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000190 git_cl._RietveldChangelistImpl.ParseIssueURL,
191 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000192
193 test('http://codereview.chromium.org/123',
194 123, None, 'codereview.chromium.org')
195 test('https://codereview.chromium.org/123',
196 123, None, 'codereview.chromium.org')
197 test('https://codereview.chromium.org/123/',
198 123, None, 'codereview.chromium.org')
199 test('https://codereview.chromium.org/123/whatever',
200 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700201 test('https://codereview.chromium.org/123/#ps20001',
202 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000203 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700204 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000205 # This looks like bad Gerrit, but is actually valid Rietveld.
206 test('https://chrome-review.source.com/123/4/',
207 123, None, 'chrome-review.source.com')
208
209 test('https://codereview.chromium.org/deadbeaf', fail=True)
210 test('https://codereview.chromium.org/api/123', fail=True)
211 test('bad://codereview.chromium.org/123', fail=True)
212 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
213
214 def test_ParseIssueURL_gerrit(self):
215 def test(url, issue=None, patchset=None, hostname=None, fail=None):
216 self._test_ParseIssueUrl(
217 git_cl._GerritChangelistImpl.ParseIssueURL,
218 url, issue, patchset, hostname, fail)
219
220 test('http://chrome-review.source.com/c/123',
221 123, None, 'chrome-review.source.com')
222 test('https://chrome-review.source.com/c/123/',
223 123, None, 'chrome-review.source.com')
224 test('https://chrome-review.source.com/c/123/4',
225 123, 4, 'chrome-review.source.com')
226 test('https://chrome-review.source.com/#/c/123/4',
227 123, 4, 'chrome-review.source.com')
228 test('https://chrome-review.source.com/c/123/4',
229 123, 4, 'chrome-review.source.com')
230 test('https://chrome-review.source.com/123',
231 123, None, 'chrome-review.source.com')
232 test('https://chrome-review.source.com/123/4',
233 123, 4, 'chrome-review.source.com')
234
235 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
236 test('https://chrome-review.source.com/c/abc/', fail=True)
237 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
238
239 def test_ParseIssueNumberArgument(self):
240 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
241 result = git_cl.ParseIssueNumberArgument(arg)
242 self.assertIsNotNone(result)
243 if fail:
244 self.assertFalse(result.valid)
245 else:
246 self.assertEqual(result.issue, issue)
247 self.assertEqual(result.patchset, patchset)
248 self.assertEqual(result.hostname, hostname)
249
250 test('123', 123)
251 test('', fail=True)
252 test('abc', fail=True)
253 test('123/1', fail=True)
254 test('123a', fail=True)
255 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
256 # Rietveld.
257 test('https://codereview.source.com/123',
258 123, None, 'codereview.source.com')
259 test('https://codereview.source.com/www123', fail=True)
260 # Gerrrit.
261 test('https://chrome-review.source.com/c/123/4',
262 123, 4, 'chrome-review.source.com')
263 test('https://chrome-review.source.com/bad/123/4', fail=True)
264
tandriif9aefb72016-07-01 09:06:51 -0700265 def test_get_bug_line_values(self):
266 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
267 self.assertEqual(f('', ''), [])
268 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
269 self.assertEqual(f('v8', '456'), ['v8:456'])
270 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
271 # Not nice, but not worth carying.
272 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
273 ['v8:456', 'chromium:123', 'v8:123'])
274
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100275 def _test_git_number(self, parent_msg, dest_ref, child_msg,
276 parent_hash='parenthash'):
277 desc = git_cl.ChangeDescription(child_msg)
278 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
279 return desc.description
280
281 def assertEqualByLine(self, actual, expected):
282 self.assertEqual(actual.splitlines(), expected.splitlines())
283
284 def test_git_number_bad_parent(self):
285 with self.assertRaises(ValueError):
286 self._test_git_number('Parent', 'refs/heads/master', 'Child')
287
288 def test_git_number_bad_parent_footer(self):
289 with self.assertRaises(AssertionError):
290 self._test_git_number(
291 'Parent\n'
292 '\n'
293 'Cr-Commit-Position: wrong',
294 'refs/heads/master', 'Child')
295
296 def test_git_number_bad_lineage_ignored(self):
297 actual = self._test_git_number(
298 'Parent\n'
299 '\n'
300 'Cr-Commit-Position: refs/heads/master@{#1}\n'
301 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
302 'refs/heads/master', 'Child')
303 self.assertEqualByLine(
304 actual,
305 'Child\n'
306 '\n'
307 'Cr-Commit-Position: refs/heads/master@{#2}\n'
308 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
309
310 def test_git_number_same_branch(self):
311 actual = self._test_git_number(
312 'Parent\n'
313 '\n'
314 'Cr-Commit-Position: refs/heads/master@{#12}',
315 dest_ref='refs/heads/master',
316 child_msg='Child')
317 self.assertEqualByLine(
318 actual,
319 'Child\n'
320 '\n'
321 'Cr-Commit-Position: refs/heads/master@{#13}')
322
323 def test_git_number_same_branch_with_originals(self):
324 actual = self._test_git_number(
325 'Parent\n'
326 '\n'
327 'Cr-Commit-Position: refs/heads/master@{#12}',
328 dest_ref='refs/heads/master',
329 child_msg='Child\n'
330 '\n'
331 'Some users are smart and insert their own footers\n'
332 '\n'
333 'Cr-Whatever: value\n'
334 'Cr-Commit-Position: refs/copy/paste@{#22}')
335 self.assertEqualByLine(
336 actual,
337 'Child\n'
338 '\n'
339 'Some users are smart and insert their own footers\n'
340 '\n'
341 'Cr-Original-Whatever: value\n'
342 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
343 'Cr-Commit-Position: refs/heads/master@{#13}')
344
345 def test_git_number_new_branch(self):
346 actual = self._test_git_number(
347 'Parent\n'
348 '\n'
349 'Cr-Commit-Position: refs/heads/master@{#12}',
350 dest_ref='refs/heads/branch',
351 child_msg='Child')
352 self.assertEqualByLine(
353 actual,
354 'Child\n'
355 '\n'
356 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
357 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
358
359 def test_git_number_lineage(self):
360 actual = self._test_git_number(
361 'Parent\n'
362 '\n'
363 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
364 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
365 dest_ref='refs/heads/branch',
366 child_msg='Child')
367 self.assertEqualByLine(
368 actual,
369 'Child\n'
370 '\n'
371 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
372 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
373
374 def test_git_number_moooooooore_lineage(self):
375 actual = self._test_git_number(
376 'Parent\n'
377 '\n'
378 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
379 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
380 dest_ref='refs/heads/mooore',
381 child_msg='Child')
382 self.assertEqualByLine(
383 actual,
384 'Child\n'
385 '\n'
386 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
387 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
388 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
389
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100390 def test_git_number_ever_moooooooore_lineage(self):
391 self.maxDiff = 10000
392 actual = self._test_git_number(
393 'CQ commit on fresh new branch + numbering.\n'
394 '\n'
395 'NOTRY=True\n'
396 'NOPRESUBMIT=True\n'
397 'BUG=\n'
398 '\n'
399 'Review-Url: https://codereview.chromium.org/2577703003\n'
400 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
401 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
402 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
403 dest_ref='refs/heads/gnumb-test/cl',
404 child_msg='git cl on fresh new branch + numbering.\n'
405 '\n'
406 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
407 self.assertEqualByLine(
408 actual,
409 'git cl on fresh new branch + numbering.\n'
410 '\n'
411 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
412 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
413 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
414 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
415 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100416
417 def test_git_number_cherry_pick(self):
418 actual = self._test_git_number(
419 'Parent\n'
420 '\n'
421 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
422 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
423 dest_ref='refs/heads/branch',
424 child_msg='Child, which is cherry-pick from master\n'
425 '\n'
426 'Cr-Commit-Position: refs/heads/master@{#100}\n'
427 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
428 self.assertEqualByLine(
429 actual,
430 'Child, which is cherry-pick from master\n'
431 '\n'
432 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
433 '\n'
434 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
435 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
436 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
437
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000438
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000439class TestGitCl(TestCase):
440 def setUp(self):
441 super(TestGitCl, self).setUp()
442 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700443 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000444 self.mock(subprocess2, 'call', self._mocked_call)
445 self.mock(subprocess2, 'check_call', self._mocked_call)
446 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700447 self.mock(subprocess2, 'communicate',
448 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000449 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000450 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000451 self.mock(git_common, 'get_or_create_merge_base',
452 lambda *a: (
453 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000454 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000455 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000456 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700457 self.mock(git_cl, 'write_json', lambda path, contents:
458 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000459 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000460 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000461 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700462 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
463 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000464 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000465 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000466 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000467 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
468 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700469 self.mock(git_cl, 'DieWithError',
470 lambda msg: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000471 # It's important to reset settings to not have inter-tests interference.
472 git_cl.settings = None
473
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000474
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000475 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000476 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000477 # Note: has_failed returns True if at least 1 test ran so far, current
478 # included, has failed. That means current test may have actually ran
479 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000480 if not self.has_failed():
481 self.assertEquals([], self.calls)
482 finally:
483 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000484
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000485 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000486 self.assertTrue(
487 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700488 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000489 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000490 expected_args, result = top
491
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000492 # Also logs otherwise it could get caught in a try/finally and be hard to
493 # diagnose.
494 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700495 N = 5
496 prior_calls = '\n '.join(
497 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
498 for i, c in enumerate(self._calls_done[-N:]))
499 following_calls = '\n '.join(
500 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
501 for i, c in enumerate(self.calls[:N]))
502 extended_msg = (
503 'A few prior calls:\n %s\n\n'
504 'This (expected):\n @%d: %r\n'
505 'This (actual):\n @%d: %r\n\n'
506 'A few following expected calls:\n %s' %
507 (prior_calls, len(self._calls_done), expected_args,
508 len(self._calls_done), args, following_calls))
509 git_cl.logging.error(extended_msg)
510
tandrii99a72f22016-08-17 14:33:24 -0700511 self.fail('@%d\n'
512 ' Expected: %r\n'
513 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700514 len(self._calls_done), expected_args, args))
515
516 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700517 if isinstance(result, Exception):
518 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000519 return result
520
tandrii48df5812016-10-17 03:55:37 -0700521 def test_LoadCodereviewSettingsFromFile_gerrit(self):
522 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
523 self.calls = [
524 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
525 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
526 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
527 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
528 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
529 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700530 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
531 CERR1),
532 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
533 ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],),
534 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700535 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
536 CERR1),
537 ((['git', 'config', 'gerrit.host', 'true'],), ''),
538 ]
539 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
540
maruel@chromium.orga3353652011-11-30 14:26:57 +0000541 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000542 def _is_gerrit_calls(cls, gerrit=False):
543 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
544 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
545
546 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000547 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000548 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000549 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000550
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000551 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000552 def _upload_no_rev_calls(cls, similarity, find_copies):
553 return (cls._git_base_calls(similarity, find_copies) +
554 cls._git_upload_no_rev_calls())
555
556 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000557 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000558 if similarity is None:
559 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700560 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700561 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000562 else:
tandrii33a46ff2016-08-23 05:53:40 -0700563 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700564 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000565
566 if find_copies is None:
567 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700568 find_copies_call = ((['git', 'config', '--bool',
569 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000570 else:
tandrii5d48c322016-08-18 16:19:37 -0700571 val = str(find_copies).lower()
572 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000573 'branch.master.git-find-copies', val],), '')
574
575 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000576 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800577 '-l100000', '-C'+similarity,
578 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000579 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000580 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000581 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000582
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000583 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000584 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000585 similarity_call,
586 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
587 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000588 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000589 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700590 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
591 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000592 ((['git', 'config', 'rietveld.server'],),
593 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000594 ((['git', 'config', 'branch.master.merge'],), 'master'),
595 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000596 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000597 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000598 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000599 ((['git', 'rev-parse', '--show-cdup'],), ''),
600 ((['git', 'rev-parse', 'HEAD'],), '12345'),
601 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000602 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000603 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700604 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000605 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000606 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000607 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000608 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000609 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000610 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000611 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000612 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000613 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000614 ]
615
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000616 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000617 def _git_upload_no_rev_calls(cls):
618 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000619 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000620 ]
621
622 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000623 def _git_upload_calls(cls, private):
624 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000625 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000626 private_call = []
627 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000628 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000629 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000630 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000631
maruel@chromium.orga3353652011-11-30 14:26:57 +0000632 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000633 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000634 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000635 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800636 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000637 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700638 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000639 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000640 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000641 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700642 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000643 ] + cls._git_post_upload_calls()
644
645 @classmethod
646 def _git_post_upload_calls(cls):
647 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000648 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
649 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
650 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000651 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000652 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000653 ]
654
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000655 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000656 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000657 fake_ancestor = 'fake_ancestor'
658 fake_cl = 'fake_cl_for_patch'
659 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000660 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000661 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000662 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000663 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000664 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000665 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000666 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000667 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700668 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000669 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000670 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000671 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000672 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000673 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000674 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000675 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000676 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000677 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000678 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000679 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000680
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000681 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700682 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000683 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000684 return [
685 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000686 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000687 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000688 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700689 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000690 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000691 '--git_similarity', similarity or '50'
692 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000693 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694 ]
695
696 def _run_reviewer_test(
697 self,
698 upload_args,
699 expected_description,
700 returned_description,
701 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000702 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700703 private=False,
704 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000705 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000706 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000707 try:
708 similarity = upload_args[upload_args.index('--similarity')+1]
709 except ValueError:
710 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000711
712 if '--find-copies' in upload_args:
713 find_copies = True
714 elif '--no-find-copies' in upload_args:
715 find_copies = False
716 else:
717 find_copies = None
718
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000719 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700720 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000721
722 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000723
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000724 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000725 self.assertEquals(
726 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000727 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000728 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000729 '#--------------------This line is 72 characters long'
730 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000731 expected_description,
732 desc)
733 return returned_description
734 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000735
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000736 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000737 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700738 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000739 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000740 return 1, 2
741 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000742
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000743 git_cl.main(['upload'] + upload_args)
744
745 def test_no_reviewer(self):
746 self._run_reviewer_test(
747 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000748 'desc\n\nBUG=',
749 '# Blah blah comment.\ndesc\n\nBUG=',
750 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000751 [])
752
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000753 def test_keep_similarity(self):
754 self._run_reviewer_test(
755 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000756 'desc\n\nBUG=',
757 '# Blah blah comment.\ndesc\n\nBUG=',
758 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000759 [])
760
iannucci@chromium.org79540052012-10-19 23:15:26 +0000761 def test_keep_find_copies(self):
762 self._run_reviewer_test(
763 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000764 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000765 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000766 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000767 [])
768
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000769 def test_private(self):
770 self._run_reviewer_test(
771 ['--private'],
772 'desc\n\nBUG=',
773 '# Blah blah comment.\ndesc\n\nBUG=\n',
774 'desc\n\nBUG=',
775 [])
776
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000777 def test_reviewers_cmd_line(self):
778 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000779 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000780 self._run_reviewer_test(
781 ['-r' 'foo@example.com'],
782 description,
783 '\n%s\n' % description,
784 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000785 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000786
787 def test_reviewer_tbr_overriden(self):
788 # Reviewer is overriden with TBR
789 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000790 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000791 self._run_reviewer_test(
792 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000793 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000794 description.strip('\n'),
795 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000796 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000797
798 def test_reviewer_multiple(self):
799 # Handles multiple R= or TBR= lines.
800 description = (
bradnelsond975b302016-10-23 12:20:23 -0700801 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
802 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000803 self._run_reviewer_test(
804 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000805 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000806 description,
807 description,
bradnelsond975b302016-10-23 12:20:23 -0700808 ['--reviewers=another@example.com,reviewer@example.com'],
809 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000810
maruel@chromium.orga3353652011-11-30 14:26:57 +0000811 def test_reviewer_send_mail(self):
812 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000813 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000814 self._run_reviewer_test(
815 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000816 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000817 description.strip('\n'),
818 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000819 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000820
821 def test_reviewer_send_mail_no_rev(self):
822 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000823 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700824 self.calls = self._upload_no_rev_calls(None, None) + [
825 ((['DieWithError', 'Must specify reviewers to send email.'],),
826 SystemExitMock())
827 ]
828
829 def RunEditor(desc, _, **kwargs):
830 return desc
831 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
832 self.mock(sys, 'stdout', stdout)
833 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000834 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700835 self.assertEqual(
836 'Using 50% similarity for rename/copy detection. Override with '
837 '--similarity.\n',
838 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000839
tandriif9aefb72016-07-01 09:06:51 -0700840 def test_bug_on_cmd(self):
841 self._run_reviewer_test(
842 ['--bug=500658,proj:123'],
843 'desc\n\nBUG=500658\nBUG=proj:123',
844 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
845 'desc\n\nBUG=500658\nBUG=proj:1234',
846 [])
847
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100848 def _land_rietveld_common(self, debug=False):
849 if debug:
850 # Very useful due to finally clause in git cl land raising exceptions and
851 # shadowing real cause of failure.
852 self.mock(git_cl, '_IS_BEING_TESTED', True)
853 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100854 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100855
856 self.mock(git_cl._GitNumbererState, 'load', classmethod(lambda _, url, ref:
857 self._mocked_call(['_GitNumbererState', url, ref])))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100858 self.mock(RietveldMock, 'update_description', staticmethod(
859 lambda i, d: self._mocked_call(['update_description', i, d])))
860 self.mock(RietveldMock, 'add_comment', staticmethod(
861 lambda i, c: self._mocked_call(['add_comment', i, c])))
862 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100863 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
864 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
865 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
866 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
867 CERR1),
868 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
869 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800870 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100871 ((['git', 'config', 'rietveld.server'],),
872 'https://codereview.chromium.org'),
873 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
874 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
875 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
876 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100877 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
878 ''), # No commits to rebase, according to local view of origin.
879 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
880 'fake_ancestor_sha'),
881 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
882 ((['git', 'rev-parse', '--show-cdup'],), ''),
883 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
884 ((['git', 'diff', '--name-status', '--no-renames', '-r',
885 'fake_ancestor_sha...', '.'],),
886 'M\tfile1.cpp'),
887 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
888 ((['git', 'config', 'branch.feature.rietveldserver'],),
889 'https://codereview.chromium.org'),
890 ((['git', 'config', 'user.email'],), 'user@e.mail'),
891 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
892 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
893 'fake_ancestor_sha', 'feature'],),
894 # This command just prints smth like this:
895 # file1.cpp | 53 ++++++--
896 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
897 ''),
898 ((['git', 'show-ref', '--quiet', '--verify',
899 'refs/heads/git-cl-commit'],),
900 ''), # 0 return code means branch exists.
901 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
902 ((['git', 'show-ref', '--quiet', '--verify',
903 'refs/heads/git-cl-cherry-pick'],),
904 CERR1), # This means git-cl-cherry-pick branch does not exist.
905 ((['git', 'rev-parse', '--show-cdup'],), ''),
906 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
907 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
908 ((['git', 'commit', '-m',
909 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100910 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100911 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
912 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
913 ((['git', 'config', '--get', 'remote.origin.url'],),
914 'https://chromium.googlesource.com/infra/infra'),
915 ]
916
917 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100918 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100919 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100920 ((['git', 'config', 'remote.origin.url'],),
921 'https://chromium.googlesource.com/infra/infra'),
922 ((['_GitNumbererState',
923 'https://chromium.googlesource.com/infra/infra',
924 'refs/heads/master'],),
925 git_cl._GitNumbererState(None, False)),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100926 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
927 ''),
928 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
929 ((['git', 'checkout', '-q', 'feature'],), ''),
930 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
931 ((['git', 'config', 'rietveld.viewvc-url'],),
932 'https://chromium.googlesource.com/infra/infra/+/'),
933 ((['update_description', 123,
934 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
935 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
936 ''),
937 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
938 'fake_sha_rebased (presubmit successful).'],), ''),
939 ]
940 git_cl.main(['land'])
941
942 def test_land_rietveld_gnumbd(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100943 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100944 self.mock(git_cl, 'WaitForRealCommit',
945 lambda *a: self._mocked_call(['WaitForRealCommit'] + list(a)))
946 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100947 ((['git', 'config', 'remote.origin.url'],),
948 'https://chromium.googlesource.com/chromium/src'),
949 ((['_GitNumbererState',
950 'https://chromium.googlesource.com/chromium/src',
951 'refs/heads/master'],),
952 git_cl._GitNumbererState('refs/pending', True)),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100953 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
954 ((['git', 'retry', 'fetch', 'origin',
955 '+refs/pending/heads/master:refs/git-cl/pending/heads/master'],), ''),
956 ((['git', 'checkout', 'refs/git-cl/pending/heads/master'],), ''),
957 ((['git', 'cherry-pick', 'fake_sha_rebased'],), ''),
958
959 ((['git', 'retry', 'push', '--porcelain', 'origin',
960 'HEAD:refs/pending/heads/master'],),''),
961 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased_on_pending'),
962
963 ((['git', 'checkout', '-q', 'feature'],), ''),
964 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
965
966 ((['WaitForRealCommit', 'origin', 'fake_sha_rebased_on_pending',
967 'refs/remotes/origin/master', 'refs/heads/master'],),
968 'fake_sha_gnumbded'),
969
970 ((['git', 'config', 'rietveld.viewvc-url'],),
971 'https://chromium.googlesource.com/infra/infra/+/'),
972 ((['update_description', 123,
973 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
974 'https://chromium.googlesource.com/infra/infra/+/fake_sha_gnumbded'],),
975 ''),
976 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
977 'fake_sha_gnumbded (presubmit successful).'],),
978 ''),
979 ]
980 git_cl.main(['land'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000981
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100982 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100983 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100984
985 # Special mocks to check validity of timestamp.
986 original_git_amend_head = git_cl._git_amend_head
987 def _git_amend_head_mock(msg, tstamp):
988 self._mocked_call(['git_amend_head committer timestamp', tstamp])
989 return original_git_amend_head(msg, tstamp)
990 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
991
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100992 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100993 ((['git', 'config', 'remote.origin.url'],),
994 'https://chromium.googlesource.com/chromium/src'),
995 ((['_GitNumbererState',
996 'https://chromium.googlesource.com/chromium/src',
997 'refs/heads/master'],),
998 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100999
1000 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1001 'This is parent commit.\n'
1002 '\n'
1003 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1004 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001005 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1006 '1480022355'), # Committer's unix timestamp.
1007 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1008 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001009
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001010 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001011 ((['git', 'commit', '--amend', '-m',
1012 'Issue: 123\n\nR=john@chromium.org\n'
1013 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001014 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001015 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1016 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1017
1018 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1019 ''),
1020 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1021 ((['git', 'checkout', '-q', 'feature'],), ''),
1022 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1023 ((['git', 'config', 'rietveld.viewvc-url'],),
1024 'https://chromium.googlesource.com/infra/infra/+/'),
1025 ((['update_description', 123,
1026 'Issue: 123\n\nR=john@chromium.org\n'
1027 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001028 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001029 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1030 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1031 'Committed: '
1032 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1033 ''),
1034 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1035 'fake_sha_rebased (presubmit successful).'],), ''),
1036 ]
1037 git_cl.main(['land'])
1038
1039 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001040 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001041 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001042 ((['git', 'config', 'remote.origin.url'],),
1043 'https://chromium.googlesource.com/v8/v8'),
1044 ((['_GitNumbererState',
1045 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'],),
1046 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001047
1048 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1049 'This is parent commit with no footer.'),
1050
1051 ((['git', 'checkout', '-q', 'feature'],), ''),
1052 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1053 ]
1054 with self.assertRaises(ValueError) as cm:
1055 git_cl.main(['land'])
1056 self.assertEqual(cm.exception.message,
1057 'Unable to infer commit position from footers')
1058
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001059 def test_GitNumbererState_not_whitelisted_repo(self):
1060 self.calls = [
1061 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1062 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1063 ]
1064 res = git_cl._GitNumbererState.load(
1065 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1066 remote_ref='refs/whatever')
1067 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001068 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001069
1070 def test_GitNumbererState_fail_fetch(self):
1071 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1072 self.calls = [
1073 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1074 '+refs/meta/config:refs/git_cl/meta/config',
1075 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), CERR1),
1076 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1077 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
1078 'refs/pending-prefix'),
1079 ]
1080 res = git_cl._GitNumbererState.load(
1081 remote_url='https://chromium.googlesource.com/chromium/src',
1082 remote_ref='refs/whatever')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001083 self.assertEqual(res.pending_prefix, 'refs/pending-prefix/')
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001084 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001085
1086 def test_GitNumbererState_fail_gnumbd_and_validator(self):
1087 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1088 self.calls = [
1089 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1090 '+refs/meta/config:refs/git_cl/meta/config',
1091 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1092 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1093 'ba d conig'),
1094 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1095 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1096 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],), CERR1),
1097 ]
1098 res = git_cl._GitNumbererState.load(
1099 remote_url='https://chromium.googlesource.com/chromium/src',
1100 remote_ref='refs/whatever')
1101 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001102 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001103
1104 def test_GitNumbererState_valid_configs(self):
1105 class NamedTempFileStab(StringIO.StringIO):
1106 @classmethod
1107 @contextlib.contextmanager
1108 def create(cls, *_, **__):
1109 yield cls()
1110 name = 'tempfile'
1111 self.mock(git_cl.tempfile, 'NamedTemporaryFile', NamedTempFileStab.create)
1112 self.calls = [
1113 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1114 '+refs/meta/config:refs/git_cl/meta/config',
1115 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1116 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1117 '''{
1118 "pending_tag_prefix": "refs/pending-tags",
1119 "pending_ref_prefix": "refs/pending",
1120 "enabled_refglobs": [
1121 "refs/heads/m*"
1122 ]
1123 }
1124 '''),
1125 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1126 '''
1127 [plugin "git-numberer"]
1128 validate-enabled-refglob = refs/else/*
1129 validate-enabled-refglob = refs/heads/*
1130 validate-disabled-refglob = refs/heads/disabled
1131 validate-disabled-refglob = refs/branch-heads/*
1132 '''),
1133 ((['git', 'config', '-f', 'tempfile', '--get-all',
1134 'plugin.git-numberer.validate-enabled-refglob'],),
1135 'refs/else/*\n'
1136 'refs/heads/*\n'),
1137 ((['git', 'config', '-f', 'tempfile', '--get-all',
1138 'plugin.git-numberer.validate-disabled-refglob'],),
1139 'refs/heads/disabled\n'
1140 'refs/branch-heads/*\n'),
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001141 ] * 4 # 4 tests below have exactly same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001142
1143 res = git_cl._GitNumbererState.load(
1144 remote_url='https://chromium.googlesource.com/chromium/src',
1145 remote_ref='refs/heads/master')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001146 self.assertEqual(res.pending_prefix, 'refs/pending/')
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001147 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001148
1149 res = git_cl._GitNumbererState.load(
1150 remote_url='https://chromium.googlesource.com/chromium/src',
1151 remote_ref='refs/heads/test')
1152 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001153 self.assertEqual(res.should_add_git_number, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001154
1155 res = git_cl._GitNumbererState.load(
1156 remote_url='https://chromium.googlesource.com/chromium/src',
1157 remote_ref='refs/heads/disabled')
1158 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001159 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001160
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001161 # Validator is disabled by default, even if it's not explicitely in disabled
1162 # refglobs.
1163 res = git_cl._GitNumbererState.load(
1164 remote_url='https://chromium.googlesource.com/chromium/src',
1165 remote_ref='refs/arbitrary/ref')
1166 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001167 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001168
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001170 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001171 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001172 if skip_auth_check:
1173 return [((cmd, ), 'true')]
1174
tandrii5d48c322016-08-18 16:19:37 -07001175 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001176 if issue:
1177 calls.extend([
1178 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1179 ])
1180 calls.extend([
1181 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1182 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1183 ((['git', 'config', 'remote.origin.url'],),
1184 'https://chromium.googlesource.com/my/repo'),
1185 ((['git', 'config', 'remote.origin.url'],),
1186 'https://chromium.googlesource.com/my/repo'),
1187 ])
1188 return calls
1189
1190 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001191 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001192 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001193 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001194 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001195 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001196 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001197 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1198 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001199 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001200 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001201 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1202 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001203 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001204 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001205 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001206 ((['get_or_create_merge_base', 'master',
1207 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001208 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001209 # Calls to verify branch point is ancestor
1210 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1211 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1212 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001213 ((['git', 'rev-parse', '--show-cdup'],), ''),
1214 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001215
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001216 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001217 'diff', '--name-status', '--no-renames', '-r',
1218 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001219 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001220 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001221 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001222 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001223 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001224 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001225 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001226 ((['git', 'config', 'user.email'],), 'me@example.com'),
1227 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001228 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1229 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001230 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001231 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001232
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001233 @classmethod
1234 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001235 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001236 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001237 ref_suffix='', title=None, notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001238 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001239 if post_amend_description is None:
1240 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001241 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001242 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001243
tandriia60502f2016-06-20 02:01:53 -07001244 if squash_mode == 'default':
1245 calls.extend([
1246 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1247 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1248 ])
1249 elif squash_mode in ('override_squash', 'override_nosquash'):
1250 calls.extend([
1251 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1252 'true' if squash_mode == 'override_squash' else 'false'),
1253 ])
1254 else:
1255 assert squash_mode in ('squash', 'nosquash')
1256
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001257 # If issue is given, then description is fetched from Gerrit instead.
1258 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001259 calls += [
1260 ((['git', 'log', '--pretty=format:%s\n\n%b',
1261 'fake_ancestor_sha..HEAD'],),
1262 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001263 if squash:
1264 title = 'Initial_upload'
1265 else:
1266 if not title:
1267 calls += [
1268 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1269 (('Title for patchset []: ',), 'User input'),
1270 ]
1271 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001272 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001273 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001274 # DownloadGerritHook(False)
1275 ((False, ),
1276 ''),
1277 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001278 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001279 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001280 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001281 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001282 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001283 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001284 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001285 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001286 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001287 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001288 if not issue:
1289 # Prompting to edit description on first upload.
1290 calls += [
1291 ((['git', 'config', 'core.editor'],), ''),
1292 ((['RunEditor'],), description),
1293 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001294 ref_to_push = 'abcdef0123456789'
1295 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001296 ((['git', 'config', 'branch.master.merge'],),
1297 'refs/heads/master'),
1298 ((['git', 'config', 'branch.master.remote'],),
1299 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001300 ((['get_or_create_merge_base', 'master',
1301 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001302 'origin/master'),
1303 ((['git', 'rev-parse', 'HEAD:'],),
1304 '0123456789abcdef'),
1305 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001306 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001307 ref_to_push),
1308 ]
1309 else:
1310 ref_to_push = 'HEAD'
1311
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001312 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001313 ((['git', 'rev-list',
1314 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001315 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001316
Aaron Gable9b713dd2016-12-14 16:04:21 -08001317 if title:
1318 if ref_suffix:
1319 ref_suffix += ',m=' + title
1320 else:
1321 ref_suffix = '%m=' + title
1322
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001323 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1324 if ref_suffix:
1325 ref_suffix += ',' + notify_suffix
1326 else:
1327 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001328
ukai@chromium.orge8077812012-02-03 03:41:46 +00001329 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001330 ref_suffix += ',' + ','.join('r=%s' % email
1331 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001332 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001333 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001334 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001335 ('remote:\n'
1336 'remote: Processing changes: (\)\n'
1337 'remote: Processing changes: (|)\n'
1338 'remote: Processing changes: (/)\n'
1339 'remote: Processing changes: (-)\n'
1340 'remote: Processing changes: new: 1 (/)\n'
1341 'remote: Processing changes: new: 1, done\n'
1342 'remote:\n'
1343 'remote: New Changes:\n'
1344 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1345 'remote:\n'
1346 'To https://chromium.googlesource.com/yyy/zzz\n'
1347 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001348 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001349 if squash:
1350 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001351 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001352 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001353 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001354 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001355 ((['git', 'config', 'branch.master.gerritsquashhash',
1356 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001357 ]
tandrii88189772016-09-29 04:29:57 -07001358 calls += [
1359 ((['git', 'config', 'rietveld.cc'],), ''),
1360 ((['AddReviewers', 'chromium-review.googlesource.com',
1361 123456 if squash else None,
Aaron Gable59f48512017-01-12 10:54:46 -08001362 ['joe@example.com'] + cc, False, notify],), ''),
tandrii88189772016-09-29 04:29:57 -07001363 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001364 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001365 return calls
1366
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001367 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001368 self,
1369 upload_args,
1370 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001371 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001372 squash=True,
1373 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001374 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001375 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001376 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001377 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001378 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001379 issue=None,
1380 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001381 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001382 if squash_mode is None:
1383 if '--no-squash' in upload_args:
1384 squash_mode = 'nosquash'
1385 elif '--squash' in upload_args:
1386 squash_mode = 'squash'
1387 else:
1388 squash_mode = 'default'
1389
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001390 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001391 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001392 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001393 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001394 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001395 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1396 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001397 self.mock(git_cl.gclient_utils, 'RunEditor',
1398 lambda *_, **__: self._mocked_call(['RunEditor']))
1399 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001400 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable59f48512017-01-12 10:54:46 -08001401 lambda h, i, add, is_reviewer, notify: self._mocked_call(
1402 ['AddReviewers', h, i, add, is_reviewer, notify]))
tandriia60502f2016-06-20 02:01:53 -07001403
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001404 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001405 self.calls += self._gerrit_upload_calls(
1406 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001407 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001408 expected_upstream_ref=expected_upstream_ref,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001409 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001410 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001411 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001412 # Uncomment when debugging.
1413 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001414 git_cl.main(['upload'] + upload_args)
1415
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001416 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001417 self._run_gerrit_upload_test(
1418 ['--no-squash'],
1419 'desc\n\nBUG=\n',
1420 [],
1421 squash=False,
1422 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1423
1424 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001425 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001426 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001427 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001428 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001429 [],
tandriia60502f2016-06-20 02:01:53 -07001430 squash=False,
1431 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001432 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001433
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001434 def test_gerrit_no_reviewer(self):
1435 self._run_gerrit_upload_test(
1436 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001437 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001438 [],
1439 squash=False,
1440 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001441
tandriieefe8322016-08-17 10:12:24 -07001442 def test_gerrit_patch_bad_chars(self):
1443 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001444 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001445 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001446 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001447 squash=False,
1448 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001449 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001450 self.assertIn(
1451 'WARNING: Patchset title may only contain alphanumeric chars '
1452 'and spaces. Cleaned up title:\nDont put bad chars\n',
1453 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001454
ukai@chromium.orge8077812012-02-03 03:41:46 +00001455 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001456 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001457 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001458 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001459 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001460 squash=False,
1461 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001462 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001463
1464 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001465 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001466 [],
bradnelsond975b302016-10-23 12:20:23 -07001467 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1468 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001469 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001470 ['reviewer@example.com', 'another@example.com'],
1471 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001472 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001473 ref_suffix='%l=Code-Review+1',
1474 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001475
1476 def test_gerrit_upload_squash_first_is_default(self):
1477 # Mock Gerrit CL description to indicate the first upload.
1478 self.mock(git_cl.Changelist, 'GetDescription',
1479 lambda *_: None)
1480 self._run_gerrit_upload_test(
1481 [],
1482 'desc\nBUG=\n\nChange-Id: 123456789',
1483 [],
1484 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001485
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001486 def test_gerrit_upload_squash_first(self):
1487 # Mock Gerrit CL description to indicate the first upload.
1488 self.mock(git_cl.Changelist, 'GetDescription',
1489 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001490 self._run_gerrit_upload_test(
1491 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001492 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001493 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001494 squash=True,
1495 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001496
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001497 def test_gerrit_upload_squash_reupload(self):
1498 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1499 # Mock Gerrit CL description to indicate re-upload.
1500 self.mock(git_cl.Changelist, 'GetDescription',
1501 lambda *args: description)
1502 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1503 lambda *args: 1)
1504 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1505 lambda *args: {'change_id': '123456789'})
1506 self._run_gerrit_upload_test(
1507 ['--squash'],
1508 description,
1509 [],
1510 squash=True,
1511 expected_upstream_ref='origin/master',
1512 issue=123456)
1513
rmistry@google.com2dd99862015-06-22 12:22:18 +00001514 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001515 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001516 def mock_run_git(*args, **_kwargs):
1517 if args[0] == ['for-each-ref',
1518 '--format=%(refname:short) %(upstream:short)',
1519 'refs/heads']:
1520 # Create a local branch dependency tree that looks like this:
1521 # test1 -> test2 -> test3 -> test4 -> test5
1522 # -> test3.1
1523 # test6 -> test0
1524 branch_deps = [
1525 'test2 test1', # test1 -> test2
1526 'test3 test2', # test2 -> test3
1527 'test3.1 test2', # test2 -> test3.1
1528 'test4 test3', # test3 -> test4
1529 'test5 test4', # test4 -> test5
1530 'test6 test0', # test0 -> test6
1531 'test7', # test7
1532 ]
1533 return '\n'.join(branch_deps)
1534 self.mock(git_cl, 'RunGit', mock_run_git)
1535
1536 class RecordCalls:
1537 times_called = 0
1538 record_calls = RecordCalls()
1539 def mock_CMDupload(*args, **_kwargs):
1540 record_calls.times_called += 1
1541 return 0
1542 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1543
1544 self.calls = [
1545 (('[Press enter to continue or ctrl-C to quit]',), ''),
1546 ]
1547
1548 class MockChangelist():
1549 def __init__(self):
1550 pass
1551 def GetBranch(self):
1552 return 'test1'
1553 def GetIssue(self):
1554 return '123'
1555 def GetPatchset(self):
1556 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001557 def IsGerrit(self):
1558 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001559
1560 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1561 # CMDupload should have been called 5 times because of 5 dependent branches.
1562 self.assertEquals(5, record_calls.times_called)
1563 self.assertEquals(0, ret)
1564
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001565 def test_gerrit_change_id(self):
1566 self.calls = [
1567 ((['git', 'write-tree'], ),
1568 'hashtree'),
1569 ((['git', 'rev-parse', 'HEAD~0'], ),
1570 'branch-parent'),
1571 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1572 'A B <a@b.org> 1456848326 +0100'),
1573 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1574 'C D <c@d.org> 1456858326 +0100'),
1575 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1576 'hashchange'),
1577 ]
1578 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1579 self.assertEqual(change_id, 'Ihashchange')
1580
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001581 def test_desecription_append_footer(self):
1582 for init_desc, footer_line, expected_desc in [
1583 # Use unique desc first lines for easy test failure identification.
1584 ('foo', 'R=one', 'foo\n\nR=one'),
1585 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1586 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1587 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1588 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1589 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1590 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1591 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1592 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1593 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1594 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1595 ]:
1596 desc = git_cl.ChangeDescription(init_desc)
1597 desc.append_footer(footer_line)
1598 self.assertEqual(desc.description, expected_desc)
1599
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001600 def test_update_reviewers(self):
1601 data = [
1602 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001603 ('foo\nR=xx', [], 'foo\nR=xx'),
1604 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001605 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001606 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1607 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1608 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001609 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001610 ('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 +00001611 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001612 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1613 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1614 # Same as the line before, but full of whitespaces.
1615 (
1616 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1617 'foo\nBar\n\nR=c@c\n BUG =',
1618 ),
1619 # Whitespaces aren't interpreted as new lines.
1620 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001621 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001622 expected = [i[2] for i in data]
1623 actual = []
1624 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001625 obj = git_cl.ChangeDescription(orig)
1626 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001627 actual.append(obj.description)
1628 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001629
wittman@chromium.org455dc922015-01-26 20:15:50 +00001630 def test_get_target_ref(self):
1631 # Check remote or remote branch not present.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001632 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001633 self.assertEqual(None, git_cl.GetTargetRef(None,
1634 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001635 'master', False))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001636
wittman@chromium.org455dc922015-01-26 20:15:50 +00001637 # Check default target refs for branches.
1638 self.assertEqual('refs/heads/master',
1639 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001640 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001641 self.assertEqual('refs/heads/master',
1642 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001643 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001644 self.assertEqual('refs/heads/master',
1645 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001646 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001647 self.assertEqual('refs/branch-heads/123',
1648 git_cl.GetTargetRef('origin',
1649 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001650 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001651 self.assertEqual('refs/diff/test',
1652 git_cl.GetTargetRef('origin',
1653 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001654 None, False))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001655 self.assertEqual('refs/heads/chrome/m42',
1656 git_cl.GetTargetRef('origin',
1657 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001658 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001659
1660 # Check target refs for user-specified target branch.
1661 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1662 'refs/remotes/branch-heads/123'):
1663 self.assertEqual('refs/branch-heads/123',
1664 git_cl.GetTargetRef('origin',
1665 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001666 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001667 for branch in ('origin/master', 'remotes/origin/master',
1668 'refs/remotes/origin/master'):
1669 self.assertEqual('refs/heads/master',
1670 git_cl.GetTargetRef('origin',
1671 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001672 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001673 for branch in ('master', 'heads/master', 'refs/heads/master'):
1674 self.assertEqual('refs/heads/master',
1675 git_cl.GetTargetRef('origin',
1676 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001677 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001678
1679 # Check target refs for pending prefix.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001680 self.mock(git_cl._GitNumbererState, 'load',
1681 classmethod(lambda *_: git_cl._GitNumbererState('prefix', False)))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001682 self.assertEqual('prefix/heads/master',
1683 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001684 None, True,
1685 'https://remote.url/some.git'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001686
wychen@chromium.orga872e752015-04-28 23:42:18 +00001687 def test_patch_when_dirty(self):
1688 # Patch when local tree is dirty
1689 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1690 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1691
1692 def test_diff_when_dirty(self):
1693 # Do 'git cl diff' when local tree is dirty
1694 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1695 self.assertNotEqual(git_cl.main(['diff']), 0)
1696
tandriidf09a462016-08-18 16:23:55 -07001697 def _patch_common(self, is_gerrit=False, force_codereview=False,
1698 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001699 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001700 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1701 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001702 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1703 lambda *args: {
1704 'current_revision': '7777777777',
1705 'revisions': {
1706 '1111111111': {
1707 '_number': 1,
1708 'fetch': {'http': {
1709 'url': 'https://chromium.googlesource.com/my/repo',
1710 'ref': 'refs/changes/56/123456/1',
1711 }},
1712 },
1713 '7777777777': {
1714 '_number': 7,
1715 'fetch': {'http': {
1716 'url': 'https://chromium.googlesource.com/my/repo',
1717 'ref': 'refs/changes/56/123456/7',
1718 }},
1719 },
1720 },
1721 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001722 self.mock(git_cl.Changelist, 'GetDescription',
1723 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001724 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1725
tandriidf09a462016-08-18 16:23:55 -07001726 if new_branch:
1727 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1728 else:
1729 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001730 if not force_codereview:
1731 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001732 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001733 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001734 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1735 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001736 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001737 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001738
1739 if is_gerrit:
1740 if not force_codereview:
1741 self.calls += [
1742 ((['git', 'config', 'gerrit.host'],), 'true'),
1743 ]
1744 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001745 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001746 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001747 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001748 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001749 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001750 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001751
tandriidf09a462016-08-18 16:23:55 -07001752 def _common_patch_successful(self, new_branch=False):
1753 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001754 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001755 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001756 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001757 'patch from issue 123456 at patchset 60001 ' +
1758 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001759 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001760 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001761 ((['git', 'config', 'branch.master.rietveldserver',
1762 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001763 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001764 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001765 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001766
1767 def test_patch_successful(self):
1768 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001769 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1770
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001771 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001772 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001773 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1774
wychen@chromium.orga872e752015-04-28 23:42:18 +00001775 def test_patch_conflict(self):
1776 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001777 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001778 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001779
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001780 def test_gerrit_patch_successful(self):
1781 self._patch_common(is_gerrit=True)
1782 self.calls += [
1783 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1784 'refs/changes/56/123456/7'],), ''),
1785 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001786 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001787 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +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.orgf86c7d32016-04-01 19:27:30 +00001796 ]
1797 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1798
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001799 def test_patch_force_codereview(self):
1800 self._patch_common(is_gerrit=True, force_codereview=True)
1801 self.calls += [
1802 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1803 'refs/changes/56/123456/7'],), ''),
1804 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1805 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001806 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001807 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001808 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1809 ((['git', 'config', 'branch.master.merge'],), 'master'),
1810 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1811 ((['git', 'config', 'remote.origin.url'],),
1812 'https://chromium.googlesource.com/my/repo'),
1813 ((['git', 'config', 'branch.master.gerritserver',
1814 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001815 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001816 ]
1817 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1818
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001819 def test_gerrit_patch_url_successful(self):
1820 self._patch_common(is_gerrit=True)
1821 self.calls += [
1822 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1823 'refs/changes/56/123456/1'],), ''),
1824 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001825 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001826 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001827 ((['git', 'config', 'branch.master.gerritserver',
1828 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001829 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001830 ]
1831 self.assertEqual(git_cl.main(
1832 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1833
1834 def test_gerrit_patch_conflict(self):
1835 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001836 self.calls += [
1837 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1838 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001839 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1840 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1841 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001842 ]
1843 with self.assertRaises(SystemExitMock):
1844 git_cl.main(['patch',
1845 'https://chromium-review.googlesource.com/#/c/123456/1'])
1846
tandriic2405f52016-10-10 08:13:15 -07001847 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001848 def notExists(_issue, *_, **kwargs):
1849 self.assertFalse(kwargs['ignore_404'])
1850 raise git_cl.gerrit_util.GerritError(404, '')
1851 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1852
tandriic2405f52016-10-10 08:13:15 -07001853 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001854 self.calls = [
1855 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1856 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1857 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1858 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1859 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1860 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001861 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001862 'or you have no access to it'],), SystemExitMock()),
1863 ]
1864 with self.assertRaises(SystemExitMock):
1865 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1866
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001867 def _checkout_calls(self):
1868 return [
1869 ((['git', 'config', '--local', '--get-regexp',
1870 'branch\\..*\\.rietveldissue'], ),
1871 ('branch.retrying.rietveldissue 1111111111\n'
1872 'branch.some-fix.rietveldissue 2222222222\n')),
1873 ((['git', 'config', '--local', '--get-regexp',
1874 'branch\\..*\\.gerritissue'], ),
1875 ('branch.ger-branch.gerritissue 123456\n'
1876 'branch.gbranch654.gerritissue 654321\n')),
1877 ]
1878
1879 def test_checkout_gerrit(self):
1880 """Tests git cl checkout <issue>."""
1881 self.calls = self._checkout_calls()
1882 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1883 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1884
1885 def test_checkout_rietveld(self):
1886 """Tests git cl checkout <issue>."""
1887 self.calls = self._checkout_calls()
1888 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1889 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1890
1891 def test_checkout_not_found(self):
1892 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001893 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001894 self.calls = self._checkout_calls()
1895 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1896
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001897 def test_checkout_no_branch_issues(self):
1898 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001899 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001900 self.calls = [
1901 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001902 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001903 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001904 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001905 ]
1906 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1907
tandrii@chromium.org28253532016-04-14 13:46:56 +00001908 def _test_gerrit_ensure_authenticated_common(self, auth,
1909 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001910 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1911 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1912 self.mock(git_cl, 'DieWithError',
1913 lambda msg: self._mocked_call(['DieWithError', msg]))
1914 self.mock(git_cl, 'ask_for_data',
1915 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001916 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001917 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001918 cl.branch = 'master'
1919 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001920 cl.lookedup_issue = True
1921 return cl
1922
1923 def test_gerrit_ensure_authenticated_missing(self):
1924 cl = self._test_gerrit_ensure_authenticated_common(auth={
1925 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1926 })
1927 self.calls.append(
1928 ((['DieWithError',
1929 'Credentials for the following hosts are required:\n'
1930 ' chromium-review.googlesource.com\n'
1931 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1932 'You can (re)generate your credentails by visiting '
1933 'https://chromium-review.googlesource.com/new-password'],), ''),)
1934 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1935
1936 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001937 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001938 cl = self._test_gerrit_ensure_authenticated_common(auth={
1939 'chromium.googlesource.com': 'one',
1940 'chromium-review.googlesource.com': 'other',
1941 })
1942 self.calls.append(
1943 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001944 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001945 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1946
1947 def test_gerrit_ensure_authenticated_ok(self):
1948 cl = self._test_gerrit_ensure_authenticated_common(auth={
1949 'chromium.googlesource.com': 'same',
1950 'chromium-review.googlesource.com': 'same',
1951 })
1952 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1953
tandrii@chromium.org28253532016-04-14 13:46:56 +00001954 def test_gerrit_ensure_authenticated_skipped(self):
1955 cl = self._test_gerrit_ensure_authenticated_common(
1956 auth={}, skip_auth_check=True)
1957 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1958
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001959 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001960 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1961 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001962 self.calls = [
1963 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001964 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001965 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1966 ((['git', 'config', 'rietveld.server'],), ''),
1967 ((['git', 'config', 'rietveld.server'],), ''),
1968 ((['git', 'config', 'branch.feature.rietveldserver'],),
1969 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001970 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001971 ]
1972 self.assertEqual(0, git_cl.main(['set-commit']))
1973
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001974 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001975 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001976 lambda h, i, labels, notify=None:
1977 self._mocked_call(['SetReview', h, i, labels, notify]))
1978
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001979 self.calls = [
1980 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001981 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1982 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001983 ((['git', 'config', 'branch.feature.gerritserver'],),
1984 'https://chromium-review.googlesource.com'),
1985 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001986 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001987 ]
tandriid9e5ce52016-07-13 02:32:59 -07001988
1989 def test_cmd_set_commit_gerrit_clear(self):
1990 self._cmd_set_commit_gerrit_common(0)
1991 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1992
1993 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001994 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001995 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1996
tandriid9e5ce52016-07-13 02:32:59 -07001997 def test_cmd_set_commit_gerrit(self):
1998 self._cmd_set_commit_gerrit_common(2)
1999 self.assertEqual(0, git_cl.main(['set-commit']))
2000
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002001 def test_description_display(self):
2002 out = StringIO.StringIO()
2003 self.mock(git_cl.sys, 'stdout', out)
2004
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002005 self.mock(git_cl, 'Changelist', ChangelistMock)
2006 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002007
2008 self.assertEqual(0, git_cl.main(['description', '-d']))
2009 self.assertEqual('foo\n', out.getvalue())
2010
2011 def test_description_rietveld(self):
2012 out = StringIO.StringIO()
2013 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002014 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002015
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002016 self.assertEqual(0, git_cl.main([
2017 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2018 self.assertEqual('foobar\n', out.getvalue())
2019
iannucci3c972b92016-08-17 13:24:10 -07002020 def test_StatusFieldOverrideIssueMissingArgs(self):
2021 out = StringIO.StringIO()
2022 self.mock(git_cl.sys, 'stderr', out)
2023
2024 try:
2025 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2026 except SystemExit as ex:
2027 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002028 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002029
2030 out = StringIO.StringIO()
2031 self.mock(git_cl.sys, 'stderr', out)
2032
2033 try:
2034 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2035 except SystemExit as ex:
2036 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002037 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002038
2039 def test_StatusFieldOverrideIssue(self):
2040 out = StringIO.StringIO()
2041 self.mock(git_cl.sys, 'stdout', out)
2042
2043 def assertIssue(cl_self, *_args):
2044 self.assertEquals(cl_self.issue, 1)
2045 return 'foobar'
2046
2047 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2048 self.calls = [
2049 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2050 ((['git', 'config', 'rietveld.server'],), ''),
2051 ((['git', 'config', 'rietveld.server'],), ''),
2052 ]
iannuccie53c9352016-08-17 14:40:40 -07002053 self.assertEqual(
2054 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2055 0)
iannucci3c972b92016-08-17 13:24:10 -07002056 self.assertEqual(out.getvalue(), 'foobar\n')
2057
iannuccie53c9352016-08-17 14:40:40 -07002058 def test_SetCloseOverrideIssue(self):
2059 def assertIssue(cl_self, *_args):
2060 self.assertEquals(cl_self.issue, 1)
2061 return 'foobar'
2062
2063 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2064 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2065 self.calls = [
2066 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2067 ((['git', 'config', 'rietveld.server'],), ''),
2068 ((['git', 'config', 'rietveld.server'],), ''),
2069 ]
2070 self.assertEqual(
2071 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2072
2073 def test_SetCommitOverrideIssue(self):
2074 def assertIssue(cl_self, *_args):
2075 self.assertEquals(cl_self.issue, 1)
2076 return 'foobar'
2077
2078 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2079 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2080 self.calls = [
2081 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2082 ((['git', 'config', 'rietveld.server'],), ''),
2083 ((['git', 'config', 'rietveld.server'],), ''),
2084 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2085 ((['git', 'config', 'rietveld.server'],), ''),
2086 ((['git', 'config', 'rietveld.server'],), ''),
2087 ]
2088 self.assertEqual(
2089 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2090
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002091 def test_description_gerrit(self):
2092 out = StringIO.StringIO()
2093 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002094 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002095
2096 self.assertEqual(0, git_cl.main([
2097 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2098 self.assertEqual('foobar\n', out.getvalue())
2099
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002100 def test_description_set_raw(self):
2101 out = StringIO.StringIO()
2102 self.mock(git_cl.sys, 'stdout', out)
2103
2104 self.mock(git_cl, 'Changelist', ChangelistMock)
2105 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2106
2107 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2108 self.assertEqual('hihi', ChangelistMock.desc)
2109
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002110 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002111 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002112
2113 def RunEditor(desc, _, **kwargs):
2114 self.assertEquals(
2115 '# Enter a description of the change.\n'
2116 '# This will be displayed on the codereview site.\n'
2117 '# The first line will also be used as the subject of the review.\n'
2118 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002119 '--------------------\n'
2120 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002121 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002122 # Simulate user changing something.
2123 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002124
dsansomee2d6fd92016-09-08 00:10:47 -07002125 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002126 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002127
2128 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2129 self.mock(git_cl.Changelist, 'GetDescription',
2130 lambda *args: current_desc)
2131 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2132 UpdateDescriptionRemote)
2133 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2134
2135 self.calls = [
2136 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002137 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002138 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2139 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002140 ((['git', 'config', 'core.editor'],), 'vi'),
2141 ]
2142 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2143
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002144 def test_description_set_stdin(self):
2145 out = StringIO.StringIO()
2146 self.mock(git_cl.sys, 'stdout', out)
2147
2148 self.mock(git_cl, 'Changelist', ChangelistMock)
2149 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2150
2151 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2152 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2153
kmarshall3bff56b2016-06-06 18:31:47 -07002154 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002155 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2156
kmarshall3bff56b2016-06-06 18:31:47 -07002157 self.calls = \
2158 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2159 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002160 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002161 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2162 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002163 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2164 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2165 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002166 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2167 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2168 ((['git', 'branch', '-D', 'foo'],), '')]
2169
kmarshall3bff56b2016-06-06 18:31:47 -07002170 self.mock(git_cl, 'get_cl_statuses',
2171 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002172 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2173 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2174 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002175
2176 self.assertEqual(0, git_cl.main(['archive', '-f']))
2177
2178 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002179 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002180 self.calls = \
2181 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2182 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002183 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002184 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2185 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002186 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2187
kmarshall9249e012016-08-23 12:02:16 -07002188 self.mock(git_cl, 'get_cl_statuses',
2189 lambda branches, fine_grained, max_processes:
2190 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2191
2192 self.assertEqual(1, git_cl.main(['archive', '-f']))
2193
2194 def test_archive_dry_run(self):
2195 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2196
2197 self.calls = \
2198 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2199 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2200 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2201 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2202 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2203 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2204 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2205 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2206 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002207
2208 self.mock(git_cl, 'get_cl_statuses',
2209 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002210 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2211 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2212 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002213
kmarshall9249e012016-08-23 12:02:16 -07002214 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2215
2216 def test_archive_no_tags(self):
2217 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2218
2219 self.calls = \
2220 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2221 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2222 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2223 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2224 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2225 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2226 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2227 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2228 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2229 ((['git', 'branch', '-D', 'foo'],), '')]
2230
2231 self.mock(git_cl, 'get_cl_statuses',
2232 lambda branches, fine_grained, max_processes:
2233 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2234 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2235 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2236
2237 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002238
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002239 def test_cmd_issue_erase_existing(self):
2240 out = StringIO.StringIO()
2241 self.mock(git_cl.sys, 'stdout', out)
2242 self.calls = [
2243 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002244 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2245 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002246 # Let this command raise exception (retcode=1) - it should be ignored.
2247 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002248 CERR1),
2249 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2250 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002251 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2252 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2253 ''),
2254 ]
2255 self.assertEqual(0, git_cl.main(['issue', '0']))
2256
phajdan.jre328cf92016-08-22 04:12:17 -07002257 def test_cmd_issue_json(self):
2258 out = StringIO.StringIO()
2259 self.mock(git_cl.sys, 'stdout', out)
2260 self.calls = [
2261 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002262 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002263 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2264 ((['git', 'config', 'rietveld.server'],),
2265 'https://codereview.chromium.org'),
2266 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2267 (('write_json', 'output.json',
2268 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2269 ''),
2270 ]
2271 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2272
tandriide281ae2016-10-12 06:02:30 -07002273 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002274 self.mock(git_cl.Changelist, 'GetChange',
2275 lambda _, *a: (
2276 self._mocked_call(['GetChange']+list(a))))
2277 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2278 lambda *_, **__: (
2279 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002280 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2281 lambda _, s: self._mocked_call(['SetCQState', s]))
2282 self.calls = [
2283 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002284 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002285 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2286 ((['git', 'config', 'rietveld.server'],),
2287 'https://codereview.chromium.org'),
2288 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2289 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2290 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2291 ((['get_or_create_merge_base', 'feature', 'feature'],),
2292 'fake_ancestor_sha'),
2293 ((['GetChange', 'fake_ancestor_sha', None], ),
2294 git_cl.presubmit_support.GitChange(
2295 '', '', '', '', '', '', '', '')),
2296 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2297 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002298 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2299 ]
2300 out = StringIO.StringIO()
2301 self.mock(git_cl.sys, 'stdout', out)
2302 self.assertEqual(0, git_cl.main(['try']))
2303 self.assertEqual(
2304 out.getvalue(),
2305 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2306
tandrii8c5a3532016-11-04 07:52:02 -07002307 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2308 self.mock(git_cl.Changelist, 'GetChange',
2309 lambda _, *a: (
2310 self._mocked_call(['GetChange']+list(a))))
2311 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2312 lambda *_, **__: (
2313 self._mocked_call(['DoGetTryMasters'])))
2314 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2315 lambda _, s: self._mocked_call(['SetCQState', s]))
2316
2317 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2318 # Get realistic expectations.
2319 gerrit_change_list_impl._GetGerritHost()
2320 return self._mocked_call(['_GetChangeDetail', opts or []])
2321 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2322 _GetChangeDetail)
2323
2324 self.calls = [
2325 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2326 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2327 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2328 ((['git', 'config', 'branch.feature.gerritserver'],),
2329 'https://chromium-review.googlesource.com'),
2330 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2331 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2332 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2333 ((['get_or_create_merge_base', 'feature', 'feature'],),
2334 'fake_ancestor_sha'),
2335 ((['GetChange', 'fake_ancestor_sha', None], ),
2336 git_cl.presubmit_support.GitChange(
2337 '', '', '', '', '', '', '', '')),
2338 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2339 ((['DoGetTryMasters'], ), None),
2340 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2341 ]
2342 out = StringIO.StringIO()
2343 self.mock(git_cl.sys, 'stdout', out)
2344 self.assertEqual(0, git_cl.main(['try']))
2345 self.assertEqual(
2346 out.getvalue(),
2347 'scheduled CQ Dry Run on '
2348 'https://chromium-review.googlesource.com/123456\n')
2349
2350 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2351 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2352 lambda _: {
2353 'owner_email': 'owner@e.mail',
2354 'private': False,
2355 'closed': False,
2356 'project': 'depot_tools',
2357 'patchsets': [20001],
2358 })
tandriide281ae2016-10-12 06:02:30 -07002359 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2360 self.calls = [
2361 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2362 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2363 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2364 ((['git', 'config', 'rietveld.server'],),
2365 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002366 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002367 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002368 ]
2369
2370 def _buildbucket_retry(*_, **kw):
2371 # self.maxDiff = 10000
2372 body = json.loads(kw['body'])
2373 self.assertEqual(len(body['builds']), 1)
2374 build = body['builds'][0]
2375 params = json.loads(build.pop('parameters_json'))
2376 self.assertEqual(params, {
2377 u'builder_name': u'win',
2378 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2379 u'revision': None}],
2380 u'properties': {
2381 u'category': u'git_cl_try',
2382 u'issue': 123,
2383 u'key': u'val',
2384 u'json': [{u'a': 1}, None],
2385 u'master': u'tryserver.chromium',
2386 u'patch_project': u'depot_tools',
2387 u'patch_storage': u'rietveld',
2388 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002389 u'rietveld': u'https://codereview.chromium.org',
2390 }
2391 })
2392 self.assertEqual(build, {
2393 u'bucket': u'master.tryserver.chromium',
2394 u'client_operation_id': u'uuid4',
2395 u'tags': [u'builder:win',
2396 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002397 u'user_agent:git_cl_try',
2398 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002399 })
2400
2401 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2402
2403 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2404 self.assertEqual(0, git_cl.main([
2405 'try', '-m', 'tryserver.chromium', '-b', 'win',
2406 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2407 self.assertRegexpMatches(
2408 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002409 'Tried jobs on:\nBucket: master.tryserver.chromium')
2410
tandrii8c5a3532016-11-04 07:52:02 -07002411 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2412 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2413 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2414
2415 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2416 # Get realistic expectations.
2417 gerrit_change_list_impl._GetGerritHost()
2418 return self._mocked_call(['_GetChangeDetail', opts or []])
2419 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2420 _GetChangeDetail)
2421
2422 self.calls = [
2423 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2424 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2425 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2426 ((['git', 'config', 'branch.feature.gerritserver'],),
2427 'https://chromium-review.googlesource.com'),
2428 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002429 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2430 {'owner': {'email': 'owner@e.mail'}}),
2431 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2432 'project': 'depot_tools',
2433 'revisions': {
2434 'deadbeaf': {
2435 '_number': 6,
2436 },
2437 'beeeeeef': {
2438 '_number': 7,
2439 'fetch': {'http': {
2440 'url': 'https://chromium.googlesource.com/depot_tools',
2441 'ref': 'refs/changes/56/123456/7'
2442 }},
2443 },
2444 },
2445 }),
2446 ]
2447
2448 def _buildbucket_retry(*_, **kw):
2449 # self.maxDiff = 10000
2450 body = json.loads(kw['body'])
2451 self.assertEqual(len(body['builds']), 1)
2452 build = body['builds'][0]
2453 params = json.loads(build.pop('parameters_json'))
2454 self.assertEqual(params, {
2455 u'builder_name': u'win',
2456 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2457 u'revision': None}],
2458 u'properties': {
2459 u'category': u'git_cl_try',
2460 u'key': u'val',
2461 u'json': [{u'a': 1}, None],
2462 u'master': u'tryserver.chromium',
2463
2464 u'patch_gerrit_url':
2465 u'https://chromium-review.googlesource.com',
2466 u'patch_issue': 123456,
2467 u'patch_project': u'depot_tools',
2468 u'patch_ref': u'refs/changes/56/123456/7',
2469 u'patch_repository_url':
2470 u'https://chromium.googlesource.com/depot_tools',
2471 u'patch_set': 7,
2472 u'patch_storage': u'gerrit',
2473 }
2474 })
2475 self.assertEqual(build, {
2476 u'bucket': u'master.tryserver.chromium',
2477 u'client_operation_id': u'uuid4',
2478 u'tags': [
2479 u'builder:win',
2480 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2481 u'user_agent:git_cl_try',
2482 u'master:tryserver.chromium'],
2483 })
2484
2485 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2486
2487 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2488 self.assertEqual(0, git_cl.main([
2489 'try', '-m', 'tryserver.chromium', '-b', 'win',
2490 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2491 self.assertRegexpMatches(
2492 git_cl.sys.stdout.getvalue(),
2493 'Tried jobs on:\nBucket: master.tryserver.chromium')
2494
borenet6c0efe62016-10-19 08:13:29 -07002495 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002496 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2497 lambda _: {
2498 'owner_email': 'owner@e.mail',
2499 'private': False,
2500 'closed': False,
2501 'project': 'depot_tools',
2502 'patchsets': [20001],
2503 })
borenet6c0efe62016-10-19 08:13:29 -07002504 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2505 self.calls = [
2506 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2507 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2508 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2509 ((['git', 'config', 'rietveld.server'],),
2510 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002511 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002512 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002513 ]
2514
2515 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002516 body = json.loads(kw['body'])
2517 self.assertEqual(len(body['builds']), 1)
2518 build = body['builds'][0]
2519 params = json.loads(build.pop('parameters_json'))
2520 self.assertEqual(params, {
2521 u'builder_name': u'win',
2522 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2523 u'revision': None}],
2524 u'properties': {
2525 u'category': u'git_cl_try',
2526 u'issue': 123,
2527 u'patch_project': u'depot_tools',
2528 u'patch_storage': u'rietveld',
2529 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002530 u'rietveld': u'https://codereview.chromium.org',
2531 }
2532 })
2533 self.assertEqual(build, {
2534 u'bucket': u'test.bucket',
2535 u'client_operation_id': u'uuid4',
2536 u'tags': [u'builder:win',
2537 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2538 u'user_agent:git_cl_try'],
2539 })
2540
2541 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2542
2543 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2544 self.assertEqual(0, git_cl.main([
2545 'try', '-B', 'test.bucket', '-b', 'win']))
2546 self.assertRegexpMatches(
2547 git_cl.sys.stdout.getvalue(),
2548 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002549
qyearsley123a4682016-10-26 09:12:17 -07002550 def test_git_cl_try_bots_on_multiple_masters(self):
2551 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2552 self.calls = [
2553 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2554 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2555 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2556 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002557 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002558 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2559 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2560 ]
2561
2562 def _buildbucket_retry(*_, **kw):
2563 body = json.loads(kw['body'])
2564 self.assertEqual(len(body['builds']), 2)
2565
2566 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2567 self.assertEqual(first_build_params['builder_name'], 'builder1')
2568 self.assertEqual(first_build_params['properties']['master'], 'master1')
2569
2570 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2571 self.assertEqual(first_build_params['builder_name'], 'builder2')
2572 self.assertEqual(first_build_params['properties']['master'], 'master2')
2573
2574 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2575
2576 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2577 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2578
2579 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2580 self.assertEqual(
2581 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2582 self.assertEqual(
2583 git_cl.sys.stdout.getvalue(),
2584 'Tried jobs on:\n'
2585 'Bucket: master.master1\n'
2586 ' builder1: []\n'
2587 'Bucket: master.master2\n'
2588 ' builder2: []\n'
2589 'To see results here, run: git cl try-results\n'
2590 'To see results in browser, run: git cl web\n')
2591
tandrii16e0b4e2016-06-07 10:34:28 -07002592 def _common_GerritCommitMsgHookCheck(self):
2593 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2594 self.mock(git_cl.os.path, 'abspath',
2595 lambda path: self._mocked_call(['abspath', path]))
2596 self.mock(git_cl.os.path, 'exists',
2597 lambda path: self._mocked_call(['exists', path]))
2598 self.mock(git_cl.gclient_utils, 'FileRead',
2599 lambda path: self._mocked_call(['FileRead', path]))
2600 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2601 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2602 self.calls = [
2603 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2604 ((['abspath', '../'],), '/abs/git_repo_root'),
2605 ]
2606 return git_cl.Changelist(codereview='gerrit', issue=123)
2607
2608 def test_GerritCommitMsgHookCheck_custom_hook(self):
2609 cl = self._common_GerritCommitMsgHookCheck()
2610 self.calls += [
2611 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2612 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2613 '#!/bin/sh\necho "custom hook"')
2614 ]
2615 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2616
2617 def test_GerritCommitMsgHookCheck_not_exists(self):
2618 cl = self._common_GerritCommitMsgHookCheck()
2619 self.calls += [
2620 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2621 ]
2622 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2623
2624 def test_GerritCommitMsgHookCheck(self):
2625 cl = self._common_GerritCommitMsgHookCheck()
2626 self.calls += [
2627 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2628 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2629 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2630 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2631 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2632 ''),
2633 ]
2634 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2635
tandriic4344b52016-08-29 06:04:54 -07002636 def test_GerritCmdLand(self):
2637 self.calls += [
2638 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2639 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2640 'deadbeaf'),
2641 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2642 ((['git', 'config', 'branch.feature.gerritserver'],),
2643 'chromium-review.googlesource.com'),
2644 ]
2645 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2646 cl._codereview_impl._GetChangeDetail = lambda _: {
2647 'labels': {},
2648 'current_revision': 'deadbeaf',
2649 }
agable32978d92016-11-01 12:55:02 -07002650 cl._codereview_impl._GetChangeCommit = lambda: {
2651 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002652 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002653 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2654 }
tandriic4344b52016-08-29 06:04:54 -07002655 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002656 out = StringIO.StringIO()
2657 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002658 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002659 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002660 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002661
tandrii221ab252016-10-06 08:12:04 -07002662 BUILDBUCKET_BUILDS_MAP = {
2663 '9000': {
2664 'id': '9000',
2665 'status': 'STARTED',
2666 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2667 'result_details_json': '{"properties": {}}',
2668 'bucket': 'master.x.y',
2669 'created_by': 'user:someone@chromium.org',
2670 'created_ts': '147200002222000',
2671 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2672 },
2673 '8000': {
2674 'id': '8000',
2675 'status': 'COMPLETED',
2676 'result': 'FAILURE',
2677 'failure_reason': 'BUILD_FAILURE',
2678 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2679 'result_details_json': '{"properties": {}}',
2680 'bucket': 'master.x.y',
2681 'created_by': 'user:someone@chromium.org',
2682 'created_ts': '147200001111000',
2683 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2684 },
2685 }
2686
2687 def test_write_try_results_json(self):
2688 expected_output = [
2689 {
2690 'buildbucket_id': '8000',
2691 'bucket': 'master.x.y',
2692 'builder_name': 'my-builder',
2693 'status': 'COMPLETED',
2694 'result': 'FAILURE',
2695 'failure_reason': 'BUILD_FAILURE',
2696 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2697 },
2698 {
2699 'buildbucket_id': '9000',
2700 'bucket': 'master.x.y',
2701 'builder_name': 'my-builder',
2702 'status': 'STARTED',
2703 'result': None,
2704 'failure_reason': None,
2705 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2706 }
2707 ]
2708 self.calls = [(('write_json', 'output.json', expected_output), '')]
2709 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2710
tandrii45b2a582016-10-11 03:14:16 -07002711 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002712 out = StringIO.StringIO()
2713 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002714 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2715 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002716 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2717 self._mocked_call(['get_authenticator_for_host', host]))
2718 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2719 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002720
2721 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2722 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002723 self.calls += [
2724 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2725 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2726 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2727 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2728 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2729 ((['git', 'config', 'branch.feature.rietveldserver'],),
2730 'codereview.example.com'),
2731 ((['get_authenticator_for_host', 'codereview.example.com'],),
2732 AuthenticatorMock()),
2733 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2734
2735 def test_fetch_try_jobs_none_rietveld(self):
2736 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002737 # Simulate that user isn't logged in.
2738 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002739 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002740 self.assertRegexpMatches(sys.stdout.getvalue(),
2741 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002742 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2743
2744 def test_fetch_try_jobs_some_rietveld(self):
2745 self._setup_fetch_try_jobs_rietveld({
2746 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2747 })
2748 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002749 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2750 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2751 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2752
2753 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2754 self._setup_fetch_try_jobs(most_recent_patchset=13)
2755 self.calls += [
2756 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2757 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2758 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002759 # TODO(tandrii): Uncomment the below if we decide to support checking
2760 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002761 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002762 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002763 ((['git', 'config', 'branch.feature.gerritserver'],),
2764 'https://x-review.googlesource.com'),
2765 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2766 AuthenticatorMock()),
2767 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2768
2769 def test_fetch_try_jobs_none_gerrit(self):
2770 self._setup_fetch_try_jobs_gerrit({})
2771 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002772 # TODO(tandrii): Uncomment the below if we decide to support checking
2773 # patchsets for Gerrit.
2774 # self.assertRegexpMatches(
2775 # sys.stdout.getvalue(),
2776 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002777 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2778
2779 def test_fetch_try_jobs_some_gerrit(self):
2780 self._setup_fetch_try_jobs_gerrit({
2781 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2782 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002783 # TODO(tandrii): Uncomment the below if we decide to support checking
2784 # patchsets for Gerrit.
2785 # self.calls.remove(
2786 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002787 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2788
2789 # ... and doesn't result in warning.
2790 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2791 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002792 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2793 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2794
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002795
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002796if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002797 git_cl.logging.basicConfig(
2798 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002799 unittest.main()