blob: 2542d62b1cf0dabdf394a2c81f1c66c8a1b2d103 [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)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000468 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
469 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700470 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100471 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000472 # It's important to reset settings to not have inter-tests interference.
473 git_cl.settings = None
474
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000475
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000476 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000477 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100478 self.assertEquals([], self.calls)
479 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000480 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100481 raise
482 # Sadly, has_failed() returns True if this OR any other tests before this
483 # one have failed.
484 git_cl.logging.exception(
485 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
486 'There are un-consumed self.calls after this test has finished.\n'
487 'If you don\'t know which test this is, run:\n'
488 ' tests/git_cl_tests.py -v\n'
489 '\n'
490 'If you are already running just this single test, then **first** '
491 'fix the problem whose exception is emitted below by unittest '
492 'runner.\n'
493 '\n'
494 'Else, to be sure what\'s going on, run this test **alone** with \n'
495 ' tests/git_cl_tests.py TestGitCl.<name>\n'
496 'and follow instructions above.\n' +
497 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000498 finally:
499 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000500
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000501 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000502 self.assertTrue(
503 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700504 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000505 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000506 expected_args, result = top
507
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000508 # Also logs otherwise it could get caught in a try/finally and be hard to
509 # diagnose.
510 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700511 N = 5
512 prior_calls = '\n '.join(
513 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
514 for i, c in enumerate(self._calls_done[-N:]))
515 following_calls = '\n '.join(
516 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
517 for i, c in enumerate(self.calls[:N]))
518 extended_msg = (
519 'A few prior calls:\n %s\n\n'
520 'This (expected):\n @%d: %r\n'
521 'This (actual):\n @%d: %r\n\n'
522 'A few following expected calls:\n %s' %
523 (prior_calls, len(self._calls_done), expected_args,
524 len(self._calls_done), args, following_calls))
525 git_cl.logging.error(extended_msg)
526
tandrii99a72f22016-08-17 14:33:24 -0700527 self.fail('@%d\n'
528 ' Expected: %r\n'
529 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700530 len(self._calls_done), expected_args, args))
531
532 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700533 if isinstance(result, Exception):
534 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000535 return result
536
tandrii48df5812016-10-17 03:55:37 -0700537 def test_LoadCodereviewSettingsFromFile_gerrit(self):
538 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
539 self.calls = [
540 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
541 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
542 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
543 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
544 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
545 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700546 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
547 CERR1),
548 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700549 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
550 CERR1),
551 ((['git', 'config', 'gerrit.host', 'true'],), ''),
552 ]
553 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
554
maruel@chromium.orga3353652011-11-30 14:26:57 +0000555 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000556 def _is_gerrit_calls(cls, gerrit=False):
557 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
558 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
559
560 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000561 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000562 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000563 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000564
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000565 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000566 def _upload_no_rev_calls(cls, similarity, find_copies):
567 return (cls._git_base_calls(similarity, find_copies) +
568 cls._git_upload_no_rev_calls())
569
570 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000571 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000572 if similarity is None:
573 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700574 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700575 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000576 else:
tandrii33a46ff2016-08-23 05:53:40 -0700577 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700578 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000579
580 if find_copies is None:
581 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700582 find_copies_call = ((['git', 'config', '--bool',
583 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000584 else:
tandrii5d48c322016-08-18 16:19:37 -0700585 val = str(find_copies).lower()
586 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000587 'branch.master.git-find-copies', val],), '')
588
589 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000590 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800591 '-l100000', '-C'+similarity,
592 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000593 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000594 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000595 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000596
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000597 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000598 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000599 similarity_call,
600 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
601 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000602 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000603 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700604 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
605 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000606 ((['git', 'config', 'rietveld.server'],),
607 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000608 ((['git', 'config', 'branch.master.merge'],), 'master'),
609 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000610 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000611 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000612 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000613 ((['git', 'rev-parse', '--show-cdup'],), ''),
614 ((['git', 'rev-parse', 'HEAD'],), '12345'),
615 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000616 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000617 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700618 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000619 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000620 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000621 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000622 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000623 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000624 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000625 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000626 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000627 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000628 ]
629
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000630 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000631 def _git_upload_no_rev_calls(cls):
632 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000633 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000634 ]
635
636 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000637 def _git_upload_calls(cls, private):
638 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000639 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000640 private_call = []
641 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000642 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000643 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000644 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000645
maruel@chromium.orga3353652011-11-30 14:26:57 +0000646 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000647 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000648 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000649 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800650 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000651 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700652 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000653 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000654 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000655 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700656 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000657 ] + cls._git_post_upload_calls()
658
659 @classmethod
660 def _git_post_upload_calls(cls):
661 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000662 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
663 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
664 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000665 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000666 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000667 ]
668
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000669 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000670 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000671 fake_ancestor = 'fake_ancestor'
672 fake_cl = 'fake_cl_for_patch'
673 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000674 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000675 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000676 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000677 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000678 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000679 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000680 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000681 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700682 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000683 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000684 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000685 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000686 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000687 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000688 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000689 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000690 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000691 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000692 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000693 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000694
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000695 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700696 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000697 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000698 return [
699 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000700 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000701 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000702 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700703 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000704 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000705 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100706 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000707 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000708 ]
709
710 def _run_reviewer_test(
711 self,
712 upload_args,
713 expected_description,
714 returned_description,
715 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000716 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700717 private=False,
718 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000719 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000720 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000721 try:
722 similarity = upload_args[upload_args.index('--similarity')+1]
723 except ValueError:
724 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000725
726 if '--find-copies' in upload_args:
727 find_copies = True
728 elif '--no-find-copies' in upload_args:
729 find_copies = False
730 else:
731 find_copies = None
732
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000733 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700734 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000735
736 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000737
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000738 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000739 self.assertEquals(
740 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000741 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000742 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000743 '#--------------------This line is 72 characters long'
744 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000745 expected_description,
746 desc)
747 return returned_description
748 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000749
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000750 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000751 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700752 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000753 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000754 return 1, 2
755 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000756
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000757 git_cl.main(['upload'] + upload_args)
758
759 def test_no_reviewer(self):
760 self._run_reviewer_test(
761 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000762 'desc\n\nBUG=',
763 '# Blah blah comment.\ndesc\n\nBUG=',
764 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000765 [])
766
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000767 def test_keep_similarity(self):
768 self._run_reviewer_test(
769 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000770 'desc\n\nBUG=',
771 '# Blah blah comment.\ndesc\n\nBUG=',
772 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000773 [])
774
iannucci@chromium.org79540052012-10-19 23:15:26 +0000775 def test_keep_find_copies(self):
776 self._run_reviewer_test(
777 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000778 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000779 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000780 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000781 [])
782
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000783 def test_private(self):
784 self._run_reviewer_test(
785 ['--private'],
786 'desc\n\nBUG=',
787 '# Blah blah comment.\ndesc\n\nBUG=\n',
788 'desc\n\nBUG=',
789 [])
790
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000791 def test_reviewers_cmd_line(self):
792 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000793 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000794 self._run_reviewer_test(
795 ['-r' 'foo@example.com'],
796 description,
797 '\n%s\n' % description,
798 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000799 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000800
801 def test_reviewer_tbr_overriden(self):
802 # Reviewer is overriden with TBR
803 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000804 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000805 self._run_reviewer_test(
806 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000807 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000808 description.strip('\n'),
809 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000810 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000811
812 def test_reviewer_multiple(self):
813 # Handles multiple R= or TBR= lines.
814 description = (
bradnelsond975b302016-10-23 12:20:23 -0700815 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
816 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000817 self._run_reviewer_test(
818 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000819 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000820 description,
821 description,
bradnelsond975b302016-10-23 12:20:23 -0700822 ['--reviewers=another@example.com,reviewer@example.com'],
823 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000824
maruel@chromium.orga3353652011-11-30 14:26:57 +0000825 def test_reviewer_send_mail(self):
826 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000827 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000828 self._run_reviewer_test(
829 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000830 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000831 description.strip('\n'),
832 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000833 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000834
835 def test_reviewer_send_mail_no_rev(self):
836 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000837 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700838 self.calls = self._upload_no_rev_calls(None, None) + [
839 ((['DieWithError', 'Must specify reviewers to send email.'],),
840 SystemExitMock())
841 ]
842
843 def RunEditor(desc, _, **kwargs):
844 return desc
845 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
846 self.mock(sys, 'stdout', stdout)
847 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000848 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700849 self.assertEqual(
850 'Using 50% similarity for rename/copy detection. Override with '
851 '--similarity.\n',
852 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000853
tandriif9aefb72016-07-01 09:06:51 -0700854 def test_bug_on_cmd(self):
855 self._run_reviewer_test(
856 ['--bug=500658,proj:123'],
857 'desc\n\nBUG=500658\nBUG=proj:123',
858 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
859 'desc\n\nBUG=500658\nBUG=proj:1234',
860 [])
861
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100862 def _land_rietveld_common(self, debug=False):
863 if debug:
864 # Very useful due to finally clause in git cl land raising exceptions and
865 # shadowing real cause of failure.
866 self.mock(git_cl, '_IS_BEING_TESTED', True)
867 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100868 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100869
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100870 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
871 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100872 self.mock(RietveldMock, 'update_description', staticmethod(
873 lambda i, d: self._mocked_call(['update_description', i, d])))
874 self.mock(RietveldMock, 'add_comment', staticmethod(
875 lambda i, c: self._mocked_call(['add_comment', i, c])))
876 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100877 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
878 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
879 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
880 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
881 CERR1),
882 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
883 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800884 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100885 ((['git', 'config', 'rietveld.server'],),
886 'https://codereview.chromium.org'),
887 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
888 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
889 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
890 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100891 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
892 ''), # No commits to rebase, according to local view of origin.
893 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
894 'fake_ancestor_sha'),
895 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
896 ((['git', 'rev-parse', '--show-cdup'],), ''),
897 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
898 ((['git', 'diff', '--name-status', '--no-renames', '-r',
899 'fake_ancestor_sha...', '.'],),
900 'M\tfile1.cpp'),
901 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
902 ((['git', 'config', 'branch.feature.rietveldserver'],),
903 'https://codereview.chromium.org'),
904 ((['git', 'config', 'user.email'],), 'user@e.mail'),
905 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
906 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
907 'fake_ancestor_sha', 'feature'],),
908 # This command just prints smth like this:
909 # file1.cpp | 53 ++++++--
910 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
911 ''),
912 ((['git', 'show-ref', '--quiet', '--verify',
913 'refs/heads/git-cl-commit'],),
914 ''), # 0 return code means branch exists.
915 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
916 ((['git', 'show-ref', '--quiet', '--verify',
917 'refs/heads/git-cl-cherry-pick'],),
918 CERR1), # This means git-cl-cherry-pick branch does not exist.
919 ((['git', 'rev-parse', '--show-cdup'],), ''),
920 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
921 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
922 ((['git', 'commit', '-m',
923 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100924 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100925 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
926 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
927 ((['git', 'config', '--get', 'remote.origin.url'],),
928 'https://chromium.googlesource.com/infra/infra'),
929 ]
930
931 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100932 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100933 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100934 ((['git', 'config', 'remote.origin.url'],),
935 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100936 (('_is_git_numberer_enabled',
937 'https://chromium.googlesource.com/infra/infra',
938 'refs/heads/master'),
939 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100940 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
941 ''),
942 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
943 ((['git', 'checkout', '-q', 'feature'],), ''),
944 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
945 ((['git', 'config', 'rietveld.viewvc-url'],),
946 'https://chromium.googlesource.com/infra/infra/+/'),
947 ((['update_description', 123,
948 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
949 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
950 ''),
951 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
952 'fake_sha_rebased (presubmit successful).'],), ''),
953 ]
954 git_cl.main(['land'])
955
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100956 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100957 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100958
959 # Special mocks to check validity of timestamp.
960 original_git_amend_head = git_cl._git_amend_head
961 def _git_amend_head_mock(msg, tstamp):
962 self._mocked_call(['git_amend_head committer timestamp', tstamp])
963 return original_git_amend_head(msg, tstamp)
964 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
965
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100966 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100967 ((['git', 'config', 'remote.origin.url'],),
968 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100969 (('_is_git_numberer_enabled',
970 'https://chromium.googlesource.com/chromium/src',
971 'refs/heads/master'),
972 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100973 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
974 'This is parent commit.\n'
975 '\n'
976 'Cr-Commit-Position: refs/heads/master@{#543}\n'
977 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100978 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
979 '1480022355'), # Committer's unix timestamp.
980 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
981 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100982
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100983 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100984 ((['git', 'commit', '--amend', '-m',
985 'Issue: 123\n\nR=john@chromium.org\n'
986 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100987 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100988 'Cr-Commit-Position: refs/heads/master@{#544}\n'
989 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
990
991 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
992 ''),
993 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
994 ((['git', 'checkout', '-q', 'feature'],), ''),
995 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
996 ((['git', 'config', 'rietveld.viewvc-url'],),
997 'https://chromium.googlesource.com/infra/infra/+/'),
998 ((['update_description', 123,
999 'Issue: 123\n\nR=john@chromium.org\n'
1000 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001001 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001002 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1003 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1004 'Committed: '
1005 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1006 ''),
1007 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1008 'fake_sha_rebased (presubmit successful).'],), ''),
1009 ]
1010 git_cl.main(['land'])
1011
1012 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001013 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001014 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001015 ((['git', 'config', 'remote.origin.url'],),
1016 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001017 (('_is_git_numberer_enabled',
1018 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1019 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001020
1021 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1022 'This is parent commit with no footer.'),
1023
1024 ((['git', 'checkout', '-q', 'feature'],), ''),
1025 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1026 ]
1027 with self.assertRaises(ValueError) as cm:
1028 git_cl.main(['land'])
1029 self.assertEqual(cm.exception.message,
1030 'Unable to infer commit position from footers')
1031
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001032 def test_git_numberer_not_whitelisted_repo(self):
1033 self.calls = []
1034 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001035 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1036 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001037 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001038
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001039 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001040 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1041 self.calls = [
1042 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001043 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001044 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001045 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001046 remote_url='https://chromium.googlesource.com/chromium/src',
1047 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001048 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001049
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001050 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001051 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001052 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001053 def fake_temporary_directory(**kwargs):
1054 yield tempdir
1055 self.mock(git_cl.gclient_utils, 'temporary_directory',
1056 fake_temporary_directory)
1057 self._test_GitNumbererState_valid_configs_inner(tempdir)
1058
1059 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001060 self.calls = [
1061 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001062 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001063 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1064 '''
1065 [plugin "git-numberer"]
1066 validate-enabled-refglob = refs/else/*
1067 validate-enabled-refglob = refs/heads/*
1068 validate-disabled-refglob = refs/heads/disabled
1069 validate-disabled-refglob = refs/branch-heads/*
1070 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001071 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1072 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001073 'refs/else/*\n'
1074 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001075 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1076 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001077 'refs/heads/disabled\n'
1078 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001079 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001080
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001081 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001082 remote_url='https://chromium.googlesource.com/chromium/src',
1083 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001084 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001085
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001086 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001087 remote_url='https://chromium.googlesource.com/chromium/src',
1088 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001089 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001090
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001091 # Validator is disabled by default, even if it's not explicitely in disabled
1092 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001093 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001094 remote_url='https://chromium.googlesource.com/chromium/src',
1095 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001096 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001097
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001098 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001099 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001100 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001101 if skip_auth_check:
1102 return [((cmd, ), 'true')]
1103
tandrii5d48c322016-08-18 16:19:37 -07001104 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001105 if issue:
1106 calls.extend([
1107 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1108 ])
1109 calls.extend([
1110 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1111 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1112 ((['git', 'config', 'remote.origin.url'],),
1113 'https://chromium.googlesource.com/my/repo'),
1114 ((['git', 'config', 'remote.origin.url'],),
1115 'https://chromium.googlesource.com/my/repo'),
1116 ])
1117 return calls
1118
1119 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001120 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001121 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001122 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001123 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001124 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001125 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001126 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1127 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001128 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001129 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001130 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1131 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001132 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001133 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001134 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001135 ((['get_or_create_merge_base', 'master',
1136 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001137 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001138 # Calls to verify branch point is ancestor
1139 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1140 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1141 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001142 ((['git', 'rev-parse', '--show-cdup'],), ''),
1143 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001144
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001145 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001146 'diff', '--name-status', '--no-renames', '-r',
1147 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001148 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001149 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001150 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001151 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001152 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001153 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001154 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001155 ((['git', 'config', 'user.email'],), 'me@example.com'),
1156 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001157 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1158 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001159 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001160 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001161
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001162 @classmethod
1163 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001164 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001165 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001166 ref_suffix='', title=None, notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001167 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001168 if post_amend_description is None:
1169 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001170 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001171 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001172
tandriia60502f2016-06-20 02:01:53 -07001173 if squash_mode == 'default':
1174 calls.extend([
1175 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1176 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1177 ])
1178 elif squash_mode in ('override_squash', 'override_nosquash'):
1179 calls.extend([
1180 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1181 'true' if squash_mode == 'override_squash' else 'false'),
1182 ])
1183 else:
1184 assert squash_mode in ('squash', 'nosquash')
1185
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001186 # If issue is given, then description is fetched from Gerrit instead.
1187 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001188 calls += [
1189 ((['git', 'log', '--pretty=format:%s\n\n%b',
1190 'fake_ancestor_sha..HEAD'],),
1191 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001192 if squash:
1193 title = 'Initial_upload'
1194 else:
1195 if not title:
1196 calls += [
1197 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1198 (('Title for patchset []: ',), 'User input'),
1199 ]
1200 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001201 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001202 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001203 # DownloadGerritHook(False)
1204 ((False, ),
1205 ''),
1206 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001207 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001208 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001209 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001210 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001211 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001212 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001213 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001214 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001215 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001216 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001217 if not issue:
1218 # Prompting to edit description on first upload.
1219 calls += [
1220 ((['git', 'config', 'core.editor'],), ''),
1221 ((['RunEditor'],), description),
1222 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001223 ref_to_push = 'abcdef0123456789'
1224 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001225 ((['git', 'config', 'branch.master.merge'],),
1226 'refs/heads/master'),
1227 ((['git', 'config', 'branch.master.remote'],),
1228 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001229 ((['get_or_create_merge_base', 'master',
1230 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001231 'origin/master'),
1232 ((['git', 'rev-parse', 'HEAD:'],),
1233 '0123456789abcdef'),
1234 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001235 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001236 ref_to_push),
1237 ]
1238 else:
1239 ref_to_push = 'HEAD'
1240
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001241 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001242 ((['git', 'rev-list',
1243 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001244 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001245
Aaron Gable9b713dd2016-12-14 16:04:21 -08001246 if title:
1247 if ref_suffix:
1248 ref_suffix += ',m=' + title
1249 else:
1250 ref_suffix = '%m=' + title
1251
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001252 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1253 if ref_suffix:
1254 ref_suffix += ',' + notify_suffix
1255 else:
1256 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001257
ukai@chromium.orge8077812012-02-03 03:41:46 +00001258 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001259 ref_suffix += ',' + ','.join('r=%s' % email
1260 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001261 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001262 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001263 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001264 ('remote:\n'
1265 'remote: Processing changes: (\)\n'
1266 'remote: Processing changes: (|)\n'
1267 'remote: Processing changes: (/)\n'
1268 'remote: Processing changes: (-)\n'
1269 'remote: Processing changes: new: 1 (/)\n'
1270 'remote: Processing changes: new: 1, done\n'
1271 'remote:\n'
1272 'remote: New Changes:\n'
1273 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1274 'remote:\n'
1275 'To https://chromium.googlesource.com/yyy/zzz\n'
1276 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001277 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001278 if squash:
1279 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001280 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001281 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001282 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001283 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001284 ((['git', 'config', 'branch.master.gerritsquashhash',
1285 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001286 ]
tandrii88189772016-09-29 04:29:57 -07001287 calls += [
1288 ((['git', 'config', 'rietveld.cc'],), ''),
1289 ((['AddReviewers', 'chromium-review.googlesource.com',
1290 123456 if squash else None,
Aaron Gable59f48512017-01-12 10:54:46 -08001291 ['joe@example.com'] + cc, False, notify],), ''),
tandrii88189772016-09-29 04:29:57 -07001292 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001293 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001294 return calls
1295
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001296 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001297 self,
1298 upload_args,
1299 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001300 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001301 squash=True,
1302 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001303 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001304 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001305 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001306 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001307 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001308 issue=None,
1309 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001310 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001311 if squash_mode is None:
1312 if '--no-squash' in upload_args:
1313 squash_mode = 'nosquash'
1314 elif '--squash' in upload_args:
1315 squash_mode = 'squash'
1316 else:
1317 squash_mode = 'default'
1318
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001319 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001320 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001321 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001322 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001323 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001324 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1325 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001326 self.mock(git_cl.gclient_utils, 'RunEditor',
1327 lambda *_, **__: self._mocked_call(['RunEditor']))
1328 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001329 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable59f48512017-01-12 10:54:46 -08001330 lambda h, i, add, is_reviewer, notify: self._mocked_call(
1331 ['AddReviewers', h, i, add, is_reviewer, notify]))
tandriia60502f2016-06-20 02:01:53 -07001332
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001333 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001334 self.calls += self._gerrit_upload_calls(
1335 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001336 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001337 expected_upstream_ref=expected_upstream_ref,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001338 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001339 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001340 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001341 # Uncomment when debugging.
1342 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001343 git_cl.main(['upload'] + upload_args)
1344
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001345 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001346 self._run_gerrit_upload_test(
1347 ['--no-squash'],
1348 'desc\n\nBUG=\n',
1349 [],
1350 squash=False,
1351 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1352
1353 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001354 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001355 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001356 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001357 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001358 [],
tandriia60502f2016-06-20 02:01:53 -07001359 squash=False,
1360 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001361 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001362
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001363 def test_gerrit_no_reviewer(self):
1364 self._run_gerrit_upload_test(
1365 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001366 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001367 [],
1368 squash=False,
1369 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001370
tandriieefe8322016-08-17 10:12:24 -07001371 def test_gerrit_patch_bad_chars(self):
1372 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001373 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001374 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001375 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001376 squash=False,
1377 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001378 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001379 self.assertIn(
1380 'WARNING: Patchset title may only contain alphanumeric chars '
1381 'and spaces. Cleaned up title:\nDont put bad chars\n',
1382 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001383
ukai@chromium.orge8077812012-02-03 03:41:46 +00001384 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001385 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001386 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001387 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001388 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001389 squash=False,
1390 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001391 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001392
1393 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001394 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001395 [],
bradnelsond975b302016-10-23 12:20:23 -07001396 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1397 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001398 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001399 ['reviewer@example.com', 'another@example.com'],
1400 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001401 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001402 ref_suffix='%l=Code-Review+1',
1403 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001404
1405 def test_gerrit_upload_squash_first_is_default(self):
1406 # Mock Gerrit CL description to indicate the first upload.
1407 self.mock(git_cl.Changelist, 'GetDescription',
1408 lambda *_: None)
1409 self._run_gerrit_upload_test(
1410 [],
1411 'desc\nBUG=\n\nChange-Id: 123456789',
1412 [],
1413 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001414
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001415 def test_gerrit_upload_squash_first(self):
1416 # Mock Gerrit CL description to indicate the first upload.
1417 self.mock(git_cl.Changelist, 'GetDescription',
1418 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001419 self._run_gerrit_upload_test(
1420 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001421 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001422 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001423 squash=True,
1424 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001425
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001426 def test_gerrit_upload_squash_reupload(self):
1427 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1428 # Mock Gerrit CL description to indicate re-upload.
1429 self.mock(git_cl.Changelist, 'GetDescription',
1430 lambda *args: description)
1431 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1432 lambda *args: 1)
1433 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1434 lambda *args: {'change_id': '123456789'})
1435 self._run_gerrit_upload_test(
1436 ['--squash'],
1437 description,
1438 [],
1439 squash=True,
1440 expected_upstream_ref='origin/master',
1441 issue=123456)
1442
rmistry@google.com2dd99862015-06-22 12:22:18 +00001443 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001444 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001445 def mock_run_git(*args, **_kwargs):
1446 if args[0] == ['for-each-ref',
1447 '--format=%(refname:short) %(upstream:short)',
1448 'refs/heads']:
1449 # Create a local branch dependency tree that looks like this:
1450 # test1 -> test2 -> test3 -> test4 -> test5
1451 # -> test3.1
1452 # test6 -> test0
1453 branch_deps = [
1454 'test2 test1', # test1 -> test2
1455 'test3 test2', # test2 -> test3
1456 'test3.1 test2', # test2 -> test3.1
1457 'test4 test3', # test3 -> test4
1458 'test5 test4', # test4 -> test5
1459 'test6 test0', # test0 -> test6
1460 'test7', # test7
1461 ]
1462 return '\n'.join(branch_deps)
1463 self.mock(git_cl, 'RunGit', mock_run_git)
1464
1465 class RecordCalls:
1466 times_called = 0
1467 record_calls = RecordCalls()
1468 def mock_CMDupload(*args, **_kwargs):
1469 record_calls.times_called += 1
1470 return 0
1471 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1472
1473 self.calls = [
1474 (('[Press enter to continue or ctrl-C to quit]',), ''),
1475 ]
1476
1477 class MockChangelist():
1478 def __init__(self):
1479 pass
1480 def GetBranch(self):
1481 return 'test1'
1482 def GetIssue(self):
1483 return '123'
1484 def GetPatchset(self):
1485 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001486 def IsGerrit(self):
1487 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001488
1489 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1490 # CMDupload should have been called 5 times because of 5 dependent branches.
1491 self.assertEquals(5, record_calls.times_called)
1492 self.assertEquals(0, ret)
1493
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001494 def test_gerrit_change_id(self):
1495 self.calls = [
1496 ((['git', 'write-tree'], ),
1497 'hashtree'),
1498 ((['git', 'rev-parse', 'HEAD~0'], ),
1499 'branch-parent'),
1500 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1501 'A B <a@b.org> 1456848326 +0100'),
1502 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1503 'C D <c@d.org> 1456858326 +0100'),
1504 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1505 'hashchange'),
1506 ]
1507 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1508 self.assertEqual(change_id, 'Ihashchange')
1509
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001510 def test_desecription_append_footer(self):
1511 for init_desc, footer_line, expected_desc in [
1512 # Use unique desc first lines for easy test failure identification.
1513 ('foo', 'R=one', 'foo\n\nR=one'),
1514 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1515 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1516 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1517 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1518 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1519 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1520 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1521 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1522 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1523 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1524 ]:
1525 desc = git_cl.ChangeDescription(init_desc)
1526 desc.append_footer(footer_line)
1527 self.assertEqual(desc.description, expected_desc)
1528
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001529 def test_update_reviewers(self):
1530 data = [
1531 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001532 ('foo\nR=xx', [], 'foo\nR=xx'),
1533 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001534 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001535 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1536 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1537 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001538 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001539 ('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 +00001540 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001541 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1542 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1543 # Same as the line before, but full of whitespaces.
1544 (
1545 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1546 'foo\nBar\n\nR=c@c\n BUG =',
1547 ),
1548 # Whitespaces aren't interpreted as new lines.
1549 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001550 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001551 expected = [i[2] for i in data]
1552 actual = []
1553 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001554 obj = git_cl.ChangeDescription(orig)
1555 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001556 actual.append(obj.description)
1557 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001558
wittman@chromium.org455dc922015-01-26 20:15:50 +00001559 def test_get_target_ref(self):
1560 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001561 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001562 self.assertEqual(None, git_cl.GetTargetRef(None,
1563 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001564 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001565
wittman@chromium.org455dc922015-01-26 20:15:50 +00001566 # Check default target refs for branches.
1567 self.assertEqual('refs/heads/master',
1568 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001569 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001570 self.assertEqual('refs/heads/master',
1571 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
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/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001575 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001576 self.assertEqual('refs/branch-heads/123',
1577 git_cl.GetTargetRef('origin',
1578 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001579 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001580 self.assertEqual('refs/diff/test',
1581 git_cl.GetTargetRef('origin',
1582 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001583 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001584 self.assertEqual('refs/heads/chrome/m42',
1585 git_cl.GetTargetRef('origin',
1586 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001587 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001588
1589 # Check target refs for user-specified target branch.
1590 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1591 'refs/remotes/branch-heads/123'):
1592 self.assertEqual('refs/branch-heads/123',
1593 git_cl.GetTargetRef('origin',
1594 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001595 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001596 for branch in ('origin/master', 'remotes/origin/master',
1597 'refs/remotes/origin/master'):
1598 self.assertEqual('refs/heads/master',
1599 git_cl.GetTargetRef('origin',
1600 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001601 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001602 for branch in ('master', 'heads/master', 'refs/heads/master'):
1603 self.assertEqual('refs/heads/master',
1604 git_cl.GetTargetRef('origin',
1605 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001606 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001607
wychen@chromium.orga872e752015-04-28 23:42:18 +00001608 def test_patch_when_dirty(self):
1609 # Patch when local tree is dirty
1610 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1611 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1612
1613 def test_diff_when_dirty(self):
1614 # Do 'git cl diff' when local tree is dirty
1615 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1616 self.assertNotEqual(git_cl.main(['diff']), 0)
1617
tandriidf09a462016-08-18 16:23:55 -07001618 def _patch_common(self, is_gerrit=False, force_codereview=False,
1619 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001620 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001621 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1622 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001623 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1624 lambda *args: {
1625 'current_revision': '7777777777',
1626 'revisions': {
1627 '1111111111': {
1628 '_number': 1,
1629 'fetch': {'http': {
1630 'url': 'https://chromium.googlesource.com/my/repo',
1631 'ref': 'refs/changes/56/123456/1',
1632 }},
1633 },
1634 '7777777777': {
1635 '_number': 7,
1636 'fetch': {'http': {
1637 'url': 'https://chromium.googlesource.com/my/repo',
1638 'ref': 'refs/changes/56/123456/7',
1639 }},
1640 },
1641 },
1642 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001643 self.mock(git_cl.Changelist, 'GetDescription',
1644 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001645 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1646
tandriidf09a462016-08-18 16:23:55 -07001647 if new_branch:
1648 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1649 else:
1650 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001651 if not force_codereview:
1652 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001653 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001654 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001655 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1656 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001657 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001658 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001659
1660 if is_gerrit:
1661 if not force_codereview:
1662 self.calls += [
1663 ((['git', 'config', 'gerrit.host'],), 'true'),
1664 ]
1665 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001666 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001667 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001668 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001669 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001670 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001671 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001672
tandriidf09a462016-08-18 16:23:55 -07001673 def _common_patch_successful(self, new_branch=False):
1674 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001675 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001676 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001677 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001678 'patch from issue 123456 at patchset 60001 ' +
1679 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001680 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001681 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001682 ((['git', 'config', 'branch.master.rietveldserver',
1683 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001684 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001685 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001686 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001687
1688 def test_patch_successful(self):
1689 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001690 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1691
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001692 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001693 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001694 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1695
wychen@chromium.orga872e752015-04-28 23:42:18 +00001696 def test_patch_conflict(self):
1697 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001698 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001699 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001700
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001701 def test_gerrit_patch_successful(self):
1702 self._patch_common(is_gerrit=True)
1703 self.calls += [
1704 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1705 'refs/changes/56/123456/7'],), ''),
1706 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001707 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001708 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001709 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1710 ((['git', 'config', 'branch.master.merge'],), 'master'),
1711 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1712 ((['git', 'config', 'remote.origin.url'],),
1713 'https://chromium.googlesource.com/my/repo'),
1714 ((['git', 'config', 'branch.master.gerritserver',
1715 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001716 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001717 ]
1718 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1719
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001720 def test_patch_force_codereview(self):
1721 self._patch_common(is_gerrit=True, force_codereview=True)
1722 self.calls += [
1723 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1724 'refs/changes/56/123456/7'],), ''),
1725 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1726 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001727 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001728 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001729 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1730 ((['git', 'config', 'branch.master.merge'],), 'master'),
1731 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1732 ((['git', 'config', 'remote.origin.url'],),
1733 'https://chromium.googlesource.com/my/repo'),
1734 ((['git', 'config', 'branch.master.gerritserver',
1735 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001736 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001737 ]
1738 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1739
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001740 def test_gerrit_patch_url_successful(self):
1741 self._patch_common(is_gerrit=True)
1742 self.calls += [
1743 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1744 'refs/changes/56/123456/1'],), ''),
1745 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001746 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001747 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001748 ((['git', 'config', 'branch.master.gerritserver',
1749 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001750 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001751 ]
1752 self.assertEqual(git_cl.main(
1753 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1754
1755 def test_gerrit_patch_conflict(self):
1756 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001757 self.calls += [
1758 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1759 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001760 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1761 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1762 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001763 ]
1764 with self.assertRaises(SystemExitMock):
1765 git_cl.main(['patch',
1766 'https://chromium-review.googlesource.com/#/c/123456/1'])
1767
tandriic2405f52016-10-10 08:13:15 -07001768 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001769 def notExists(_issue, *_, **kwargs):
1770 self.assertFalse(kwargs['ignore_404'])
1771 raise git_cl.gerrit_util.GerritError(404, '')
1772 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1773
tandriic2405f52016-10-10 08:13:15 -07001774 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001775 self.calls = [
1776 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1777 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1778 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1779 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1780 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1781 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001782 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001783 'or you have no access to it'],), SystemExitMock()),
1784 ]
1785 with self.assertRaises(SystemExitMock):
1786 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1787
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001788 def _checkout_calls(self):
1789 return [
1790 ((['git', 'config', '--local', '--get-regexp',
1791 'branch\\..*\\.rietveldissue'], ),
1792 ('branch.retrying.rietveldissue 1111111111\n'
1793 'branch.some-fix.rietveldissue 2222222222\n')),
1794 ((['git', 'config', '--local', '--get-regexp',
1795 'branch\\..*\\.gerritissue'], ),
1796 ('branch.ger-branch.gerritissue 123456\n'
1797 'branch.gbranch654.gerritissue 654321\n')),
1798 ]
1799
1800 def test_checkout_gerrit(self):
1801 """Tests git cl checkout <issue>."""
1802 self.calls = self._checkout_calls()
1803 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1804 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1805
1806 def test_checkout_rietveld(self):
1807 """Tests git cl checkout <issue>."""
1808 self.calls = self._checkout_calls()
1809 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1810 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1811
1812 def test_checkout_not_found(self):
1813 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001814 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001815 self.calls = self._checkout_calls()
1816 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1817
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001818 def test_checkout_no_branch_issues(self):
1819 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001820 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001821 self.calls = [
1822 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001823 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001824 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001825 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001826 ]
1827 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1828
tandrii@chromium.org28253532016-04-14 13:46:56 +00001829 def _test_gerrit_ensure_authenticated_common(self, auth,
1830 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001831 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1832 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1833 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001834 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001835 self.mock(git_cl, 'ask_for_data',
1836 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001837 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001838 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001839 cl.branch = 'master'
1840 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001841 cl.lookedup_issue = True
1842 return cl
1843
1844 def test_gerrit_ensure_authenticated_missing(self):
1845 cl = self._test_gerrit_ensure_authenticated_common(auth={
1846 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1847 })
1848 self.calls.append(
1849 ((['DieWithError',
1850 'Credentials for the following hosts are required:\n'
1851 ' chromium-review.googlesource.com\n'
1852 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1853 'You can (re)generate your credentails by visiting '
1854 'https://chromium-review.googlesource.com/new-password'],), ''),)
1855 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1856
1857 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001858 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001859 cl = self._test_gerrit_ensure_authenticated_common(auth={
1860 'chromium.googlesource.com': 'one',
1861 'chromium-review.googlesource.com': 'other',
1862 })
1863 self.calls.append(
1864 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001865 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001866 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1867
1868 def test_gerrit_ensure_authenticated_ok(self):
1869 cl = self._test_gerrit_ensure_authenticated_common(auth={
1870 'chromium.googlesource.com': 'same',
1871 'chromium-review.googlesource.com': 'same',
1872 })
1873 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1874
tandrii@chromium.org28253532016-04-14 13:46:56 +00001875 def test_gerrit_ensure_authenticated_skipped(self):
1876 cl = self._test_gerrit_ensure_authenticated_common(
1877 auth={}, skip_auth_check=True)
1878 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1879
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001880 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001881 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1882 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001883 self.calls = [
1884 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001885 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001886 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1887 ((['git', 'config', 'rietveld.server'],), ''),
1888 ((['git', 'config', 'rietveld.server'],), ''),
1889 ((['git', 'config', 'branch.feature.rietveldserver'],),
1890 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001891 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001892 ]
1893 self.assertEqual(0, git_cl.main(['set-commit']))
1894
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001895 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001896 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001897 lambda h, i, labels, notify=None:
1898 self._mocked_call(['SetReview', h, i, labels, notify]))
1899
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001900 self.calls = [
1901 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001902 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1903 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001904 ((['git', 'config', 'branch.feature.gerritserver'],),
1905 'https://chromium-review.googlesource.com'),
1906 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001907 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001908 ]
tandriid9e5ce52016-07-13 02:32:59 -07001909
1910 def test_cmd_set_commit_gerrit_clear(self):
1911 self._cmd_set_commit_gerrit_common(0)
1912 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1913
1914 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001915 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001916 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1917
tandriid9e5ce52016-07-13 02:32:59 -07001918 def test_cmd_set_commit_gerrit(self):
1919 self._cmd_set_commit_gerrit_common(2)
1920 self.assertEqual(0, git_cl.main(['set-commit']))
1921
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001922 def test_description_display(self):
1923 out = StringIO.StringIO()
1924 self.mock(git_cl.sys, 'stdout', out)
1925
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001926 self.mock(git_cl, 'Changelist', ChangelistMock)
1927 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001928
1929 self.assertEqual(0, git_cl.main(['description', '-d']))
1930 self.assertEqual('foo\n', out.getvalue())
1931
1932 def test_description_rietveld(self):
1933 out = StringIO.StringIO()
1934 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001935 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001936
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001937 self.assertEqual(0, git_cl.main([
1938 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1939 self.assertEqual('foobar\n', out.getvalue())
1940
iannucci3c972b92016-08-17 13:24:10 -07001941 def test_StatusFieldOverrideIssueMissingArgs(self):
1942 out = StringIO.StringIO()
1943 self.mock(git_cl.sys, 'stderr', out)
1944
1945 try:
1946 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1947 except SystemExit as ex:
1948 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001949 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001950
1951 out = StringIO.StringIO()
1952 self.mock(git_cl.sys, 'stderr', out)
1953
1954 try:
1955 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1956 except SystemExit as ex:
1957 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001958 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001959
1960 def test_StatusFieldOverrideIssue(self):
1961 out = StringIO.StringIO()
1962 self.mock(git_cl.sys, 'stdout', out)
1963
1964 def assertIssue(cl_self, *_args):
1965 self.assertEquals(cl_self.issue, 1)
1966 return 'foobar'
1967
1968 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1969 self.calls = [
1970 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1971 ((['git', 'config', 'rietveld.server'],), ''),
1972 ((['git', 'config', 'rietveld.server'],), ''),
1973 ]
iannuccie53c9352016-08-17 14:40:40 -07001974 self.assertEqual(
1975 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1976 0)
iannucci3c972b92016-08-17 13:24:10 -07001977 self.assertEqual(out.getvalue(), 'foobar\n')
1978
iannuccie53c9352016-08-17 14:40:40 -07001979 def test_SetCloseOverrideIssue(self):
1980 def assertIssue(cl_self, *_args):
1981 self.assertEquals(cl_self.issue, 1)
1982 return 'foobar'
1983
1984 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1985 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1986 self.calls = [
1987 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1988 ((['git', 'config', 'rietveld.server'],), ''),
1989 ((['git', 'config', 'rietveld.server'],), ''),
1990 ]
1991 self.assertEqual(
1992 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1993
1994 def test_SetCommitOverrideIssue(self):
1995 def assertIssue(cl_self, *_args):
1996 self.assertEquals(cl_self.issue, 1)
1997 return 'foobar'
1998
1999 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2000 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2001 self.calls = [
2002 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2003 ((['git', 'config', 'rietveld.server'],), ''),
2004 ((['git', 'config', 'rietveld.server'],), ''),
2005 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2006 ((['git', 'config', 'rietveld.server'],), ''),
2007 ((['git', 'config', 'rietveld.server'],), ''),
2008 ]
2009 self.assertEqual(
2010 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2011
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002012 def test_description_gerrit(self):
2013 out = StringIO.StringIO()
2014 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002015 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002016
2017 self.assertEqual(0, git_cl.main([
2018 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2019 self.assertEqual('foobar\n', out.getvalue())
2020
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002021 def test_description_set_raw(self):
2022 out = StringIO.StringIO()
2023 self.mock(git_cl.sys, 'stdout', out)
2024
2025 self.mock(git_cl, 'Changelist', ChangelistMock)
2026 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2027
2028 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2029 self.assertEqual('hihi', ChangelistMock.desc)
2030
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002031 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002032 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002033
2034 def RunEditor(desc, _, **kwargs):
2035 self.assertEquals(
2036 '# Enter a description of the change.\n'
2037 '# This will be displayed on the codereview site.\n'
2038 '# The first line will also be used as the subject of the review.\n'
2039 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002040 '--------------------\n'
2041 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002042 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002043 # Simulate user changing something.
2044 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002045
dsansomee2d6fd92016-09-08 00:10:47 -07002046 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002047 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002048
2049 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2050 self.mock(git_cl.Changelist, 'GetDescription',
2051 lambda *args: current_desc)
2052 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2053 UpdateDescriptionRemote)
2054 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2055
2056 self.calls = [
2057 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002058 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002059 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2060 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002061 ((['git', 'config', 'core.editor'],), 'vi'),
2062 ]
2063 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2064
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002065 def test_description_set_stdin(self):
2066 out = StringIO.StringIO()
2067 self.mock(git_cl.sys, 'stdout', out)
2068
2069 self.mock(git_cl, 'Changelist', ChangelistMock)
2070 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2071
2072 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2073 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2074
kmarshall3bff56b2016-06-06 18:31:47 -07002075 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002076 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2077
kmarshall3bff56b2016-06-06 18:31:47 -07002078 self.calls = \
2079 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2080 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002081 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002082 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2083 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002084 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2085 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2086 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002087 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2088 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2089 ((['git', 'branch', '-D', 'foo'],), '')]
2090
kmarshall3bff56b2016-06-06 18:31:47 -07002091 self.mock(git_cl, 'get_cl_statuses',
2092 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002093 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2094 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2095 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002096
2097 self.assertEqual(0, git_cl.main(['archive', '-f']))
2098
2099 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002100 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002101 self.calls = \
2102 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2103 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002104 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002105 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2106 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002107 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2108
kmarshall9249e012016-08-23 12:02:16 -07002109 self.mock(git_cl, 'get_cl_statuses',
2110 lambda branches, fine_grained, max_processes:
2111 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2112
2113 self.assertEqual(1, git_cl.main(['archive', '-f']))
2114
2115 def test_archive_dry_run(self):
2116 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2117
2118 self.calls = \
2119 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2120 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2121 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2122 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2123 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2124 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2125 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2126 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2127 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002128
2129 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
kmarshall9249e012016-08-23 12:02:16 -07002135 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2136
2137 def test_archive_no_tags(self):
2138 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2139
2140 self.calls = \
2141 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2142 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2143 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2144 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2145 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2146 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2147 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2148 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2149 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2150 ((['git', 'branch', '-D', 'foo'],), '')]
2151
2152 self.mock(git_cl, 'get_cl_statuses',
2153 lambda branches, fine_grained, max_processes:
2154 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2155 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2156 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2157
2158 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002159
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002160 def test_cmd_issue_erase_existing(self):
2161 out = StringIO.StringIO()
2162 self.mock(git_cl.sys, 'stdout', out)
2163 self.calls = [
2164 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002165 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2166 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002167 # Let this command raise exception (retcode=1) - it should be ignored.
2168 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002169 CERR1),
2170 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2171 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002172 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2173 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2174 ''),
2175 ]
2176 self.assertEqual(0, git_cl.main(['issue', '0']))
2177
phajdan.jre328cf92016-08-22 04:12:17 -07002178 def test_cmd_issue_json(self):
2179 out = StringIO.StringIO()
2180 self.mock(git_cl.sys, 'stdout', out)
2181 self.calls = [
2182 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002183 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002184 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2185 ((['git', 'config', 'rietveld.server'],),
2186 'https://codereview.chromium.org'),
2187 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2188 (('write_json', 'output.json',
2189 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2190 ''),
2191 ]
2192 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2193
tandriide281ae2016-10-12 06:02:30 -07002194 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002195 self.mock(git_cl.Changelist, 'GetChange',
2196 lambda _, *a: (
2197 self._mocked_call(['GetChange']+list(a))))
2198 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2199 lambda *_, **__: (
2200 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002201 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2202 lambda _, s: self._mocked_call(['SetCQState', s]))
2203 self.calls = [
2204 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002205 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002206 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2207 ((['git', 'config', 'rietveld.server'],),
2208 'https://codereview.chromium.org'),
2209 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2210 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2211 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2212 ((['get_or_create_merge_base', 'feature', 'feature'],),
2213 'fake_ancestor_sha'),
2214 ((['GetChange', 'fake_ancestor_sha', None], ),
2215 git_cl.presubmit_support.GitChange(
2216 '', '', '', '', '', '', '', '')),
2217 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2218 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002219 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2220 ]
2221 out = StringIO.StringIO()
2222 self.mock(git_cl.sys, 'stdout', out)
2223 self.assertEqual(0, git_cl.main(['try']))
2224 self.assertEqual(
2225 out.getvalue(),
2226 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2227
tandrii8c5a3532016-11-04 07:52:02 -07002228 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2229 self.mock(git_cl.Changelist, 'GetChange',
2230 lambda _, *a: (
2231 self._mocked_call(['GetChange']+list(a))))
2232 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2233 lambda *_, **__: (
2234 self._mocked_call(['DoGetTryMasters'])))
2235 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2236 lambda _, s: self._mocked_call(['SetCQState', s]))
2237
2238 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2239 # Get realistic expectations.
2240 gerrit_change_list_impl._GetGerritHost()
2241 return self._mocked_call(['_GetChangeDetail', opts or []])
2242 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2243 _GetChangeDetail)
2244
2245 self.calls = [
2246 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2247 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2248 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2249 ((['git', 'config', 'branch.feature.gerritserver'],),
2250 'https://chromium-review.googlesource.com'),
2251 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2252 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2253 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2254 ((['get_or_create_merge_base', 'feature', 'feature'],),
2255 'fake_ancestor_sha'),
2256 ((['GetChange', 'fake_ancestor_sha', None], ),
2257 git_cl.presubmit_support.GitChange(
2258 '', '', '', '', '', '', '', '')),
2259 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2260 ((['DoGetTryMasters'], ), None),
2261 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2262 ]
2263 out = StringIO.StringIO()
2264 self.mock(git_cl.sys, 'stdout', out)
2265 self.assertEqual(0, git_cl.main(['try']))
2266 self.assertEqual(
2267 out.getvalue(),
2268 'scheduled CQ Dry Run on '
2269 'https://chromium-review.googlesource.com/123456\n')
2270
2271 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2272 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2273 lambda _: {
2274 'owner_email': 'owner@e.mail',
2275 'private': False,
2276 'closed': False,
2277 'project': 'depot_tools',
2278 'patchsets': [20001],
2279 })
tandriide281ae2016-10-12 06:02:30 -07002280 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2281 self.calls = [
2282 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2283 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2284 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2285 ((['git', 'config', 'rietveld.server'],),
2286 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002287 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002288 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002289 ]
2290
2291 def _buildbucket_retry(*_, **kw):
2292 # self.maxDiff = 10000
2293 body = json.loads(kw['body'])
2294 self.assertEqual(len(body['builds']), 1)
2295 build = body['builds'][0]
2296 params = json.loads(build.pop('parameters_json'))
2297 self.assertEqual(params, {
2298 u'builder_name': u'win',
2299 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2300 u'revision': None}],
2301 u'properties': {
2302 u'category': u'git_cl_try',
2303 u'issue': 123,
2304 u'key': u'val',
2305 u'json': [{u'a': 1}, None],
2306 u'master': u'tryserver.chromium',
2307 u'patch_project': u'depot_tools',
2308 u'patch_storage': u'rietveld',
2309 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002310 u'rietveld': u'https://codereview.chromium.org',
2311 }
2312 })
2313 self.assertEqual(build, {
2314 u'bucket': u'master.tryserver.chromium',
2315 u'client_operation_id': u'uuid4',
2316 u'tags': [u'builder:win',
2317 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002318 u'user_agent:git_cl_try',
2319 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002320 })
2321
2322 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2323
2324 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2325 self.assertEqual(0, git_cl.main([
2326 'try', '-m', 'tryserver.chromium', '-b', 'win',
2327 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2328 self.assertRegexpMatches(
2329 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002330 'Tried jobs on:\nBucket: master.tryserver.chromium')
2331
tandrii8c5a3532016-11-04 07:52:02 -07002332 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2333 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2334 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2335
2336 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2337 # Get realistic expectations.
2338 gerrit_change_list_impl._GetGerritHost()
2339 return self._mocked_call(['_GetChangeDetail', opts or []])
2340 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2341 _GetChangeDetail)
2342
2343 self.calls = [
2344 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2345 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2346 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2347 ((['git', 'config', 'branch.feature.gerritserver'],),
2348 'https://chromium-review.googlesource.com'),
2349 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002350 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2351 {'owner': {'email': 'owner@e.mail'}}),
2352 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2353 'project': 'depot_tools',
2354 'revisions': {
2355 'deadbeaf': {
2356 '_number': 6,
2357 },
2358 'beeeeeef': {
2359 '_number': 7,
2360 'fetch': {'http': {
2361 'url': 'https://chromium.googlesource.com/depot_tools',
2362 'ref': 'refs/changes/56/123456/7'
2363 }},
2364 },
2365 },
2366 }),
2367 ]
2368
2369 def _buildbucket_retry(*_, **kw):
2370 # self.maxDiff = 10000
2371 body = json.loads(kw['body'])
2372 self.assertEqual(len(body['builds']), 1)
2373 build = body['builds'][0]
2374 params = json.loads(build.pop('parameters_json'))
2375 self.assertEqual(params, {
2376 u'builder_name': u'win',
2377 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2378 u'revision': None}],
2379 u'properties': {
2380 u'category': u'git_cl_try',
2381 u'key': u'val',
2382 u'json': [{u'a': 1}, None],
2383 u'master': u'tryserver.chromium',
2384
2385 u'patch_gerrit_url':
2386 u'https://chromium-review.googlesource.com',
2387 u'patch_issue': 123456,
2388 u'patch_project': u'depot_tools',
2389 u'patch_ref': u'refs/changes/56/123456/7',
2390 u'patch_repository_url':
2391 u'https://chromium.googlesource.com/depot_tools',
2392 u'patch_set': 7,
2393 u'patch_storage': u'gerrit',
2394 }
2395 })
2396 self.assertEqual(build, {
2397 u'bucket': u'master.tryserver.chromium',
2398 u'client_operation_id': u'uuid4',
2399 u'tags': [
2400 u'builder:win',
2401 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2402 u'user_agent:git_cl_try',
2403 u'master:tryserver.chromium'],
2404 })
2405
2406 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2407
2408 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2409 self.assertEqual(0, git_cl.main([
2410 'try', '-m', 'tryserver.chromium', '-b', 'win',
2411 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2412 self.assertRegexpMatches(
2413 git_cl.sys.stdout.getvalue(),
2414 'Tried jobs on:\nBucket: master.tryserver.chromium')
2415
borenet6c0efe62016-10-19 08:13:29 -07002416 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002417 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2418 lambda _: {
2419 'owner_email': 'owner@e.mail',
2420 'private': False,
2421 'closed': False,
2422 'project': 'depot_tools',
2423 'patchsets': [20001],
2424 })
borenet6c0efe62016-10-19 08:13:29 -07002425 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2426 self.calls = [
2427 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2428 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2429 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2430 ((['git', 'config', 'rietveld.server'],),
2431 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002432 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002433 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002434 ]
2435
2436 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002437 body = json.loads(kw['body'])
2438 self.assertEqual(len(body['builds']), 1)
2439 build = body['builds'][0]
2440 params = json.loads(build.pop('parameters_json'))
2441 self.assertEqual(params, {
2442 u'builder_name': u'win',
2443 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2444 u'revision': None}],
2445 u'properties': {
2446 u'category': u'git_cl_try',
2447 u'issue': 123,
2448 u'patch_project': u'depot_tools',
2449 u'patch_storage': u'rietveld',
2450 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002451 u'rietveld': u'https://codereview.chromium.org',
2452 }
2453 })
2454 self.assertEqual(build, {
2455 u'bucket': u'test.bucket',
2456 u'client_operation_id': u'uuid4',
2457 u'tags': [u'builder:win',
2458 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2459 u'user_agent:git_cl_try'],
2460 })
2461
2462 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2463
2464 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2465 self.assertEqual(0, git_cl.main([
2466 'try', '-B', 'test.bucket', '-b', 'win']))
2467 self.assertRegexpMatches(
2468 git_cl.sys.stdout.getvalue(),
2469 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002470
qyearsley123a4682016-10-26 09:12:17 -07002471 def test_git_cl_try_bots_on_multiple_masters(self):
2472 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2473 self.calls = [
2474 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2475 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2476 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2477 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002478 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002479 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2480 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2481 ]
2482
2483 def _buildbucket_retry(*_, **kw):
2484 body = json.loads(kw['body'])
2485 self.assertEqual(len(body['builds']), 2)
2486
2487 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2488 self.assertEqual(first_build_params['builder_name'], 'builder1')
2489 self.assertEqual(first_build_params['properties']['master'], 'master1')
2490
2491 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2492 self.assertEqual(first_build_params['builder_name'], 'builder2')
2493 self.assertEqual(first_build_params['properties']['master'], 'master2')
2494
2495 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2496
2497 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2498 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2499
2500 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2501 self.assertEqual(
2502 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2503 self.assertEqual(
2504 git_cl.sys.stdout.getvalue(),
2505 'Tried jobs on:\n'
2506 'Bucket: master.master1\n'
2507 ' builder1: []\n'
2508 'Bucket: master.master2\n'
2509 ' builder2: []\n'
2510 'To see results here, run: git cl try-results\n'
2511 'To see results in browser, run: git cl web\n')
2512
tandrii16e0b4e2016-06-07 10:34:28 -07002513 def _common_GerritCommitMsgHookCheck(self):
2514 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2515 self.mock(git_cl.os.path, 'abspath',
2516 lambda path: self._mocked_call(['abspath', path]))
2517 self.mock(git_cl.os.path, 'exists',
2518 lambda path: self._mocked_call(['exists', path]))
2519 self.mock(git_cl.gclient_utils, 'FileRead',
2520 lambda path: self._mocked_call(['FileRead', path]))
2521 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2522 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2523 self.calls = [
2524 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2525 ((['abspath', '../'],), '/abs/git_repo_root'),
2526 ]
2527 return git_cl.Changelist(codereview='gerrit', issue=123)
2528
2529 def test_GerritCommitMsgHookCheck_custom_hook(self):
2530 cl = self._common_GerritCommitMsgHookCheck()
2531 self.calls += [
2532 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2533 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2534 '#!/bin/sh\necho "custom hook"')
2535 ]
2536 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2537
2538 def test_GerritCommitMsgHookCheck_not_exists(self):
2539 cl = self._common_GerritCommitMsgHookCheck()
2540 self.calls += [
2541 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2542 ]
2543 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2544
2545 def test_GerritCommitMsgHookCheck(self):
2546 cl = self._common_GerritCommitMsgHookCheck()
2547 self.calls += [
2548 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2549 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2550 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2551 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2552 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2553 ''),
2554 ]
2555 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2556
tandriic4344b52016-08-29 06:04:54 -07002557 def test_GerritCmdLand(self):
2558 self.calls += [
2559 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2560 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2561 'deadbeaf'),
2562 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2563 ((['git', 'config', 'branch.feature.gerritserver'],),
2564 'chromium-review.googlesource.com'),
2565 ]
2566 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2567 cl._codereview_impl._GetChangeDetail = lambda _: {
2568 'labels': {},
2569 'current_revision': 'deadbeaf',
2570 }
agable32978d92016-11-01 12:55:02 -07002571 cl._codereview_impl._GetChangeCommit = lambda: {
2572 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002573 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002574 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2575 }
tandriic4344b52016-08-29 06:04:54 -07002576 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002577 out = StringIO.StringIO()
2578 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002579 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002580 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002581 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002582
tandrii221ab252016-10-06 08:12:04 -07002583 BUILDBUCKET_BUILDS_MAP = {
2584 '9000': {
2585 'id': '9000',
2586 'status': 'STARTED',
2587 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2588 'result_details_json': '{"properties": {}}',
2589 'bucket': 'master.x.y',
2590 'created_by': 'user:someone@chromium.org',
2591 'created_ts': '147200002222000',
2592 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2593 },
2594 '8000': {
2595 'id': '8000',
2596 'status': 'COMPLETED',
2597 'result': 'FAILURE',
2598 'failure_reason': 'BUILD_FAILURE',
2599 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2600 'result_details_json': '{"properties": {}}',
2601 'bucket': 'master.x.y',
2602 'created_by': 'user:someone@chromium.org',
2603 'created_ts': '147200001111000',
2604 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2605 },
2606 }
2607
2608 def test_write_try_results_json(self):
2609 expected_output = [
2610 {
2611 'buildbucket_id': '8000',
2612 'bucket': 'master.x.y',
2613 'builder_name': 'my-builder',
2614 'status': 'COMPLETED',
2615 'result': 'FAILURE',
2616 'failure_reason': 'BUILD_FAILURE',
2617 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2618 },
2619 {
2620 'buildbucket_id': '9000',
2621 'bucket': 'master.x.y',
2622 'builder_name': 'my-builder',
2623 'status': 'STARTED',
2624 'result': None,
2625 'failure_reason': None,
2626 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2627 }
2628 ]
2629 self.calls = [(('write_json', 'output.json', expected_output), '')]
2630 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2631
tandrii45b2a582016-10-11 03:14:16 -07002632 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002633 out = StringIO.StringIO()
2634 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002635 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2636 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002637 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2638 self._mocked_call(['get_authenticator_for_host', host]))
2639 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2640 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002641
2642 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2643 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002644 self.calls += [
2645 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2646 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2647 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2648 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2649 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2650 ((['git', 'config', 'branch.feature.rietveldserver'],),
2651 'codereview.example.com'),
2652 ((['get_authenticator_for_host', 'codereview.example.com'],),
2653 AuthenticatorMock()),
2654 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2655
2656 def test_fetch_try_jobs_none_rietveld(self):
2657 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002658 # Simulate that user isn't logged in.
2659 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002660 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002661 self.assertRegexpMatches(sys.stdout.getvalue(),
2662 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002663 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2664
2665 def test_fetch_try_jobs_some_rietveld(self):
2666 self._setup_fetch_try_jobs_rietveld({
2667 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2668 })
2669 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002670 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2671 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2672 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2673
2674 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2675 self._setup_fetch_try_jobs(most_recent_patchset=13)
2676 self.calls += [
2677 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2678 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2679 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002680 # TODO(tandrii): Uncomment the below if we decide to support checking
2681 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002682 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002683 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002684 ((['git', 'config', 'branch.feature.gerritserver'],),
2685 'https://x-review.googlesource.com'),
2686 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2687 AuthenticatorMock()),
2688 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2689
2690 def test_fetch_try_jobs_none_gerrit(self):
2691 self._setup_fetch_try_jobs_gerrit({})
2692 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002693 # TODO(tandrii): Uncomment the below if we decide to support checking
2694 # patchsets for Gerrit.
2695 # self.assertRegexpMatches(
2696 # sys.stdout.getvalue(),
2697 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002698 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2699
2700 def test_fetch_try_jobs_some_gerrit(self):
2701 self._setup_fetch_try_jobs_gerrit({
2702 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2703 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002704 # TODO(tandrii): Uncomment the below if we decide to support checking
2705 # patchsets for Gerrit.
2706 # self.calls.remove(
2707 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002708 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2709
2710 # ... and doesn't result in warning.
2711 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2712 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002713 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2714 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2715
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002716 def _mock_gerrit_changes_for_detail_cache(self):
2717 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
2718 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
2719 lambda _, issue, options, **__:
2720 self._mocked_call('RPC', issue, options))
2721
2722 def test_gerrit_change_detail_cache_normalize(self):
2723 self._mock_gerrit_changes_for_detail_cache()
2724 self.calls = [
2725 (('RPC', '2', ['CASE']), 'b'),
2726 ]
2727 cl = git_cl.Changelist(codereview='gerrit')
2728 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2729 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2730 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2731 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2732
2733 def test_gerrit_change_detail_cache_simple(self):
2734 self._mock_gerrit_changes_for_detail_cache()
2735 self.calls = [
2736 (('RPC', '1', []), 'a'),
2737 (('RPC', '2', []), 'b'),
2738 (('RPC', '2', []), 'b2'),
2739 ]
2740 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2741 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2742 self.assertEqual(cl._GetChangeDetail(), 'a')
2743 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002744 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002745 self.assertEqual(cl._GetChangeDetail(), 'a')
2746 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2747
2748 def test_gerrit_change_detail_cache_options(self):
2749 self._mock_gerrit_changes_for_detail_cache()
2750 self.calls = [
2751 (('RPC', '1', ['C', 'A', 'B']), 'cab'),
2752 (('RPC', '1', ['A', 'D']), 'ad'),
2753 (('RPC', '1', ['A']), 'a'), # no_cache=True
2754 (('RPC', '1', ['B']), 'b'), # no longer in cache.
2755 ]
2756 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2757 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2758 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2759 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2760 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2761 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2762 self.assertEqual(cl._GetChangeDetail(), 'cab')
2763
2764 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2765 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2766 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2767 self.assertEqual(cl._GetChangeDetail(), 'cab')
2768
2769 # Finally, no_cache should invalidate all caches for given change.
2770 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2771 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2772
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002773
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002774if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01002775 logging.basicConfig(
2776 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002777 unittest.main()