blob: dd3d300263b60d70d13708cb725a4d3ed0b165fd [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
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010010import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000011import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000012import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000013import sys
14import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000015import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016
17sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
18
19from testing_support.auto_stub import TestCase
20
21import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000022import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000023import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000024import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025
tandrii5d48c322016-08-18 16:19:37 -070026def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
27 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
28
29
30CERR1 = callError(1)
31
32
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000033class ChangelistMock(object):
34 # A class variable so we can access it when we don't have access to the
35 # instance that's being set.
36 desc = ""
37 def __init__(self, **kwargs):
38 pass
39 def GetIssue(self):
40 return 1
41 def GetDescription(self):
42 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070043 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000044 ChangelistMock.desc = desc
45
tandrii5d48c322016-08-18 16:19:37 -070046
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000047class PresubmitMock(object):
48 def __init__(self, *args, **kwargs):
49 self.reviewers = []
50 @staticmethod
51 def should_continue():
52 return True
53
54
55class RietveldMock(object):
56 def __init__(self, *args, **kwargs):
57 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000058
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000059 @staticmethod
60 def get_description(issue):
61 return 'Issue: %d' % issue
62
maruel@chromium.org78936cb2013-04-11 00:17:52 +000063 @staticmethod
64 def get_issue_properties(_issue, _messages):
65 return {
66 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
67 'messages': [
68 {
69 'approval': True,
70 'sender': 'john@chromium.org',
71 },
72 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010073 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000074 }
75
iannuccie53c9352016-08-17 14:40:40 -070076 @staticmethod
77 def close_issue(_issue):
78 return 'Closed'
79
skobes6468b902016-10-24 08:45:10 -070080 @staticmethod
81 def get_patch(issue, patchset):
82 return 'patch set from issue %s patchset %s' % (issue, patchset)
83
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010084 @staticmethod
85 def update_description(_issue, _description):
86 return 'Updated'
87
88 @staticmethod
89 def add_comment(_issue, _comment):
90 return 'Commented'
91
92
93
skobes6468b902016-10-24 08:45:10 -070094
95class GitCheckoutMock(object):
96 def __init__(self, *args, **kwargs):
97 pass
98
99 @staticmethod
100 def reset():
101 GitCheckoutMock.conflict = False
102
103 def apply_patch(self, p):
104 if GitCheckoutMock.conflict:
105 raise Exception('failed')
106
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000107
108class WatchlistsMock(object):
109 def __init__(self, _):
110 pass
111 @staticmethod
112 def GetWatchersForPaths(_):
113 return ['joe@example.com']
114
115
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000116class CodereviewSettingsFileMock(object):
117 def __init__(self):
118 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800119 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000120 def read(self):
121 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000122 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000123
124
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000125class AuthenticatorMock(object):
126 def __init__(self, *_args):
127 pass
128 def has_cached_credentials(self):
129 return True
tandrii221ab252016-10-06 08:12:04 -0700130 def authorize(self, http):
131 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000132
133
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000134def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
135 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
136
137 Usage:
138 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
139 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
140
141 OR
142 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
143 CookiesAuthenticatorMockFactory(cookie='cookie'))
144 """
145 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800146 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 # Intentionally not calling super() because it reads actual cookie files.
148 pass
149 @classmethod
150 def get_gitcookies_path(cls):
151 return '~/.gitcookies'
152 @classmethod
153 def get_netrc_path(cls):
154 return '~/.netrc'
155 def get_auth_header(self, host):
156 if same_cookie:
157 return same_cookie
158 return (hosts_with_creds or {}).get(host)
159 return CookiesAuthenticatorMock
160
kmarshall9249e012016-08-23 12:02:16 -0700161class MockChangelistWithBranchAndIssue():
162 def __init__(self, branch, issue):
163 self.branch = branch
164 self.issue = issue
165 def GetBranch(self):
166 return self.branch
167 def GetIssue(self):
168 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000169
tandriic2405f52016-10-10 08:13:15 -0700170
171class SystemExitMock(Exception):
172 pass
173
174
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000175class TestGitClBasic(unittest.TestCase):
176 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
177 parsed = urlparse.urlparse(url)
178 result = func(parsed)
179 if fail:
180 self.assertIsNone(result)
181 return None
182 self.assertIsNotNone(result)
183 self.assertEqual(result.issue, issue)
184 self.assertEqual(result.patchset, patchset)
185 self.assertEqual(result.hostname, hostname)
186 return result
187
188 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700189 def test(url, issue=None, patchset=None, hostname=None, fail=None):
190 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000191 git_cl._RietveldChangelistImpl.ParseIssueURL,
192 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000193
194 test('http://codereview.chromium.org/123',
195 123, None, 'codereview.chromium.org')
196 test('https://codereview.chromium.org/123',
197 123, None, 'codereview.chromium.org')
198 test('https://codereview.chromium.org/123/',
199 123, None, 'codereview.chromium.org')
200 test('https://codereview.chromium.org/123/whatever',
201 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700202 test('https://codereview.chromium.org/123/#ps20001',
203 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000204 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700205 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000206 # This looks like bad Gerrit, but is actually valid Rietveld.
207 test('https://chrome-review.source.com/123/4/',
208 123, None, 'chrome-review.source.com')
209
210 test('https://codereview.chromium.org/deadbeaf', fail=True)
211 test('https://codereview.chromium.org/api/123', fail=True)
212 test('bad://codereview.chromium.org/123', fail=True)
213 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
214
215 def test_ParseIssueURL_gerrit(self):
216 def test(url, issue=None, patchset=None, hostname=None, fail=None):
217 self._test_ParseIssueUrl(
218 git_cl._GerritChangelistImpl.ParseIssueURL,
219 url, issue, patchset, hostname, fail)
220
221 test('http://chrome-review.source.com/c/123',
222 123, None, 'chrome-review.source.com')
223 test('https://chrome-review.source.com/c/123/',
224 123, None, 'chrome-review.source.com')
225 test('https://chrome-review.source.com/c/123/4',
226 123, 4, 'chrome-review.source.com')
227 test('https://chrome-review.source.com/#/c/123/4',
228 123, 4, 'chrome-review.source.com')
229 test('https://chrome-review.source.com/c/123/4',
230 123, 4, 'chrome-review.source.com')
231 test('https://chrome-review.source.com/123',
232 123, None, 'chrome-review.source.com')
233 test('https://chrome-review.source.com/123/4',
234 123, 4, 'chrome-review.source.com')
235
236 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
237 test('https://chrome-review.source.com/c/abc/', fail=True)
238 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
239
240 def test_ParseIssueNumberArgument(self):
241 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
242 result = git_cl.ParseIssueNumberArgument(arg)
243 self.assertIsNotNone(result)
244 if fail:
245 self.assertFalse(result.valid)
246 else:
247 self.assertEqual(result.issue, issue)
248 self.assertEqual(result.patchset, patchset)
249 self.assertEqual(result.hostname, hostname)
250
251 test('123', 123)
252 test('', fail=True)
253 test('abc', fail=True)
254 test('123/1', fail=True)
255 test('123a', fail=True)
256 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
257 # Rietveld.
258 test('https://codereview.source.com/123',
259 123, None, 'codereview.source.com')
260 test('https://codereview.source.com/www123', fail=True)
261 # Gerrrit.
262 test('https://chrome-review.source.com/c/123/4',
263 123, 4, 'chrome-review.source.com')
264 test('https://chrome-review.source.com/bad/123/4', fail=True)
265
tandriif9aefb72016-07-01 09:06:51 -0700266 def test_get_bug_line_values(self):
267 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
268 self.assertEqual(f('', ''), [])
269 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
270 self.assertEqual(f('v8', '456'), ['v8:456'])
271 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
272 # Not nice, but not worth carying.
273 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
274 ['v8:456', 'chromium:123', 'v8:123'])
275
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100276 def _test_git_number(self, parent_msg, dest_ref, child_msg,
277 parent_hash='parenthash'):
278 desc = git_cl.ChangeDescription(child_msg)
279 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
280 return desc.description
281
282 def assertEqualByLine(self, actual, expected):
283 self.assertEqual(actual.splitlines(), expected.splitlines())
284
285 def test_git_number_bad_parent(self):
286 with self.assertRaises(ValueError):
287 self._test_git_number('Parent', 'refs/heads/master', 'Child')
288
289 def test_git_number_bad_parent_footer(self):
290 with self.assertRaises(AssertionError):
291 self._test_git_number(
292 'Parent\n'
293 '\n'
294 'Cr-Commit-Position: wrong',
295 'refs/heads/master', 'Child')
296
297 def test_git_number_bad_lineage_ignored(self):
298 actual = self._test_git_number(
299 'Parent\n'
300 '\n'
301 'Cr-Commit-Position: refs/heads/master@{#1}\n'
302 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
303 'refs/heads/master', 'Child')
304 self.assertEqualByLine(
305 actual,
306 'Child\n'
307 '\n'
308 'Cr-Commit-Position: refs/heads/master@{#2}\n'
309 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
310
311 def test_git_number_same_branch(self):
312 actual = self._test_git_number(
313 'Parent\n'
314 '\n'
315 'Cr-Commit-Position: refs/heads/master@{#12}',
316 dest_ref='refs/heads/master',
317 child_msg='Child')
318 self.assertEqualByLine(
319 actual,
320 'Child\n'
321 '\n'
322 'Cr-Commit-Position: refs/heads/master@{#13}')
323
324 def test_git_number_same_branch_with_originals(self):
325 actual = self._test_git_number(
326 'Parent\n'
327 '\n'
328 'Cr-Commit-Position: refs/heads/master@{#12}',
329 dest_ref='refs/heads/master',
330 child_msg='Child\n'
331 '\n'
332 'Some users are smart and insert their own footers\n'
333 '\n'
334 'Cr-Whatever: value\n'
335 'Cr-Commit-Position: refs/copy/paste@{#22}')
336 self.assertEqualByLine(
337 actual,
338 'Child\n'
339 '\n'
340 'Some users are smart and insert their own footers\n'
341 '\n'
342 'Cr-Original-Whatever: value\n'
343 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
344 'Cr-Commit-Position: refs/heads/master@{#13}')
345
346 def test_git_number_new_branch(self):
347 actual = self._test_git_number(
348 'Parent\n'
349 '\n'
350 'Cr-Commit-Position: refs/heads/master@{#12}',
351 dest_ref='refs/heads/branch',
352 child_msg='Child')
353 self.assertEqualByLine(
354 actual,
355 'Child\n'
356 '\n'
357 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
358 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
359
360 def test_git_number_lineage(self):
361 actual = self._test_git_number(
362 'Parent\n'
363 '\n'
364 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
365 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
366 dest_ref='refs/heads/branch',
367 child_msg='Child')
368 self.assertEqualByLine(
369 actual,
370 'Child\n'
371 '\n'
372 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
373 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
374
375 def test_git_number_moooooooore_lineage(self):
376 actual = self._test_git_number(
377 'Parent\n'
378 '\n'
379 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
380 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
381 dest_ref='refs/heads/mooore',
382 child_msg='Child')
383 self.assertEqualByLine(
384 actual,
385 'Child\n'
386 '\n'
387 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
388 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
389 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
390
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100391 def test_git_number_ever_moooooooore_lineage(self):
392 self.maxDiff = 10000
393 actual = self._test_git_number(
394 'CQ commit on fresh new branch + numbering.\n'
395 '\n'
396 'NOTRY=True\n'
397 'NOPRESUBMIT=True\n'
398 'BUG=\n'
399 '\n'
400 'Review-Url: https://codereview.chromium.org/2577703003\n'
401 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
402 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
403 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
404 dest_ref='refs/heads/gnumb-test/cl',
405 child_msg='git cl on fresh new branch + numbering.\n'
406 '\n'
407 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
408 self.assertEqualByLine(
409 actual,
410 'git cl on fresh new branch + numbering.\n'
411 '\n'
412 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
413 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
414 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
415 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
416 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100417
418 def test_git_number_cherry_pick(self):
419 actual = self._test_git_number(
420 'Parent\n'
421 '\n'
422 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
423 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
424 dest_ref='refs/heads/branch',
425 child_msg='Child, which is cherry-pick from master\n'
426 '\n'
427 'Cr-Commit-Position: refs/heads/master@{#100}\n'
428 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
429 self.assertEqualByLine(
430 actual,
431 'Child, which is cherry-pick from master\n'
432 '\n'
433 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
434 '\n'
435 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
436 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
437 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
438
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000439
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000440class TestGitCl(TestCase):
441 def setUp(self):
442 super(TestGitCl, self).setUp()
443 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700444 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000445 self.mock(subprocess2, 'call', self._mocked_call)
446 self.mock(subprocess2, 'check_call', self._mocked_call)
447 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700448 self.mock(subprocess2, 'communicate',
449 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000450 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000451 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000452 self.mock(git_common, 'get_or_create_merge_base',
453 lambda *a: (
454 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000455 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000456 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000457 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700458 self.mock(git_cl, 'write_json', lambda path, contents:
459 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000460 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000461 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000462 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700463 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
464 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000465 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000466 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000467 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100468 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
469 lambda *args, **kwargs: self._mocked_call(
470 'GetChangeDetail', *args, **kwargs))
471 self.mock(git_cl.gerrit_util, 'AddReviewers',
472 lambda h, i, add, is_reviewer, notify: self._mocked_call(
473 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000474 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
475 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700476 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100477 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000478 # It's important to reset settings to not have inter-tests interference.
479 git_cl.settings = None
480
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000481
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000482 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000483 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100484 self.assertEquals([], self.calls)
485 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000486 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100487 raise
488 # Sadly, has_failed() returns True if this OR any other tests before this
489 # one have failed.
490 git_cl.logging.exception(
491 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
492 'There are un-consumed self.calls after this test has finished.\n'
493 'If you don\'t know which test this is, run:\n'
494 ' tests/git_cl_tests.py -v\n'
495 '\n'
496 'If you are already running just this single test, then **first** '
497 'fix the problem whose exception is emitted below by unittest '
498 'runner.\n'
499 '\n'
500 'Else, to be sure what\'s going on, run this test **alone** with \n'
501 ' tests/git_cl_tests.py TestGitCl.<name>\n'
502 'and follow instructions above.\n' +
503 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000504 finally:
505 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000506
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000507 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000508 self.assertTrue(
509 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700510 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000511 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000512 expected_args, result = top
513
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000514 # Also logs otherwise it could get caught in a try/finally and be hard to
515 # diagnose.
516 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700517 N = 5
518 prior_calls = '\n '.join(
519 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
520 for i, c in enumerate(self._calls_done[-N:]))
521 following_calls = '\n '.join(
522 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
523 for i, c in enumerate(self.calls[:N]))
524 extended_msg = (
525 'A few prior calls:\n %s\n\n'
526 'This (expected):\n @%d: %r\n'
527 'This (actual):\n @%d: %r\n\n'
528 'A few following expected calls:\n %s' %
529 (prior_calls, len(self._calls_done), expected_args,
530 len(self._calls_done), args, following_calls))
531 git_cl.logging.error(extended_msg)
532
tandrii99a72f22016-08-17 14:33:24 -0700533 self.fail('@%d\n'
534 ' Expected: %r\n'
535 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700536 len(self._calls_done), expected_args, args))
537
538 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700539 if isinstance(result, Exception):
540 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000541 return result
542
tandrii48df5812016-10-17 03:55:37 -0700543 def test_LoadCodereviewSettingsFromFile_gerrit(self):
544 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
545 self.calls = [
546 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
547 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
548 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
549 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
550 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
551 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700552 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
553 CERR1),
554 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700555 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
556 CERR1),
557 ((['git', 'config', 'gerrit.host', 'true'],), ''),
558 ]
559 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
560
maruel@chromium.orga3353652011-11-30 14:26:57 +0000561 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000562 def _is_gerrit_calls(cls, gerrit=False):
563 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
564 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
565
566 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000567 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000568 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000569 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000570
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000571 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000572 def _upload_no_rev_calls(cls, similarity, find_copies):
573 return (cls._git_base_calls(similarity, find_copies) +
574 cls._git_upload_no_rev_calls())
575
576 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000577 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000578 if similarity is None:
579 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700580 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700581 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000582 else:
tandrii33a46ff2016-08-23 05:53:40 -0700583 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700584 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000585
586 if find_copies is None:
587 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700588 find_copies_call = ((['git', 'config', '--bool',
589 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000590 else:
tandrii5d48c322016-08-18 16:19:37 -0700591 val = str(find_copies).lower()
592 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000593 'branch.master.git-find-copies', val],), '')
594
595 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000596 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800597 '-l100000', '-C'+similarity,
598 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000599 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000600 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000601 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000602
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000603 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000604 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000605 similarity_call,
606 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
607 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000608 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000609 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700610 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
611 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000612 ((['git', 'config', 'rietveld.server'],),
613 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000614 ((['git', 'config', 'branch.master.merge'],), 'master'),
615 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000616 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000617 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000618 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000619 ((['git', 'rev-parse', '--show-cdup'],), ''),
620 ((['git', 'rev-parse', 'HEAD'],), '12345'),
621 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000622 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000623 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700624 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000625 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000626 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000627 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000628 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000629 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000630 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000631 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000632 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000633 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000634 ]
635
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000636 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000637 def _git_upload_no_rev_calls(cls):
638 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000639 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000640 ]
641
642 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000643 def _git_upload_calls(cls, private):
644 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000645 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000646 private_call = []
647 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000648 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000649 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000650 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000651
maruel@chromium.orga3353652011-11-30 14:26:57 +0000652 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000653 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000654 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000655 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800656 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000657 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700658 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000659 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000660 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000661 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700662 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000663 ] + cls._git_post_upload_calls()
664
665 @classmethod
666 def _git_post_upload_calls(cls):
667 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000668 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
669 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
670 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000671 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000672 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000673 ]
674
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000675 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000676 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000677 fake_ancestor = 'fake_ancestor'
678 fake_cl = 'fake_cl_for_patch'
679 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000680 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000681 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000682 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000683 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000684 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000685 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000686 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000687 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700688 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000689 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000690 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000691 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000692 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000693 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000694 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000695 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000696 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000697 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000698 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000699 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000700
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000701 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700702 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000703 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000704 return [
705 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000706 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000707 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000708 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700709 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000710 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000711 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100712 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000713 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000714 ]
715
716 def _run_reviewer_test(
717 self,
718 upload_args,
719 expected_description,
720 returned_description,
721 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000722 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700723 private=False,
724 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000725 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000726 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000727 try:
728 similarity = upload_args[upload_args.index('--similarity')+1]
729 except ValueError:
730 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000731
732 if '--find-copies' in upload_args:
733 find_copies = True
734 elif '--no-find-copies' in upload_args:
735 find_copies = False
736 else:
737 find_copies = None
738
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000739 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700740 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000741
742 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000743
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000744 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000745 self.assertEquals(
746 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000747 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000748 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000749 '#--------------------This line is 72 characters long'
750 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000751 expected_description,
752 desc)
753 return returned_description
754 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000755
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000756 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000757 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700758 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000759 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000760 return 1, 2
761 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000762
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000763 git_cl.main(['upload'] + upload_args)
764
765 def test_no_reviewer(self):
766 self._run_reviewer_test(
767 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000768 'desc\n\nBUG=',
769 '# Blah blah comment.\ndesc\n\nBUG=',
770 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000771 [])
772
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000773 def test_keep_similarity(self):
774 self._run_reviewer_test(
775 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000776 'desc\n\nBUG=',
777 '# Blah blah comment.\ndesc\n\nBUG=',
778 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000779 [])
780
iannucci@chromium.org79540052012-10-19 23:15:26 +0000781 def test_keep_find_copies(self):
782 self._run_reviewer_test(
783 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000784 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000785 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000786 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000787 [])
788
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000789 def test_private(self):
790 self._run_reviewer_test(
791 ['--private'],
792 'desc\n\nBUG=',
793 '# Blah blah comment.\ndesc\n\nBUG=\n',
794 'desc\n\nBUG=',
795 [])
796
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000797 def test_reviewers_cmd_line(self):
798 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000799 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000800 self._run_reviewer_test(
801 ['-r' 'foo@example.com'],
802 description,
803 '\n%s\n' % description,
804 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000805 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000806
807 def test_reviewer_tbr_overriden(self):
808 # Reviewer is overriden with TBR
809 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000810 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000811 self._run_reviewer_test(
812 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000813 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000814 description.strip('\n'),
815 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000816 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000817
818 def test_reviewer_multiple(self):
819 # Handles multiple R= or TBR= lines.
820 description = (
bradnelsond975b302016-10-23 12:20:23 -0700821 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
822 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000823 self._run_reviewer_test(
824 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000825 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000826 description,
827 description,
bradnelsond975b302016-10-23 12:20:23 -0700828 ['--reviewers=another@example.com,reviewer@example.com'],
829 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000830
maruel@chromium.orga3353652011-11-30 14:26:57 +0000831 def test_reviewer_send_mail(self):
832 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000833 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000834 self._run_reviewer_test(
835 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000836 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000837 description.strip('\n'),
838 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000839 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000840
841 def test_reviewer_send_mail_no_rev(self):
842 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000843 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700844 self.calls = self._upload_no_rev_calls(None, None) + [
845 ((['DieWithError', 'Must specify reviewers to send email.'],),
846 SystemExitMock())
847 ]
848
849 def RunEditor(desc, _, **kwargs):
850 return desc
851 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
852 self.mock(sys, 'stdout', stdout)
853 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000854 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700855 self.assertEqual(
856 'Using 50% similarity for rename/copy detection. Override with '
857 '--similarity.\n',
858 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000859
tandriif9aefb72016-07-01 09:06:51 -0700860 def test_bug_on_cmd(self):
861 self._run_reviewer_test(
862 ['--bug=500658,proj:123'],
863 'desc\n\nBUG=500658\nBUG=proj:123',
864 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
865 'desc\n\nBUG=500658\nBUG=proj:1234',
866 [])
867
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100868 def _land_rietveld_common(self, debug=False):
869 if debug:
870 # Very useful due to finally clause in git cl land raising exceptions and
871 # shadowing real cause of failure.
872 self.mock(git_cl, '_IS_BEING_TESTED', True)
873 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100874 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100875
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100876 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
877 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100878 self.mock(RietveldMock, 'update_description', staticmethod(
879 lambda i, d: self._mocked_call(['update_description', i, d])))
880 self.mock(RietveldMock, 'add_comment', staticmethod(
881 lambda i, c: self._mocked_call(['add_comment', i, c])))
882 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100883 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
884 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
885 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
886 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
887 CERR1),
888 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
889 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800890 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100891 ((['git', 'config', 'rietveld.server'],),
892 'https://codereview.chromium.org'),
893 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
894 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
895 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
896 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100897 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
898 ''), # No commits to rebase, according to local view of origin.
899 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
900 'fake_ancestor_sha'),
901 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
902 ((['git', 'rev-parse', '--show-cdup'],), ''),
903 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
904 ((['git', 'diff', '--name-status', '--no-renames', '-r',
905 'fake_ancestor_sha...', '.'],),
906 'M\tfile1.cpp'),
907 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
908 ((['git', 'config', 'branch.feature.rietveldserver'],),
909 'https://codereview.chromium.org'),
910 ((['git', 'config', 'user.email'],), 'user@e.mail'),
911 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
912 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
913 'fake_ancestor_sha', 'feature'],),
914 # This command just prints smth like this:
915 # file1.cpp | 53 ++++++--
916 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
917 ''),
918 ((['git', 'show-ref', '--quiet', '--verify',
919 'refs/heads/git-cl-commit'],),
920 ''), # 0 return code means branch exists.
921 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
922 ((['git', 'show-ref', '--quiet', '--verify',
923 'refs/heads/git-cl-cherry-pick'],),
924 CERR1), # This means git-cl-cherry-pick branch does not exist.
925 ((['git', 'rev-parse', '--show-cdup'],), ''),
926 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
927 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
928 ((['git', 'commit', '-m',
929 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100930 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100931 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
932 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
933 ((['git', 'config', '--get', 'remote.origin.url'],),
934 'https://chromium.googlesource.com/infra/infra'),
935 ]
936
937 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100938 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100939 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100940 ((['git', 'config', 'remote.origin.url'],),
941 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100942 (('_is_git_numberer_enabled',
943 'https://chromium.googlesource.com/infra/infra',
944 'refs/heads/master'),
945 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100946 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
947 ''),
948 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
949 ((['git', 'checkout', '-q', 'feature'],), ''),
950 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
951 ((['git', 'config', 'rietveld.viewvc-url'],),
952 'https://chromium.googlesource.com/infra/infra/+/'),
953 ((['update_description', 123,
954 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
955 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
956 ''),
957 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
958 'fake_sha_rebased (presubmit successful).'],), ''),
959 ]
960 git_cl.main(['land'])
961
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100962 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100963 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100964
965 # Special mocks to check validity of timestamp.
966 original_git_amend_head = git_cl._git_amend_head
967 def _git_amend_head_mock(msg, tstamp):
968 self._mocked_call(['git_amend_head committer timestamp', tstamp])
969 return original_git_amend_head(msg, tstamp)
970 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
971
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100972 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100973 ((['git', 'config', 'remote.origin.url'],),
974 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100975 (('_is_git_numberer_enabled',
976 'https://chromium.googlesource.com/chromium/src',
977 'refs/heads/master'),
978 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100979 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
980 'This is parent commit.\n'
981 '\n'
982 'Cr-Commit-Position: refs/heads/master@{#543}\n'
983 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100984 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
985 '1480022355'), # Committer's unix timestamp.
986 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
987 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100988
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100989 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100990 ((['git', 'commit', '--amend', '-m',
991 'Issue: 123\n\nR=john@chromium.org\n'
992 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100993 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100994 'Cr-Commit-Position: refs/heads/master@{#544}\n'
995 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
996
997 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
998 ''),
999 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1000 ((['git', 'checkout', '-q', 'feature'],), ''),
1001 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1002 ((['git', 'config', 'rietveld.viewvc-url'],),
1003 'https://chromium.googlesource.com/infra/infra/+/'),
1004 ((['update_description', 123,
1005 'Issue: 123\n\nR=john@chromium.org\n'
1006 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001007 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001008 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1009 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1010 'Committed: '
1011 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1012 ''),
1013 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1014 'fake_sha_rebased (presubmit successful).'],), ''),
1015 ]
1016 git_cl.main(['land'])
1017
1018 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001019 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001020 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001021 ((['git', 'config', 'remote.origin.url'],),
1022 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001023 (('_is_git_numberer_enabled',
1024 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1025 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001026
1027 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1028 'This is parent commit with no footer.'),
1029
1030 ((['git', 'checkout', '-q', 'feature'],), ''),
1031 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1032 ]
1033 with self.assertRaises(ValueError) as cm:
1034 git_cl.main(['land'])
1035 self.assertEqual(cm.exception.message,
1036 'Unable to infer commit position from footers')
1037
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001038 def test_git_numberer_not_whitelisted_repo(self):
1039 self.calls = []
1040 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001041 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1042 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001043 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001044
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001045 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001046 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1047 self.calls = [
1048 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001049 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001050 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001051 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001052 remote_url='https://chromium.googlesource.com/chromium/src',
1053 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001054 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001055
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001056 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001057 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001058 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001059 def fake_temporary_directory(**kwargs):
1060 yield tempdir
1061 self.mock(git_cl.gclient_utils, 'temporary_directory',
1062 fake_temporary_directory)
1063 self._test_GitNumbererState_valid_configs_inner(tempdir)
1064
1065 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001066 self.calls = [
1067 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001068 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001069 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1070 '''
1071 [plugin "git-numberer"]
1072 validate-enabled-refglob = refs/else/*
1073 validate-enabled-refglob = refs/heads/*
1074 validate-disabled-refglob = refs/heads/disabled
1075 validate-disabled-refglob = refs/branch-heads/*
1076 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001077 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1078 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001079 'refs/else/*\n'
1080 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001081 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1082 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001083 'refs/heads/disabled\n'
1084 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001085 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001086
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001087 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001088 remote_url='https://chromium.googlesource.com/chromium/src',
1089 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001090 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001091
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001092 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001093 remote_url='https://chromium.googlesource.com/chromium/src',
1094 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001095 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001096
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001097 # Validator is disabled by default, even if it's not explicitely in disabled
1098 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001099 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001100 remote_url='https://chromium.googlesource.com/chromium/src',
1101 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001102 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001103
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001104 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001105 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001106 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001107 if skip_auth_check:
1108 return [((cmd, ), 'true')]
1109
tandrii5d48c322016-08-18 16:19:37 -07001110 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001111 if issue:
1112 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001113 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001114 ])
1115 calls.extend([
1116 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1117 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1118 ((['git', 'config', 'remote.origin.url'],),
1119 'https://chromium.googlesource.com/my/repo'),
1120 ((['git', 'config', 'remote.origin.url'],),
1121 'https://chromium.googlesource.com/my/repo'),
1122 ])
1123 return calls
1124
1125 @classmethod
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001126 def _gerrit_base_calls(cls, issue=None, fetched_description=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001127 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001128 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001129 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001130 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001131 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001132 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1133 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001134 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001135 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001136 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1137 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001138 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001139 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001140 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001141 ((['get_or_create_merge_base', 'master',
1142 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001143 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001144 # Calls to verify branch point is ancestor
1145 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1146 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1147 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001148 ((['git', 'rev-parse', '--show-cdup'],), ''),
1149 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001150
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001151 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001152 'diff', '--name-status', '--no-renames', '-r',
1153 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001154 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001155 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001156 ] + ([
1157 (('GetChangeDetail', 'chromium-review.googlesource.com',
1158 '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
1159 {
1160 'change_id': '123456789',
1161 'current_revision': 'sha1_of_current_revision',
1162 'revisions': { 'sha1_of_current_revision': {
1163 'commit': {'message': fetched_description},
1164 }},
1165 }),
1166 ] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001167 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001168 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001170 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001171 ((['git', 'config', 'user.email'],), 'me@example.com'),
1172 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001173 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1174 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001175 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001176 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001177
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001178 @classmethod
1179 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001180 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001181 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001182 ref_suffix='', title=None, notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001183 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001184 if post_amend_description is None:
1185 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001186 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001187 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001188
tandriia60502f2016-06-20 02:01:53 -07001189 if squash_mode == 'default':
1190 calls.extend([
1191 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1192 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1193 ])
1194 elif squash_mode in ('override_squash', 'override_nosquash'):
1195 calls.extend([
1196 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1197 'true' if squash_mode == 'override_squash' else 'false'),
1198 ])
1199 else:
1200 assert squash_mode in ('squash', 'nosquash')
1201
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001202 # If issue is given, then description is fetched from Gerrit instead.
1203 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001204 calls += [
1205 ((['git', 'log', '--pretty=format:%s\n\n%b',
1206 'fake_ancestor_sha..HEAD'],),
1207 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001208 if squash:
1209 title = 'Initial_upload'
1210 else:
1211 if not title:
1212 calls += [
1213 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1214 (('Title for patchset []: ',), 'User input'),
1215 ]
1216 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001217 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001218 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001219 # DownloadGerritHook(False)
1220 ((False, ),
1221 ''),
1222 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001223 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001224 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001225 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001226 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001227 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001228 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001229 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001230 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001231 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001232 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001233 if not issue:
1234 # Prompting to edit description on first upload.
1235 calls += [
1236 ((['git', 'config', 'core.editor'],), ''),
1237 ((['RunEditor'],), description),
1238 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001239 ref_to_push = 'abcdef0123456789'
1240 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001241 ((['git', 'config', 'branch.master.merge'],),
1242 'refs/heads/master'),
1243 ((['git', 'config', 'branch.master.remote'],),
1244 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001245 ((['get_or_create_merge_base', 'master',
1246 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001247 'origin/master'),
1248 ((['git', 'rev-parse', 'HEAD:'],),
1249 '0123456789abcdef'),
1250 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001251 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001252 ref_to_push),
1253 ]
1254 else:
1255 ref_to_push = 'HEAD'
1256
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001257 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001258 ((['git', 'rev-list',
1259 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001260 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001261
Aaron Gable9b713dd2016-12-14 16:04:21 -08001262 if title:
1263 if ref_suffix:
1264 ref_suffix += ',m=' + title
1265 else:
1266 ref_suffix = '%m=' + title
1267
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001268 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1269 if ref_suffix:
1270 ref_suffix += ',' + notify_suffix
1271 else:
1272 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001273
ukai@chromium.orge8077812012-02-03 03:41:46 +00001274 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001275 ref_suffix += ',' + ','.join('r=%s' % email
1276 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001277 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001278 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001279 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001280 ('remote:\n'
1281 'remote: Processing changes: (\)\n'
1282 'remote: Processing changes: (|)\n'
1283 'remote: Processing changes: (/)\n'
1284 'remote: Processing changes: (-)\n'
1285 'remote: Processing changes: new: 1 (/)\n'
1286 'remote: Processing changes: new: 1, done\n'
1287 'remote:\n'
1288 'remote: New Changes:\n'
1289 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1290 'remote:\n'
1291 'To https://chromium.googlesource.com/yyy/zzz\n'
1292 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001293 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001294 if squash:
1295 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001296 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001297 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001298 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001299 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001300 ((['git', 'config', 'branch.master.gerritsquashhash',
1301 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001302 ]
tandrii88189772016-09-29 04:29:57 -07001303 calls += [
1304 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001305 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001306 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001307 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001308 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001309 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001310 return calls
1311
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001312 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001313 self,
1314 upload_args,
1315 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001316 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001317 squash=True,
1318 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001319 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001320 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001321 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001322 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001323 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001324 issue=None,
1325 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001326 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001327 if squash_mode is None:
1328 if '--no-squash' in upload_args:
1329 squash_mode = 'nosquash'
1330 elif '--squash' in upload_args:
1331 squash_mode = 'squash'
1332 else:
1333 squash_mode = 'default'
1334
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001335 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001336 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001337 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001338 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001339 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001340 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1341 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001342 self.mock(git_cl.gclient_utils, 'RunEditor',
1343 lambda *_, **__: self._mocked_call(['RunEditor']))
1344 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1345
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001346 self.calls = self._gerrit_base_calls(
1347 issue=issue,
1348 fetched_description=description)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001349 self.calls += self._gerrit_upload_calls(
1350 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001351 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001352 expected_upstream_ref=expected_upstream_ref,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001353 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001354 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001355 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001356 # Uncomment when debugging.
1357 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001358 git_cl.main(['upload'] + upload_args)
1359
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001360 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001361 self._run_gerrit_upload_test(
1362 ['--no-squash'],
1363 'desc\n\nBUG=\n',
1364 [],
1365 squash=False,
1366 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1367
1368 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001369 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001370 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001371 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001372 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001373 [],
tandriia60502f2016-06-20 02:01:53 -07001374 squash=False,
1375 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001376 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001377
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001378 def test_gerrit_no_reviewer(self):
1379 self._run_gerrit_upload_test(
1380 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001381 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001382 [],
1383 squash=False,
1384 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001385
tandriieefe8322016-08-17 10:12:24 -07001386 def test_gerrit_patch_bad_chars(self):
1387 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001388 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001389 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001390 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001391 squash=False,
1392 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001393 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001394 self.assertIn(
1395 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001396 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1397 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001398 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001399
ukai@chromium.orge8077812012-02-03 03:41:46 +00001400 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001401 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001402 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001403 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001404 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001405 squash=False,
1406 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001407 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001408
1409 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001410 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001411 [],
bradnelsond975b302016-10-23 12:20:23 -07001412 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1413 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001414 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001415 ['reviewer@example.com', 'another@example.com'],
1416 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001417 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001418 ref_suffix='%l=Code-Review+1',
1419 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001420
1421 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001422 self._run_gerrit_upload_test(
1423 [],
1424 'desc\nBUG=\n\nChange-Id: 123456789',
1425 [],
1426 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001427
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001428 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001429 self._run_gerrit_upload_test(
1430 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001431 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001432 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001433 squash=True,
1434 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001435
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001436 def test_gerrit_upload_squash_reupload(self):
1437 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001438 self._run_gerrit_upload_test(
1439 ['--squash'],
1440 description,
1441 [],
1442 squash=True,
1443 expected_upstream_ref='origin/master',
1444 issue=123456)
1445
rmistry@google.com2dd99862015-06-22 12:22:18 +00001446 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001447 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001448 def mock_run_git(*args, **_kwargs):
1449 if args[0] == ['for-each-ref',
1450 '--format=%(refname:short) %(upstream:short)',
1451 'refs/heads']:
1452 # Create a local branch dependency tree that looks like this:
1453 # test1 -> test2 -> test3 -> test4 -> test5
1454 # -> test3.1
1455 # test6 -> test0
1456 branch_deps = [
1457 'test2 test1', # test1 -> test2
1458 'test3 test2', # test2 -> test3
1459 'test3.1 test2', # test2 -> test3.1
1460 'test4 test3', # test3 -> test4
1461 'test5 test4', # test4 -> test5
1462 'test6 test0', # test0 -> test6
1463 'test7', # test7
1464 ]
1465 return '\n'.join(branch_deps)
1466 self.mock(git_cl, 'RunGit', mock_run_git)
1467
1468 class RecordCalls:
1469 times_called = 0
1470 record_calls = RecordCalls()
1471 def mock_CMDupload(*args, **_kwargs):
1472 record_calls.times_called += 1
1473 return 0
1474 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1475
1476 self.calls = [
1477 (('[Press enter to continue or ctrl-C to quit]',), ''),
1478 ]
1479
1480 class MockChangelist():
1481 def __init__(self):
1482 pass
1483 def GetBranch(self):
1484 return 'test1'
1485 def GetIssue(self):
1486 return '123'
1487 def GetPatchset(self):
1488 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001489 def IsGerrit(self):
1490 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001491
1492 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1493 # CMDupload should have been called 5 times because of 5 dependent branches.
1494 self.assertEquals(5, record_calls.times_called)
1495 self.assertEquals(0, ret)
1496
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001497 def test_gerrit_change_id(self):
1498 self.calls = [
1499 ((['git', 'write-tree'], ),
1500 'hashtree'),
1501 ((['git', 'rev-parse', 'HEAD~0'], ),
1502 'branch-parent'),
1503 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1504 'A B <a@b.org> 1456848326 +0100'),
1505 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1506 'C D <c@d.org> 1456858326 +0100'),
1507 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1508 'hashchange'),
1509 ]
1510 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1511 self.assertEqual(change_id, 'Ihashchange')
1512
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001513 def test_desecription_append_footer(self):
1514 for init_desc, footer_line, expected_desc in [
1515 # Use unique desc first lines for easy test failure identification.
1516 ('foo', 'R=one', 'foo\n\nR=one'),
1517 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1518 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1519 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1520 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1521 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1522 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1523 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1524 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1525 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1526 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1527 ]:
1528 desc = git_cl.ChangeDescription(init_desc)
1529 desc.append_footer(footer_line)
1530 self.assertEqual(desc.description, expected_desc)
1531
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001532 def test_update_reviewers(self):
1533 data = [
1534 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001535 ('foo\nR=xx', [], 'foo\nR=xx'),
1536 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001537 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001538 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1539 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1540 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001541 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001542 ('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 +00001543 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001544 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1545 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1546 # Same as the line before, but full of whitespaces.
1547 (
1548 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1549 'foo\nBar\n\nR=c@c\n BUG =',
1550 ),
1551 # Whitespaces aren't interpreted as new lines.
1552 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001553 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001554 expected = [i[2] for i in data]
1555 actual = []
1556 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001557 obj = git_cl.ChangeDescription(orig)
1558 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001559 actual.append(obj.description)
1560 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001561
wittman@chromium.org455dc922015-01-26 20:15:50 +00001562 def test_get_target_ref(self):
1563 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001564 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001565 self.assertEqual(None, git_cl.GetTargetRef(None,
1566 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001567 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001568
wittman@chromium.org455dc922015-01-26 20:15:50 +00001569 # Check default target refs for branches.
1570 self.assertEqual('refs/heads/master',
1571 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001572 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001573 self.assertEqual('refs/heads/master',
1574 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001575 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001576 self.assertEqual('refs/heads/master',
1577 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001578 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001579 self.assertEqual('refs/branch-heads/123',
1580 git_cl.GetTargetRef('origin',
1581 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001582 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001583 self.assertEqual('refs/diff/test',
1584 git_cl.GetTargetRef('origin',
1585 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001586 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001587 self.assertEqual('refs/heads/chrome/m42',
1588 git_cl.GetTargetRef('origin',
1589 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001590 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001591
1592 # Check target refs for user-specified target branch.
1593 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1594 'refs/remotes/branch-heads/123'):
1595 self.assertEqual('refs/branch-heads/123',
1596 git_cl.GetTargetRef('origin',
1597 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001598 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001599 for branch in ('origin/master', 'remotes/origin/master',
1600 'refs/remotes/origin/master'):
1601 self.assertEqual('refs/heads/master',
1602 git_cl.GetTargetRef('origin',
1603 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001604 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001605 for branch in ('master', 'heads/master', 'refs/heads/master'):
1606 self.assertEqual('refs/heads/master',
1607 git_cl.GetTargetRef('origin',
1608 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001609 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001610
wychen@chromium.orga872e752015-04-28 23:42:18 +00001611 def test_patch_when_dirty(self):
1612 # Patch when local tree is dirty
1613 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1614 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1615
1616 def test_diff_when_dirty(self):
1617 # Do 'git cl diff' when local tree is dirty
1618 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1619 self.assertNotEqual(git_cl.main(['diff']), 0)
1620
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001621 @staticmethod
1622 def _get_gerrit_codereview_server_calls(branch, value=None,
1623 git_short_host='host',
1624 detect_branch=True):
1625 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1626
1627 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1628 """
1629 calls = []
1630 if detect_branch:
1631 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1632 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1633 CERR1 if value is None else value))
1634 if value is None:
1635 calls += [
1636 ((['git', 'config', 'branch.' + branch + '.merge'],),
1637 'refs/heads' + branch),
1638 ((['git', 'config', 'branch.' + branch + '.remote'],),
1639 'origin'),
1640 ((['git', 'config', 'remote.origin.url'],),
1641 'https://%s.googlesource.com/my/repo' % git_short_host),
1642 ]
1643 return calls
1644
tandriidf09a462016-08-18 16:23:55 -07001645 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001646 new_branch=False, git_short_host='host',
1647 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001648 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001649 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1650 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001651 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001652 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001653 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1654
tandriidf09a462016-08-18 16:23:55 -07001655 if new_branch:
1656 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1657 else:
1658 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001659
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001660 if not force_codereview:
1661 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001662 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001663 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001664 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1665 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001666 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001667 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001668
1669 if is_gerrit:
1670 if not force_codereview:
1671 self.calls += [
1672 ((['git', 'config', 'gerrit.host'],), 'true'),
1673 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001674 if detect_gerrit_server:
1675 self.calls += self._get_gerrit_codereview_server_calls(
1676 'master', git_short_host=git_short_host,
1677 detect_branch=not new_branch and force_codereview)
1678
1679 self.calls += [
1680 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001681 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001682 {
1683 'current_revision': '7777777777',
1684 'revisions': {
1685 '1111111111': {
1686 '_number': 1,
1687 'fetch': {'http': {
1688 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1689 'ref': 'refs/changes/56/123456/1',
1690 }},
1691 },
1692 '7777777777': {
1693 '_number': 7,
1694 'fetch': {'http': {
1695 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1696 'ref': 'refs/changes/56/123456/7',
1697 }},
1698 },
1699 },
1700 }),
1701 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001702 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001703 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001704 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001705 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001706 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001707 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001708 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001709
tandriidf09a462016-08-18 16:23:55 -07001710 def _common_patch_successful(self, new_branch=False):
1711 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001712 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001713 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001714 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001715 'patch from issue 123456 at patchset 60001 ' +
1716 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001717 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001718 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001719 ((['git', 'config', 'branch.master.rietveldserver',
1720 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001721 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001722 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001723 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001724
1725 def test_patch_successful(self):
1726 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001727 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1728
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001729 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001730 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001731 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1732
wychen@chromium.orga872e752015-04-28 23:42:18 +00001733 def test_patch_conflict(self):
1734 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001735 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001736 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001737
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001738 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001739 self._patch_common(is_gerrit=True, git_short_host='chromium',
1740 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001741 self.calls += [
1742 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1743 'refs/changes/56/123456/7'],), ''),
1744 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001745 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001746 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001747 ((['git', 'config', 'branch.master.gerritserver',
1748 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001749 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001750 ]
1751 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1752
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001753 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001754 self._patch_common(is_gerrit=True, force_codereview=True,
1755 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001756 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001757 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001758 'refs/changes/56/123456/7'],), ''),
1759 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001760 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001761 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001762 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001763 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001764 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001765 ]
1766 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1767
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001768 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001769 self._patch_common(is_gerrit=True, git_short_host='else',
1770 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001771 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001772 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001773 'refs/changes/56/123456/1'],), ''),
1774 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001775 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001776 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001777 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001778 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001779 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001780 ]
1781 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001782 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001783
1784 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001785 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1786 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001787 self.calls += [
1788 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1789 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001790 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1791 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1792 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001793 ]
1794 with self.assertRaises(SystemExitMock):
1795 git_cl.main(['patch',
1796 'https://chromium-review.googlesource.com/#/c/123456/1'])
1797
tandriic2405f52016-10-10 08:13:15 -07001798 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001799 def notExists(_issue, *_, **kwargs):
1800 self.assertFalse(kwargs['ignore_404'])
1801 raise git_cl.gerrit_util.GerritError(404, '')
1802 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1803
tandriic2405f52016-10-10 08:13:15 -07001804 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001805 self.calls = [
1806 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1807 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1808 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1809 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1810 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1811 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001812 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001813 'or you have no access to it'],), SystemExitMock()),
1814 ]
1815 with self.assertRaises(SystemExitMock):
1816 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1817
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001818 def _checkout_calls(self):
1819 return [
1820 ((['git', 'config', '--local', '--get-regexp',
1821 'branch\\..*\\.rietveldissue'], ),
1822 ('branch.retrying.rietveldissue 1111111111\n'
1823 'branch.some-fix.rietveldissue 2222222222\n')),
1824 ((['git', 'config', '--local', '--get-regexp',
1825 'branch\\..*\\.gerritissue'], ),
1826 ('branch.ger-branch.gerritissue 123456\n'
1827 'branch.gbranch654.gerritissue 654321\n')),
1828 ]
1829
1830 def test_checkout_gerrit(self):
1831 """Tests git cl checkout <issue>."""
1832 self.calls = self._checkout_calls()
1833 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1834 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1835
1836 def test_checkout_rietveld(self):
1837 """Tests git cl checkout <issue>."""
1838 self.calls = self._checkout_calls()
1839 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1840 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1841
1842 def test_checkout_not_found(self):
1843 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001844 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001845 self.calls = self._checkout_calls()
1846 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1847
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001848 def test_checkout_no_branch_issues(self):
1849 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001850 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001851 self.calls = [
1852 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001853 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001854 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001855 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001856 ]
1857 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1858
tandrii@chromium.org28253532016-04-14 13:46:56 +00001859 def _test_gerrit_ensure_authenticated_common(self, auth,
1860 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001861 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1862 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1863 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001864 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001865 self.mock(git_cl, 'ask_for_data',
1866 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001867 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001868 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001869 cl.branch = 'master'
1870 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001871 cl.lookedup_issue = True
1872 return cl
1873
1874 def test_gerrit_ensure_authenticated_missing(self):
1875 cl = self._test_gerrit_ensure_authenticated_common(auth={
1876 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1877 })
1878 self.calls.append(
1879 ((['DieWithError',
1880 'Credentials for the following hosts are required:\n'
1881 ' chromium-review.googlesource.com\n'
1882 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1883 'You can (re)generate your credentails by visiting '
1884 'https://chromium-review.googlesource.com/new-password'],), ''),)
1885 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1886
1887 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001888 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001889 cl = self._test_gerrit_ensure_authenticated_common(auth={
1890 'chromium.googlesource.com': 'one',
1891 'chromium-review.googlesource.com': 'other',
1892 })
1893 self.calls.append(
1894 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001895 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001896 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1897
1898 def test_gerrit_ensure_authenticated_ok(self):
1899 cl = self._test_gerrit_ensure_authenticated_common(auth={
1900 'chromium.googlesource.com': 'same',
1901 'chromium-review.googlesource.com': 'same',
1902 })
1903 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1904
tandrii@chromium.org28253532016-04-14 13:46:56 +00001905 def test_gerrit_ensure_authenticated_skipped(self):
1906 cl = self._test_gerrit_ensure_authenticated_common(
1907 auth={}, skip_auth_check=True)
1908 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1909
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001910 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001911 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1912 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001913 self.calls = [
1914 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001915 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001916 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1917 ((['git', 'config', 'rietveld.server'],), ''),
1918 ((['git', 'config', 'rietveld.server'],), ''),
1919 ((['git', 'config', 'branch.feature.rietveldserver'],),
1920 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001921 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001922 ]
1923 self.assertEqual(0, git_cl.main(['set-commit']))
1924
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001925 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001926 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001927 lambda h, i, labels, notify=None:
1928 self._mocked_call(['SetReview', h, i, labels, notify]))
1929
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001930 self.calls = [
1931 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001932 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1933 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001934 ((['git', 'config', 'branch.feature.gerritserver'],),
1935 'https://chromium-review.googlesource.com'),
1936 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001937 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001938 ]
tandriid9e5ce52016-07-13 02:32:59 -07001939
1940 def test_cmd_set_commit_gerrit_clear(self):
1941 self._cmd_set_commit_gerrit_common(0)
1942 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1943
1944 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001945 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001946 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1947
tandriid9e5ce52016-07-13 02:32:59 -07001948 def test_cmd_set_commit_gerrit(self):
1949 self._cmd_set_commit_gerrit_common(2)
1950 self.assertEqual(0, git_cl.main(['set-commit']))
1951
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001952 def test_description_display(self):
1953 out = StringIO.StringIO()
1954 self.mock(git_cl.sys, 'stdout', out)
1955
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001956 self.mock(git_cl, 'Changelist', ChangelistMock)
1957 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001958
1959 self.assertEqual(0, git_cl.main(['description', '-d']))
1960 self.assertEqual('foo\n', out.getvalue())
1961
1962 def test_description_rietveld(self):
1963 out = StringIO.StringIO()
1964 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001965 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001966
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001967 self.assertEqual(0, git_cl.main([
1968 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1969 self.assertEqual('foobar\n', out.getvalue())
1970
iannucci3c972b92016-08-17 13:24:10 -07001971 def test_StatusFieldOverrideIssueMissingArgs(self):
1972 out = StringIO.StringIO()
1973 self.mock(git_cl.sys, 'stderr', out)
1974
1975 try:
1976 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1977 except SystemExit as ex:
1978 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001979 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001980
1981 out = StringIO.StringIO()
1982 self.mock(git_cl.sys, 'stderr', out)
1983
1984 try:
1985 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1986 except SystemExit as ex:
1987 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001988 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001989
1990 def test_StatusFieldOverrideIssue(self):
1991 out = StringIO.StringIO()
1992 self.mock(git_cl.sys, 'stdout', out)
1993
1994 def assertIssue(cl_self, *_args):
1995 self.assertEquals(cl_self.issue, 1)
1996 return 'foobar'
1997
1998 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1999 self.calls = [
2000 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2001 ((['git', 'config', 'rietveld.server'],), ''),
2002 ((['git', 'config', 'rietveld.server'],), ''),
2003 ]
iannuccie53c9352016-08-17 14:40:40 -07002004 self.assertEqual(
2005 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2006 0)
iannucci3c972b92016-08-17 13:24:10 -07002007 self.assertEqual(out.getvalue(), 'foobar\n')
2008
iannuccie53c9352016-08-17 14:40:40 -07002009 def test_SetCloseOverrideIssue(self):
2010 def assertIssue(cl_self, *_args):
2011 self.assertEquals(cl_self.issue, 1)
2012 return 'foobar'
2013
2014 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2015 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2016 self.calls = [
2017 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2018 ((['git', 'config', 'rietveld.server'],), ''),
2019 ((['git', 'config', 'rietveld.server'],), ''),
2020 ]
2021 self.assertEqual(
2022 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2023
2024 def test_SetCommitOverrideIssue(self):
2025 def assertIssue(cl_self, *_args):
2026 self.assertEquals(cl_self.issue, 1)
2027 return 'foobar'
2028
2029 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2030 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2031 self.calls = [
2032 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2033 ((['git', 'config', 'rietveld.server'],), ''),
2034 ((['git', 'config', 'rietveld.server'],), ''),
2035 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2036 ((['git', 'config', 'rietveld.server'],), ''),
2037 ((['git', 'config', 'rietveld.server'],), ''),
2038 ]
2039 self.assertEqual(
2040 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2041
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002042 def test_description_gerrit(self):
2043 out = StringIO.StringIO()
2044 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002045 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002046 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002047 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2048 {
2049 'current_revision': 'sha1',
2050 'revisions': {'sha1': {
2051 'commit': {'message': 'foobar'},
2052 }},
2053 }),
2054 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002055 self.assertEqual(0, git_cl.main([
2056 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2057 self.assertEqual('foobar\n', out.getvalue())
2058
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002059 def test_description_set_raw(self):
2060 out = StringIO.StringIO()
2061 self.mock(git_cl.sys, 'stdout', out)
2062
2063 self.mock(git_cl, 'Changelist', ChangelistMock)
2064 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2065
2066 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2067 self.assertEqual('hihi', ChangelistMock.desc)
2068
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002069 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002070 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002071
2072 def RunEditor(desc, _, **kwargs):
2073 self.assertEquals(
2074 '# Enter a description of the change.\n'
2075 '# This will be displayed on the codereview site.\n'
2076 '# The first line will also be used as the subject of the review.\n'
2077 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002078 '--------------------\n'
2079 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002080 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002081 # Simulate user changing something.
2082 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002083
dsansomee2d6fd92016-09-08 00:10:47 -07002084 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002085 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002086
2087 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2088 self.mock(git_cl.Changelist, 'GetDescription',
2089 lambda *args: current_desc)
2090 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2091 UpdateDescriptionRemote)
2092 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2093
2094 self.calls = [
2095 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002096 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002097 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2098 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002099 ((['git', 'config', 'core.editor'],), 'vi'),
2100 ]
2101 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2102
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002103 def test_description_set_stdin(self):
2104 out = StringIO.StringIO()
2105 self.mock(git_cl.sys, 'stdout', out)
2106
2107 self.mock(git_cl, 'Changelist', ChangelistMock)
2108 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2109
2110 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2111 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2112
kmarshall3bff56b2016-06-06 18:31:47 -07002113 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002114 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2115
kmarshall3bff56b2016-06-06 18:31:47 -07002116 self.calls = \
2117 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2118 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002119 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002120 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2121 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002122 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2123 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2124 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002125 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2126 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2127 ((['git', 'branch', '-D', 'foo'],), '')]
2128
kmarshall3bff56b2016-06-06 18:31:47 -07002129 self.mock(git_cl, 'get_cl_statuses',
2130 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002131 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2132 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2133 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002134
2135 self.assertEqual(0, git_cl.main(['archive', '-f']))
2136
2137 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002138 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002139 self.calls = \
2140 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2141 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002142 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002143 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2144 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002145 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2146
kmarshall9249e012016-08-23 12:02:16 -07002147 self.mock(git_cl, 'get_cl_statuses',
2148 lambda branches, fine_grained, max_processes:
2149 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2150
2151 self.assertEqual(1, git_cl.main(['archive', '-f']))
2152
2153 def test_archive_dry_run(self):
2154 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2155
2156 self.calls = \
2157 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2158 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2159 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2160 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2161 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2162 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2163 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2164 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2165 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002166
2167 self.mock(git_cl, 'get_cl_statuses',
2168 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002169 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2170 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2171 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002172
kmarshall9249e012016-08-23 12:02:16 -07002173 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2174
2175 def test_archive_no_tags(self):
2176 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2177
2178 self.calls = \
2179 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2180 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2181 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2182 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2183 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2184 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2185 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2186 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2187 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2188 ((['git', 'branch', '-D', 'foo'],), '')]
2189
2190 self.mock(git_cl, 'get_cl_statuses',
2191 lambda branches, fine_grained, max_processes:
2192 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2193 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2194 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2195
2196 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002197
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002198 def test_cmd_issue_erase_existing(self):
2199 out = StringIO.StringIO()
2200 self.mock(git_cl.sys, 'stdout', out)
2201 self.calls = [
2202 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002203 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2204 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002205 # Let this command raise exception (retcode=1) - it should be ignored.
2206 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002207 CERR1),
2208 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2209 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002210 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2211 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2212 ''),
2213 ]
2214 self.assertEqual(0, git_cl.main(['issue', '0']))
2215
phajdan.jre328cf92016-08-22 04:12:17 -07002216 def test_cmd_issue_json(self):
2217 out = StringIO.StringIO()
2218 self.mock(git_cl.sys, 'stdout', out)
2219 self.calls = [
2220 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002221 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002222 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2223 ((['git', 'config', 'rietveld.server'],),
2224 'https://codereview.chromium.org'),
2225 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2226 (('write_json', 'output.json',
2227 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2228 ''),
2229 ]
2230 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2231
tandriide281ae2016-10-12 06:02:30 -07002232 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002233 self.mock(git_cl.Changelist, 'GetChange',
2234 lambda _, *a: (
2235 self._mocked_call(['GetChange']+list(a))))
2236 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2237 lambda *_, **__: (
2238 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002239 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2240 lambda _, s: self._mocked_call(['SetCQState', s]))
2241 self.calls = [
2242 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002243 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002244 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2245 ((['git', 'config', 'rietveld.server'],),
2246 'https://codereview.chromium.org'),
2247 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2248 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2249 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2250 ((['get_or_create_merge_base', 'feature', 'feature'],),
2251 'fake_ancestor_sha'),
2252 ((['GetChange', 'fake_ancestor_sha', None], ),
2253 git_cl.presubmit_support.GitChange(
2254 '', '', '', '', '', '', '', '')),
2255 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2256 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002257 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2258 ]
2259 out = StringIO.StringIO()
2260 self.mock(git_cl.sys, 'stdout', out)
2261 self.assertEqual(0, git_cl.main(['try']))
2262 self.assertEqual(
2263 out.getvalue(),
2264 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2265
tandrii8c5a3532016-11-04 07:52:02 -07002266 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2267 self.mock(git_cl.Changelist, 'GetChange',
2268 lambda _, *a: (
2269 self._mocked_call(['GetChange']+list(a))))
2270 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2271 lambda *_, **__: (
2272 self._mocked_call(['DoGetTryMasters'])))
2273 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2274 lambda _, s: self._mocked_call(['SetCQState', s]))
2275
tandrii8c5a3532016-11-04 07:52:02 -07002276 self.calls = [
2277 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2278 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2279 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2280 ((['git', 'config', 'branch.feature.gerritserver'],),
2281 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002282 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2283 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2284 'project': 'depot_tools',
2285 'status': 'OPEN',
2286 'owner': {'email': 'owner@e.mail'},
2287 'revisions': {
2288 'deadbeaf': {
2289 '_number': 6,
2290 },
2291 'beeeeeef': {
2292 '_number': 7,
2293 'fetch': {'http': {
2294 'url': 'https://chromium.googlesource.com/depot_tools',
2295 'ref': 'refs/changes/56/123456/7'
2296 }},
2297 },
2298 },
2299 }),
tandrii8c5a3532016-11-04 07:52:02 -07002300 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2301 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2302 ((['get_or_create_merge_base', 'feature', 'feature'],),
2303 'fake_ancestor_sha'),
2304 ((['GetChange', 'fake_ancestor_sha', None], ),
2305 git_cl.presubmit_support.GitChange(
2306 '', '', '', '', '', '', '', '')),
2307 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2308 ((['DoGetTryMasters'], ), None),
2309 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2310 ]
2311 out = StringIO.StringIO()
2312 self.mock(git_cl.sys, 'stdout', out)
2313 self.assertEqual(0, git_cl.main(['try']))
2314 self.assertEqual(
2315 out.getvalue(),
2316 'scheduled CQ Dry Run on '
2317 'https://chromium-review.googlesource.com/123456\n')
2318
2319 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2320 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2321 lambda _: {
2322 'owner_email': 'owner@e.mail',
2323 'private': False,
2324 'closed': False,
2325 'project': 'depot_tools',
2326 'patchsets': [20001],
2327 })
tandriide281ae2016-10-12 06:02:30 -07002328 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2329 self.calls = [
2330 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2331 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2332 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2333 ((['git', 'config', 'rietveld.server'],),
2334 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002335 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002336 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002337 ]
2338
2339 def _buildbucket_retry(*_, **kw):
2340 # self.maxDiff = 10000
2341 body = json.loads(kw['body'])
2342 self.assertEqual(len(body['builds']), 1)
2343 build = body['builds'][0]
2344 params = json.loads(build.pop('parameters_json'))
2345 self.assertEqual(params, {
2346 u'builder_name': u'win',
2347 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2348 u'revision': None}],
2349 u'properties': {
2350 u'category': u'git_cl_try',
2351 u'issue': 123,
2352 u'key': u'val',
2353 u'json': [{u'a': 1}, None],
2354 u'master': u'tryserver.chromium',
2355 u'patch_project': u'depot_tools',
2356 u'patch_storage': u'rietveld',
2357 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002358 u'rietveld': u'https://codereview.chromium.org',
2359 }
2360 })
2361 self.assertEqual(build, {
2362 u'bucket': u'master.tryserver.chromium',
2363 u'client_operation_id': u'uuid4',
2364 u'tags': [u'builder:win',
2365 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002366 u'user_agent:git_cl_try',
2367 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002368 })
2369
2370 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2371
2372 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2373 self.assertEqual(0, git_cl.main([
2374 'try', '-m', 'tryserver.chromium', '-b', 'win',
2375 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2376 self.assertRegexpMatches(
2377 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002378 'Tried jobs on:\nBucket: master.tryserver.chromium')
2379
tandrii8c5a3532016-11-04 07:52:02 -07002380 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2381 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2382 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2383
tandrii8c5a3532016-11-04 07:52:02 -07002384 self.calls = [
2385 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2386 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2387 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2388 ((['git', 'config', 'branch.feature.gerritserver'],),
2389 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002390 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002391 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002392 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002393 'status': 'OPEN',
2394 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002395 'revisions': {
2396 'deadbeaf': {
2397 '_number': 6,
2398 },
2399 'beeeeeef': {
2400 '_number': 7,
2401 'fetch': {'http': {
2402 'url': 'https://chromium.googlesource.com/depot_tools',
2403 'ref': 'refs/changes/56/123456/7'
2404 }},
2405 },
2406 },
2407 }),
2408 ]
2409
2410 def _buildbucket_retry(*_, **kw):
2411 # self.maxDiff = 10000
2412 body = json.loads(kw['body'])
2413 self.assertEqual(len(body['builds']), 1)
2414 build = body['builds'][0]
2415 params = json.loads(build.pop('parameters_json'))
2416 self.assertEqual(params, {
2417 u'builder_name': u'win',
2418 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2419 u'revision': None}],
2420 u'properties': {
2421 u'category': u'git_cl_try',
2422 u'key': u'val',
2423 u'json': [{u'a': 1}, None],
2424 u'master': u'tryserver.chromium',
2425
2426 u'patch_gerrit_url':
2427 u'https://chromium-review.googlesource.com',
2428 u'patch_issue': 123456,
2429 u'patch_project': u'depot_tools',
2430 u'patch_ref': u'refs/changes/56/123456/7',
2431 u'patch_repository_url':
2432 u'https://chromium.googlesource.com/depot_tools',
2433 u'patch_set': 7,
2434 u'patch_storage': u'gerrit',
2435 }
2436 })
2437 self.assertEqual(build, {
2438 u'bucket': u'master.tryserver.chromium',
2439 u'client_operation_id': u'uuid4',
2440 u'tags': [
2441 u'builder:win',
2442 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2443 u'user_agent:git_cl_try',
2444 u'master:tryserver.chromium'],
2445 })
2446
2447 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2448
2449 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2450 self.assertEqual(0, git_cl.main([
2451 'try', '-m', 'tryserver.chromium', '-b', 'win',
2452 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2453 self.assertRegexpMatches(
2454 git_cl.sys.stdout.getvalue(),
2455 'Tried jobs on:\nBucket: master.tryserver.chromium')
2456
borenet6c0efe62016-10-19 08:13:29 -07002457 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002458 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2459 lambda _: {
2460 'owner_email': 'owner@e.mail',
2461 'private': False,
2462 'closed': False,
2463 'project': 'depot_tools',
2464 'patchsets': [20001],
2465 })
borenet6c0efe62016-10-19 08:13:29 -07002466 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2467 self.calls = [
2468 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2469 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2470 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2471 ((['git', 'config', 'rietveld.server'],),
2472 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002473 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002474 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002475 ]
2476
2477 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002478 body = json.loads(kw['body'])
2479 self.assertEqual(len(body['builds']), 1)
2480 build = body['builds'][0]
2481 params = json.loads(build.pop('parameters_json'))
2482 self.assertEqual(params, {
2483 u'builder_name': u'win',
2484 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2485 u'revision': None}],
2486 u'properties': {
2487 u'category': u'git_cl_try',
2488 u'issue': 123,
2489 u'patch_project': u'depot_tools',
2490 u'patch_storage': u'rietveld',
2491 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002492 u'rietveld': u'https://codereview.chromium.org',
2493 }
2494 })
2495 self.assertEqual(build, {
2496 u'bucket': u'test.bucket',
2497 u'client_operation_id': u'uuid4',
2498 u'tags': [u'builder:win',
2499 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2500 u'user_agent:git_cl_try'],
2501 })
2502
2503 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2504
2505 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2506 self.assertEqual(0, git_cl.main([
2507 'try', '-B', 'test.bucket', '-b', 'win']))
2508 self.assertRegexpMatches(
2509 git_cl.sys.stdout.getvalue(),
2510 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002511
qyearsley123a4682016-10-26 09:12:17 -07002512 def test_git_cl_try_bots_on_multiple_masters(self):
2513 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2514 self.calls = [
2515 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2516 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2517 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2518 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002519 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002520 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2521 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2522 ]
2523
2524 def _buildbucket_retry(*_, **kw):
2525 body = json.loads(kw['body'])
2526 self.assertEqual(len(body['builds']), 2)
2527
2528 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2529 self.assertEqual(first_build_params['builder_name'], 'builder1')
2530 self.assertEqual(first_build_params['properties']['master'], 'master1')
2531
2532 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2533 self.assertEqual(first_build_params['builder_name'], 'builder2')
2534 self.assertEqual(first_build_params['properties']['master'], 'master2')
2535
2536 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2537
2538 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2539 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2540
2541 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2542 self.assertEqual(
2543 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2544 self.assertEqual(
2545 git_cl.sys.stdout.getvalue(),
2546 'Tried jobs on:\n'
2547 'Bucket: master.master1\n'
2548 ' builder1: []\n'
2549 'Bucket: master.master2\n'
2550 ' builder2: []\n'
2551 'To see results here, run: git cl try-results\n'
2552 'To see results in browser, run: git cl web\n')
2553
tandrii16e0b4e2016-06-07 10:34:28 -07002554 def _common_GerritCommitMsgHookCheck(self):
2555 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2556 self.mock(git_cl.os.path, 'abspath',
2557 lambda path: self._mocked_call(['abspath', path]))
2558 self.mock(git_cl.os.path, 'exists',
2559 lambda path: self._mocked_call(['exists', path]))
2560 self.mock(git_cl.gclient_utils, 'FileRead',
2561 lambda path: self._mocked_call(['FileRead', path]))
2562 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2563 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2564 self.calls = [
2565 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2566 ((['abspath', '../'],), '/abs/git_repo_root'),
2567 ]
2568 return git_cl.Changelist(codereview='gerrit', issue=123)
2569
2570 def test_GerritCommitMsgHookCheck_custom_hook(self):
2571 cl = self._common_GerritCommitMsgHookCheck()
2572 self.calls += [
2573 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2574 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2575 '#!/bin/sh\necho "custom hook"')
2576 ]
2577 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2578
2579 def test_GerritCommitMsgHookCheck_not_exists(self):
2580 cl = self._common_GerritCommitMsgHookCheck()
2581 self.calls += [
2582 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2583 ]
2584 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2585
2586 def test_GerritCommitMsgHookCheck(self):
2587 cl = self._common_GerritCommitMsgHookCheck()
2588 self.calls += [
2589 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2590 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2591 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2592 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2593 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2594 ''),
2595 ]
2596 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2597
tandriic4344b52016-08-29 06:04:54 -07002598 def test_GerritCmdLand(self):
2599 self.calls += [
2600 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2601 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2602 'deadbeaf'),
2603 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2604 ((['git', 'config', 'branch.feature.gerritserver'],),
2605 'chromium-review.googlesource.com'),
2606 ]
2607 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2608 cl._codereview_impl._GetChangeDetail = lambda _: {
2609 'labels': {},
2610 'current_revision': 'deadbeaf',
2611 }
agable32978d92016-11-01 12:55:02 -07002612 cl._codereview_impl._GetChangeCommit = lambda: {
2613 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002614 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002615 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2616 }
tandriic4344b52016-08-29 06:04:54 -07002617 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002618 out = StringIO.StringIO()
2619 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002620 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002621 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002622 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002623
tandrii221ab252016-10-06 08:12:04 -07002624 BUILDBUCKET_BUILDS_MAP = {
2625 '9000': {
2626 'id': '9000',
2627 'status': 'STARTED',
2628 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2629 'result_details_json': '{"properties": {}}',
2630 'bucket': 'master.x.y',
2631 'created_by': 'user:someone@chromium.org',
2632 'created_ts': '147200002222000',
2633 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2634 },
2635 '8000': {
2636 'id': '8000',
2637 'status': 'COMPLETED',
2638 'result': 'FAILURE',
2639 'failure_reason': 'BUILD_FAILURE',
2640 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2641 'result_details_json': '{"properties": {}}',
2642 'bucket': 'master.x.y',
2643 'created_by': 'user:someone@chromium.org',
2644 'created_ts': '147200001111000',
2645 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2646 },
2647 }
2648
2649 def test_write_try_results_json(self):
2650 expected_output = [
2651 {
2652 'buildbucket_id': '8000',
2653 'bucket': 'master.x.y',
2654 'builder_name': 'my-builder',
2655 'status': 'COMPLETED',
2656 'result': 'FAILURE',
2657 'failure_reason': 'BUILD_FAILURE',
2658 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2659 },
2660 {
2661 'buildbucket_id': '9000',
2662 'bucket': 'master.x.y',
2663 'builder_name': 'my-builder',
2664 'status': 'STARTED',
2665 'result': None,
2666 'failure_reason': None,
2667 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2668 }
2669 ]
2670 self.calls = [(('write_json', 'output.json', expected_output), '')]
2671 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2672
tandrii45b2a582016-10-11 03:14:16 -07002673 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002674 out = StringIO.StringIO()
2675 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002676 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2677 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002678 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2679 self._mocked_call(['get_authenticator_for_host', host]))
2680 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2681 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002682
2683 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2684 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002685 self.calls += [
2686 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2687 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2688 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2689 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2690 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2691 ((['git', 'config', 'branch.feature.rietveldserver'],),
2692 'codereview.example.com'),
2693 ((['get_authenticator_for_host', 'codereview.example.com'],),
2694 AuthenticatorMock()),
2695 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2696
2697 def test_fetch_try_jobs_none_rietveld(self):
2698 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002699 # Simulate that user isn't logged in.
2700 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002701 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002702 self.assertRegexpMatches(sys.stdout.getvalue(),
2703 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002704 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2705
2706 def test_fetch_try_jobs_some_rietveld(self):
2707 self._setup_fetch_try_jobs_rietveld({
2708 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2709 })
2710 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002711 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2712 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2713 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2714
2715 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2716 self._setup_fetch_try_jobs(most_recent_patchset=13)
2717 self.calls += [
2718 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2719 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2720 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002721 # TODO(tandrii): Uncomment the below if we decide to support checking
2722 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002723 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002724 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002725 ((['git', 'config', 'branch.feature.gerritserver'],),
2726 'https://x-review.googlesource.com'),
2727 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2728 AuthenticatorMock()),
2729 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2730
2731 def test_fetch_try_jobs_none_gerrit(self):
2732 self._setup_fetch_try_jobs_gerrit({})
2733 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002734 # TODO(tandrii): Uncomment the below if we decide to support checking
2735 # patchsets for Gerrit.
2736 # self.assertRegexpMatches(
2737 # sys.stdout.getvalue(),
2738 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002739 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2740
2741 def test_fetch_try_jobs_some_gerrit(self):
2742 self._setup_fetch_try_jobs_gerrit({
2743 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2744 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002745 # TODO(tandrii): Uncomment the below if we decide to support checking
2746 # patchsets for Gerrit.
2747 # self.calls.remove(
2748 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002749 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2750
2751 # ... and doesn't result in warning.
2752 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2753 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002754 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2755 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2756
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002757 def _mock_gerrit_changes_for_detail_cache(self):
2758 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002759
2760 def test_gerrit_change_detail_cache_normalize(self):
2761 self._mock_gerrit_changes_for_detail_cache()
2762 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002763 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002764 ]
2765 cl = git_cl.Changelist(codereview='gerrit')
2766 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2767 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2768 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2769 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2770
2771 def test_gerrit_change_detail_cache_simple(self):
2772 self._mock_gerrit_changes_for_detail_cache()
2773 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002774 (('GetChangeDetail', 'host', '1', []), 'a'),
2775 (('GetChangeDetail', 'host', '2', []), 'b'),
2776 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002777 ]
2778 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2779 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2780 self.assertEqual(cl._GetChangeDetail(), 'a')
2781 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002782 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002783 self.assertEqual(cl._GetChangeDetail(), 'a')
2784 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2785
2786 def test_gerrit_change_detail_cache_options(self):
2787 self._mock_gerrit_changes_for_detail_cache()
2788 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002789 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2790 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2791 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2792 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002793 ]
2794 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2795 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2796 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2797 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2798 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2799 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2800 self.assertEqual(cl._GetChangeDetail(), 'cab')
2801
2802 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2803 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2804 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2805 self.assertEqual(cl._GetChangeDetail(), 'cab')
2806
2807 # Finally, no_cache should invalidate all caches for given change.
2808 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2809 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2810
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002811
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002812if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01002813 logging.basicConfig(
2814 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002815 unittest.main()