blob: 2f71f4ed9bafd8ed69236f3c854426cbf29aed5d [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Unit tests for git_cl.py."""
7
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
tandriide281ae2016-10-12 06:02:30 -07009import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010010import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000011import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000012import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000013import sys
14import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000015import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016
17sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
18
19from testing_support.auto_stub import TestCase
20
21import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000022import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000023import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000024import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025
tandrii5d48c322016-08-18 16:19:37 -070026def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
27 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
28
29
30CERR1 = callError(1)
31
32
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000033class ChangelistMock(object):
34 # A class variable so we can access it when we don't have access to the
35 # instance that's being set.
36 desc = ""
37 def __init__(self, **kwargs):
38 pass
39 def GetIssue(self):
40 return 1
41 def GetDescription(self):
42 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070043 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000044 ChangelistMock.desc = desc
45
tandrii5d48c322016-08-18 16:19:37 -070046
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000047class PresubmitMock(object):
48 def __init__(self, *args, **kwargs):
49 self.reviewers = []
50 @staticmethod
51 def should_continue():
52 return True
53
54
55class RietveldMock(object):
56 def __init__(self, *args, **kwargs):
57 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000058
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000059 @staticmethod
60 def get_description(issue):
61 return 'Issue: %d' % issue
62
maruel@chromium.org78936cb2013-04-11 00:17:52 +000063 @staticmethod
64 def get_issue_properties(_issue, _messages):
65 return {
66 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
67 'messages': [
68 {
69 'approval': True,
70 'sender': 'john@chromium.org',
71 },
72 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010073 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000074 }
75
iannuccie53c9352016-08-17 14:40:40 -070076 @staticmethod
77 def close_issue(_issue):
78 return 'Closed'
79
skobes6468b902016-10-24 08:45:10 -070080 @staticmethod
81 def get_patch(issue, patchset):
82 return 'patch set from issue %s patchset %s' % (issue, patchset)
83
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010084 @staticmethod
85 def update_description(_issue, _description):
86 return 'Updated'
87
88 @staticmethod
89 def add_comment(_issue, _comment):
90 return 'Commented'
91
92
93
skobes6468b902016-10-24 08:45:10 -070094
95class GitCheckoutMock(object):
96 def __init__(self, *args, **kwargs):
97 pass
98
99 @staticmethod
100 def reset():
101 GitCheckoutMock.conflict = False
102
103 def apply_patch(self, p):
104 if GitCheckoutMock.conflict:
105 raise Exception('failed')
106
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000107
108class WatchlistsMock(object):
109 def __init__(self, _):
110 pass
111 @staticmethod
112 def GetWatchersForPaths(_):
113 return ['joe@example.com']
114
115
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000116class CodereviewSettingsFileMock(object):
117 def __init__(self):
118 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800119 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000120 def read(self):
121 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000122 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000123
124
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000125class AuthenticatorMock(object):
126 def __init__(self, *_args):
127 pass
128 def has_cached_credentials(self):
129 return True
tandrii221ab252016-10-06 08:12:04 -0700130 def authorize(self, http):
131 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000132
133
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000134def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
135 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
136
137 Usage:
138 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
139 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
140
141 OR
142 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
143 CookiesAuthenticatorMockFactory(cookie='cookie'))
144 """
145 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800146 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 # Intentionally not calling super() because it reads actual cookie files.
148 pass
149 @classmethod
150 def get_gitcookies_path(cls):
151 return '~/.gitcookies'
152 @classmethod
153 def get_netrc_path(cls):
154 return '~/.netrc'
155 def get_auth_header(self, host):
156 if same_cookie:
157 return same_cookie
158 return (hosts_with_creds or {}).get(host)
159 return CookiesAuthenticatorMock
160
kmarshall9249e012016-08-23 12:02:16 -0700161class MockChangelistWithBranchAndIssue():
162 def __init__(self, branch, issue):
163 self.branch = branch
164 self.issue = issue
165 def GetBranch(self):
166 return self.branch
167 def GetIssue(self):
168 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000169
tandriic2405f52016-10-10 08:13:15 -0700170
171class SystemExitMock(Exception):
172 pass
173
174
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000175class TestGitClBasic(unittest.TestCase):
176 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
177 parsed = urlparse.urlparse(url)
178 result = func(parsed)
179 if fail:
180 self.assertIsNone(result)
181 return None
182 self.assertIsNotNone(result)
183 self.assertEqual(result.issue, issue)
184 self.assertEqual(result.patchset, patchset)
185 self.assertEqual(result.hostname, hostname)
186 return result
187
188 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700189 def test(url, issue=None, patchset=None, hostname=None, fail=None):
190 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000191 git_cl._RietveldChangelistImpl.ParseIssueURL,
192 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000193
194 test('http://codereview.chromium.org/123',
195 123, None, 'codereview.chromium.org')
196 test('https://codereview.chromium.org/123',
197 123, None, 'codereview.chromium.org')
198 test('https://codereview.chromium.org/123/',
199 123, None, 'codereview.chromium.org')
200 test('https://codereview.chromium.org/123/whatever',
201 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700202 test('https://codereview.chromium.org/123/#ps20001',
203 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000204 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700205 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000206 # This looks like bad Gerrit, but is actually valid Rietveld.
207 test('https://chrome-review.source.com/123/4/',
208 123, None, 'chrome-review.source.com')
209
210 test('https://codereview.chromium.org/deadbeaf', fail=True)
211 test('https://codereview.chromium.org/api/123', fail=True)
212 test('bad://codereview.chromium.org/123', fail=True)
213 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
214
215 def test_ParseIssueURL_gerrit(self):
216 def test(url, issue=None, patchset=None, hostname=None, fail=None):
217 self._test_ParseIssueUrl(
218 git_cl._GerritChangelistImpl.ParseIssueURL,
219 url, issue, patchset, hostname, fail)
220
221 test('http://chrome-review.source.com/c/123',
222 123, None, 'chrome-review.source.com')
223 test('https://chrome-review.source.com/c/123/',
224 123, None, 'chrome-review.source.com')
225 test('https://chrome-review.source.com/c/123/4',
226 123, 4, 'chrome-review.source.com')
227 test('https://chrome-review.source.com/#/c/123/4',
228 123, 4, 'chrome-review.source.com')
229 test('https://chrome-review.source.com/c/123/4',
230 123, 4, 'chrome-review.source.com')
231 test('https://chrome-review.source.com/123',
232 123, None, 'chrome-review.source.com')
233 test('https://chrome-review.source.com/123/4',
234 123, 4, 'chrome-review.source.com')
235
236 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
237 test('https://chrome-review.source.com/c/abc/', fail=True)
238 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
239
240 def test_ParseIssueNumberArgument(self):
241 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
242 result = git_cl.ParseIssueNumberArgument(arg)
243 self.assertIsNotNone(result)
244 if fail:
245 self.assertFalse(result.valid)
246 else:
247 self.assertEqual(result.issue, issue)
248 self.assertEqual(result.patchset, patchset)
249 self.assertEqual(result.hostname, hostname)
250
251 test('123', 123)
252 test('', fail=True)
253 test('abc', fail=True)
254 test('123/1', fail=True)
255 test('123a', fail=True)
256 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
257 # Rietveld.
258 test('https://codereview.source.com/123',
259 123, None, 'codereview.source.com')
260 test('https://codereview.source.com/www123', fail=True)
261 # Gerrrit.
262 test('https://chrome-review.source.com/c/123/4',
263 123, 4, 'chrome-review.source.com')
264 test('https://chrome-review.source.com/bad/123/4', fail=True)
265
tandriif9aefb72016-07-01 09:06:51 -0700266 def test_get_bug_line_values(self):
267 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
268 self.assertEqual(f('', ''), [])
269 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
270 self.assertEqual(f('v8', '456'), ['v8:456'])
271 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
272 # Not nice, but not worth carying.
273 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
274 ['v8:456', 'chromium:123', 'v8:123'])
275
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100276 def _test_git_number(self, parent_msg, dest_ref, child_msg,
277 parent_hash='parenthash'):
278 desc = git_cl.ChangeDescription(child_msg)
279 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
280 return desc.description
281
282 def assertEqualByLine(self, actual, expected):
283 self.assertEqual(actual.splitlines(), expected.splitlines())
284
285 def test_git_number_bad_parent(self):
286 with self.assertRaises(ValueError):
287 self._test_git_number('Parent', 'refs/heads/master', 'Child')
288
289 def test_git_number_bad_parent_footer(self):
290 with self.assertRaises(AssertionError):
291 self._test_git_number(
292 'Parent\n'
293 '\n'
294 'Cr-Commit-Position: wrong',
295 'refs/heads/master', 'Child')
296
297 def test_git_number_bad_lineage_ignored(self):
298 actual = self._test_git_number(
299 'Parent\n'
300 '\n'
301 'Cr-Commit-Position: refs/heads/master@{#1}\n'
302 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
303 'refs/heads/master', 'Child')
304 self.assertEqualByLine(
305 actual,
306 'Child\n'
307 '\n'
308 'Cr-Commit-Position: refs/heads/master@{#2}\n'
309 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
310
311 def test_git_number_same_branch(self):
312 actual = self._test_git_number(
313 'Parent\n'
314 '\n'
315 'Cr-Commit-Position: refs/heads/master@{#12}',
316 dest_ref='refs/heads/master',
317 child_msg='Child')
318 self.assertEqualByLine(
319 actual,
320 'Child\n'
321 '\n'
322 'Cr-Commit-Position: refs/heads/master@{#13}')
323
324 def test_git_number_same_branch_with_originals(self):
325 actual = self._test_git_number(
326 'Parent\n'
327 '\n'
328 'Cr-Commit-Position: refs/heads/master@{#12}',
329 dest_ref='refs/heads/master',
330 child_msg='Child\n'
331 '\n'
332 'Some users are smart and insert their own footers\n'
333 '\n'
334 'Cr-Whatever: value\n'
335 'Cr-Commit-Position: refs/copy/paste@{#22}')
336 self.assertEqualByLine(
337 actual,
338 'Child\n'
339 '\n'
340 'Some users are smart and insert their own footers\n'
341 '\n'
342 'Cr-Original-Whatever: value\n'
343 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
344 'Cr-Commit-Position: refs/heads/master@{#13}')
345
346 def test_git_number_new_branch(self):
347 actual = self._test_git_number(
348 'Parent\n'
349 '\n'
350 'Cr-Commit-Position: refs/heads/master@{#12}',
351 dest_ref='refs/heads/branch',
352 child_msg='Child')
353 self.assertEqualByLine(
354 actual,
355 'Child\n'
356 '\n'
357 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
358 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
359
360 def test_git_number_lineage(self):
361 actual = self._test_git_number(
362 'Parent\n'
363 '\n'
364 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
365 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
366 dest_ref='refs/heads/branch',
367 child_msg='Child')
368 self.assertEqualByLine(
369 actual,
370 'Child\n'
371 '\n'
372 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
373 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
374
375 def test_git_number_moooooooore_lineage(self):
376 actual = self._test_git_number(
377 'Parent\n'
378 '\n'
379 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
380 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
381 dest_ref='refs/heads/mooore',
382 child_msg='Child')
383 self.assertEqualByLine(
384 actual,
385 'Child\n'
386 '\n'
387 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
388 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
389 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
390
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100391 def test_git_number_ever_moooooooore_lineage(self):
392 self.maxDiff = 10000
393 actual = self._test_git_number(
394 'CQ commit on fresh new branch + numbering.\n'
395 '\n'
396 'NOTRY=True\n'
397 'NOPRESUBMIT=True\n'
398 'BUG=\n'
399 '\n'
400 'Review-Url: https://codereview.chromium.org/2577703003\n'
401 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
402 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
403 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
404 dest_ref='refs/heads/gnumb-test/cl',
405 child_msg='git cl on fresh new branch + numbering.\n'
406 '\n'
407 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
408 self.assertEqualByLine(
409 actual,
410 'git cl on fresh new branch + numbering.\n'
411 '\n'
412 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
413 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
414 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
415 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
416 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100417
418 def test_git_number_cherry_pick(self):
419 actual = self._test_git_number(
420 'Parent\n'
421 '\n'
422 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
423 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
424 dest_ref='refs/heads/branch',
425 child_msg='Child, which is cherry-pick from master\n'
426 '\n'
427 'Cr-Commit-Position: refs/heads/master@{#100}\n'
428 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
429 self.assertEqualByLine(
430 actual,
431 'Child, which is cherry-pick from master\n'
432 '\n'
433 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
434 '\n'
435 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
436 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
437 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
438
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000439
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000440class TestGitCl(TestCase):
441 def setUp(self):
442 super(TestGitCl, self).setUp()
443 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700444 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000445 self.mock(subprocess2, 'call', self._mocked_call)
446 self.mock(subprocess2, 'check_call', self._mocked_call)
447 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700448 self.mock(subprocess2, 'communicate',
449 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000450 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000451 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000452 self.mock(git_common, 'get_or_create_merge_base',
453 lambda *a: (
454 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000455 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000456 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000457 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700458 self.mock(git_cl, 'write_json', lambda path, contents:
459 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000460 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000461 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000462 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700463 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
464 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000465 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000466 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000467 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100468 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
469 lambda *args, **kwargs: self._mocked_call(
470 'GetChangeDetail', *args, **kwargs))
471 self.mock(git_cl.gerrit_util, 'AddReviewers',
472 lambda h, i, add, is_reviewer, notify: self._mocked_call(
473 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000474 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
475 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700476 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100477 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000478 # It's important to reset settings to not have inter-tests interference.
479 git_cl.settings = None
480
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000481
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000482 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000483 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100484 self.assertEquals([], self.calls)
485 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000486 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100487 raise
488 # Sadly, has_failed() returns True if this OR any other tests before this
489 # one have failed.
490 git_cl.logging.exception(
491 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
492 'There are un-consumed self.calls after this test has finished.\n'
493 'If you don\'t know which test this is, run:\n'
494 ' tests/git_cl_tests.py -v\n'
495 '\n'
496 'If you are already running just this single test, then **first** '
497 'fix the problem whose exception is emitted below by unittest '
498 'runner.\n'
499 '\n'
500 'Else, to be sure what\'s going on, run this test **alone** with \n'
501 ' tests/git_cl_tests.py TestGitCl.<name>\n'
502 'and follow instructions above.\n' +
503 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000504 finally:
505 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000506
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000507 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000508 self.assertTrue(
509 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700510 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000511 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000512 expected_args, result = top
513
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000514 # Also logs otherwise it could get caught in a try/finally and be hard to
515 # diagnose.
516 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700517 N = 5
518 prior_calls = '\n '.join(
519 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
520 for i, c in enumerate(self._calls_done[-N:]))
521 following_calls = '\n '.join(
522 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
523 for i, c in enumerate(self.calls[:N]))
524 extended_msg = (
525 'A few prior calls:\n %s\n\n'
526 'This (expected):\n @%d: %r\n'
527 'This (actual):\n @%d: %r\n\n'
528 'A few following expected calls:\n %s' %
529 (prior_calls, len(self._calls_done), expected_args,
530 len(self._calls_done), args, following_calls))
531 git_cl.logging.error(extended_msg)
532
tandrii99a72f22016-08-17 14:33:24 -0700533 self.fail('@%d\n'
534 ' Expected: %r\n'
535 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700536 len(self._calls_done), expected_args, args))
537
538 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700539 if isinstance(result, Exception):
540 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000541 return result
542
tandrii48df5812016-10-17 03:55:37 -0700543 def test_LoadCodereviewSettingsFromFile_gerrit(self):
544 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
545 self.calls = [
546 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
547 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
548 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
549 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
550 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
551 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700552 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
553 CERR1),
554 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700555 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
556 CERR1),
557 ((['git', 'config', 'gerrit.host', 'true'],), ''),
558 ]
559 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
560
maruel@chromium.orga3353652011-11-30 14:26:57 +0000561 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000562 def _is_gerrit_calls(cls, gerrit=False):
563 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
564 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
565
566 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000567 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000568 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000569 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000570
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000571 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000572 def _upload_no_rev_calls(cls, similarity, find_copies):
573 return (cls._git_base_calls(similarity, find_copies) +
574 cls._git_upload_no_rev_calls())
575
576 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000577 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000578 if similarity is None:
579 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700580 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700581 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000582 else:
tandrii33a46ff2016-08-23 05:53:40 -0700583 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700584 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000585
586 if find_copies is None:
587 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700588 find_copies_call = ((['git', 'config', '--bool',
589 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000590 else:
tandrii5d48c322016-08-18 16:19:37 -0700591 val = str(find_copies).lower()
592 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000593 'branch.master.git-find-copies', val],), '')
594
595 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000596 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800597 '-l100000', '-C'+similarity,
598 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000599 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000600 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000601 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000602
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000603 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000604 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000605 similarity_call,
606 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
607 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000608 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000609 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700610 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
611 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000612 ((['git', 'config', 'rietveld.server'],),
613 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000614 ((['git', 'config', 'branch.master.merge'],), 'master'),
615 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000616 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000617 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000618 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000619 ((['git', 'rev-parse', '--show-cdup'],), ''),
620 ((['git', 'rev-parse', 'HEAD'],), '12345'),
621 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000622 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000623 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700624 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000625 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000626 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000627 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000628 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000629 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000630 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000631 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000632 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000633 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000634 ]
635
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000636 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000637 def _git_upload_no_rev_calls(cls):
638 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000639 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000640 ]
641
642 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000643 def _git_upload_calls(cls, private):
644 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000645 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000646 private_call = []
647 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000648 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000649 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000650 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000651
maruel@chromium.orga3353652011-11-30 14:26:57 +0000652 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000653 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000654 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000655 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800656 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000657 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700658 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000659 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000660 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000661 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700662 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000663 ] + cls._git_post_upload_calls()
664
665 @classmethod
666 def _git_post_upload_calls(cls):
667 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000668 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
669 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
670 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000671 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000672 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000673 ]
674
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000675 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000676 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000677 fake_ancestor = 'fake_ancestor'
678 fake_cl = 'fake_cl_for_patch'
679 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000680 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000681 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000682 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000683 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000684 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000685 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000686 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000687 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700688 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000689 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000690 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000691 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000692 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000693 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000694 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000695 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000696 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000697 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000698 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000699 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000700
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000701 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700702 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000703 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000704 return [
705 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000706 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000707 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000708 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700709 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000710 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000711 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100712 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000713 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000714 ]
715
716 def _run_reviewer_test(
717 self,
718 upload_args,
719 expected_description,
720 returned_description,
721 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000722 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700723 private=False,
724 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000725 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000726 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000727 try:
728 similarity = upload_args[upload_args.index('--similarity')+1]
729 except ValueError:
730 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000731
732 if '--find-copies' in upload_args:
733 find_copies = True
734 elif '--no-find-copies' in upload_args:
735 find_copies = False
736 else:
737 find_copies = None
738
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000739 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700740 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000741
742 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000743
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000744 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000745 self.assertEquals(
746 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000747 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000748 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000749 '#--------------------This line is 72 characters long'
750 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000751 expected_description,
752 desc)
753 return returned_description
754 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000755
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000756 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000757 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700758 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000759 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000760 return 1, 2
761 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000762
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000763 git_cl.main(['upload'] + upload_args)
764
765 def test_no_reviewer(self):
766 self._run_reviewer_test(
767 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000768 'desc\n\nBUG=',
769 '# Blah blah comment.\ndesc\n\nBUG=',
770 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000771 [])
772
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000773 def test_keep_similarity(self):
774 self._run_reviewer_test(
775 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000776 'desc\n\nBUG=',
777 '# Blah blah comment.\ndesc\n\nBUG=',
778 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000779 [])
780
iannucci@chromium.org79540052012-10-19 23:15:26 +0000781 def test_keep_find_copies(self):
782 self._run_reviewer_test(
783 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000784 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000785 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000786 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000787 [])
788
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000789 def test_private(self):
790 self._run_reviewer_test(
791 ['--private'],
792 'desc\n\nBUG=',
793 '# Blah blah comment.\ndesc\n\nBUG=\n',
794 'desc\n\nBUG=',
795 [])
796
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000797 def test_reviewers_cmd_line(self):
798 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000799 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000800 self._run_reviewer_test(
801 ['-r' 'foo@example.com'],
802 description,
803 '\n%s\n' % description,
804 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000805 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000806
807 def test_reviewer_tbr_overriden(self):
808 # Reviewer is overriden with TBR
809 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000810 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000811 self._run_reviewer_test(
812 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000813 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000814 description.strip('\n'),
815 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000816 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000817
818 def test_reviewer_multiple(self):
819 # Handles multiple R= or TBR= lines.
820 description = (
bradnelsond975b302016-10-23 12:20:23 -0700821 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
822 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000823 self._run_reviewer_test(
824 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000825 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000826 description,
827 description,
bradnelsond975b302016-10-23 12:20:23 -0700828 ['--reviewers=another@example.com,reviewer@example.com'],
829 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000830
maruel@chromium.orga3353652011-11-30 14:26:57 +0000831 def test_reviewer_send_mail(self):
832 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000833 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000834 self._run_reviewer_test(
835 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000836 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000837 description.strip('\n'),
838 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000839 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000840
841 def test_reviewer_send_mail_no_rev(self):
842 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000843 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700844 self.calls = self._upload_no_rev_calls(None, None) + [
845 ((['DieWithError', 'Must specify reviewers to send email.'],),
846 SystemExitMock())
847 ]
848
849 def RunEditor(desc, _, **kwargs):
850 return desc
851 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
852 self.mock(sys, 'stdout', stdout)
853 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000854 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700855 self.assertEqual(
856 'Using 50% similarity for rename/copy detection. Override with '
857 '--similarity.\n',
858 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000859
tandriif9aefb72016-07-01 09:06:51 -0700860 def test_bug_on_cmd(self):
861 self._run_reviewer_test(
862 ['--bug=500658,proj:123'],
863 'desc\n\nBUG=500658\nBUG=proj:123',
864 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
865 'desc\n\nBUG=500658\nBUG=proj:1234',
866 [])
867
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100868 def _land_rietveld_common(self, debug=False):
869 if debug:
870 # Very useful due to finally clause in git cl land raising exceptions and
871 # shadowing real cause of failure.
872 self.mock(git_cl, '_IS_BEING_TESTED', True)
873 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100874 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100875
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100876 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
877 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100878 self.mock(RietveldMock, 'update_description', staticmethod(
879 lambda i, d: self._mocked_call(['update_description', i, d])))
880 self.mock(RietveldMock, 'add_comment', staticmethod(
881 lambda i, c: self._mocked_call(['add_comment', i, c])))
882 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100883 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
884 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
885 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
886 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
887 CERR1),
888 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
889 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800890 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100891 ((['git', 'config', 'rietveld.server'],),
892 'https://codereview.chromium.org'),
893 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
894 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
895 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
896 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100897 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
898 ''), # No commits to rebase, according to local view of origin.
899 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
900 'fake_ancestor_sha'),
901 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
902 ((['git', 'rev-parse', '--show-cdup'],), ''),
903 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
904 ((['git', 'diff', '--name-status', '--no-renames', '-r',
905 'fake_ancestor_sha...', '.'],),
906 'M\tfile1.cpp'),
907 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
908 ((['git', 'config', 'branch.feature.rietveldserver'],),
909 'https://codereview.chromium.org'),
910 ((['git', 'config', 'user.email'],), 'user@e.mail'),
911 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
912 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
913 'fake_ancestor_sha', 'feature'],),
914 # This command just prints smth like this:
915 # file1.cpp | 53 ++++++--
916 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
917 ''),
918 ((['git', 'show-ref', '--quiet', '--verify',
919 'refs/heads/git-cl-commit'],),
920 ''), # 0 return code means branch exists.
921 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
922 ((['git', 'show-ref', '--quiet', '--verify',
923 'refs/heads/git-cl-cherry-pick'],),
924 CERR1), # This means git-cl-cherry-pick branch does not exist.
925 ((['git', 'rev-parse', '--show-cdup'],), ''),
926 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
927 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
928 ((['git', 'commit', '-m',
929 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100930 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100931 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
932 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
933 ((['git', 'config', '--get', 'remote.origin.url'],),
934 'https://chromium.googlesource.com/infra/infra'),
935 ]
936
937 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100938 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100939 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100940 ((['git', 'config', 'remote.origin.url'],),
941 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100942 (('_is_git_numberer_enabled',
943 'https://chromium.googlesource.com/infra/infra',
944 'refs/heads/master'),
945 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100946 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
947 ''),
948 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
949 ((['git', 'checkout', '-q', 'feature'],), ''),
950 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
951 ((['git', 'config', 'rietveld.viewvc-url'],),
952 'https://chromium.googlesource.com/infra/infra/+/'),
953 ((['update_description', 123,
954 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
955 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
956 ''),
957 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
958 'fake_sha_rebased (presubmit successful).'],), ''),
959 ]
960 git_cl.main(['land'])
961
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100962 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100963 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100964
965 # Special mocks to check validity of timestamp.
966 original_git_amend_head = git_cl._git_amend_head
967 def _git_amend_head_mock(msg, tstamp):
968 self._mocked_call(['git_amend_head committer timestamp', tstamp])
969 return original_git_amend_head(msg, tstamp)
970 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
971
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100972 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100973 ((['git', 'config', 'remote.origin.url'],),
974 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100975 (('_is_git_numberer_enabled',
976 'https://chromium.googlesource.com/chromium/src',
977 'refs/heads/master'),
978 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100979 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
980 'This is parent commit.\n'
981 '\n'
982 'Cr-Commit-Position: refs/heads/master@{#543}\n'
983 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100984 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
985 '1480022355'), # Committer's unix timestamp.
986 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
987 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100988
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100989 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100990 ((['git', 'commit', '--amend', '-m',
991 'Issue: 123\n\nR=john@chromium.org\n'
992 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100993 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100994 'Cr-Commit-Position: refs/heads/master@{#544}\n'
995 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
996
997 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
998 ''),
999 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1000 ((['git', 'checkout', '-q', 'feature'],), ''),
1001 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1002 ((['git', 'config', 'rietveld.viewvc-url'],),
1003 'https://chromium.googlesource.com/infra/infra/+/'),
1004 ((['update_description', 123,
1005 'Issue: 123\n\nR=john@chromium.org\n'
1006 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001007 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001008 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1009 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1010 'Committed: '
1011 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1012 ''),
1013 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1014 'fake_sha_rebased (presubmit successful).'],), ''),
1015 ]
1016 git_cl.main(['land'])
1017
1018 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001019 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001020 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001021 ((['git', 'config', 'remote.origin.url'],),
1022 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001023 (('_is_git_numberer_enabled',
1024 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1025 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001026
1027 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1028 'This is parent commit with no footer.'),
1029
1030 ((['git', 'checkout', '-q', 'feature'],), ''),
1031 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1032 ]
1033 with self.assertRaises(ValueError) as cm:
1034 git_cl.main(['land'])
1035 self.assertEqual(cm.exception.message,
1036 'Unable to infer commit position from footers')
1037
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001038 def test_git_numberer_not_whitelisted_repo(self):
1039 self.calls = []
1040 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001041 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1042 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001043 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001044
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001045 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001046 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1047 self.calls = [
1048 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001049 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001050 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001051 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001052 remote_url='https://chromium.googlesource.com/chromium/src',
1053 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001054 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001055
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001056 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001057 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001058 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001059 def fake_temporary_directory(**kwargs):
1060 yield tempdir
1061 self.mock(git_cl.gclient_utils, 'temporary_directory',
1062 fake_temporary_directory)
1063 self._test_GitNumbererState_valid_configs_inner(tempdir)
1064
1065 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001066 self.calls = [
1067 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001068 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001069 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1070 '''
1071 [plugin "git-numberer"]
1072 validate-enabled-refglob = refs/else/*
1073 validate-enabled-refglob = refs/heads/*
1074 validate-disabled-refglob = refs/heads/disabled
1075 validate-disabled-refglob = refs/branch-heads/*
1076 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001077 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1078 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001079 'refs/else/*\n'
1080 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001081 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1082 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001083 'refs/heads/disabled\n'
1084 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001085 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001086
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001087 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001088 remote_url='https://chromium.googlesource.com/chromium/src',
1089 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001090 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001091
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001092 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001093 remote_url='https://chromium.googlesource.com/chromium/src',
1094 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001095 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001096
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001097 # Validator is disabled by default, even if it's not explicitely in disabled
1098 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001099 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001100 remote_url='https://chromium.googlesource.com/chromium/src',
1101 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001102 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001103
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001104 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001105 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001106 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001107 if skip_auth_check:
1108 return [((cmd, ), 'true')]
1109
tandrii5d48c322016-08-18 16:19:37 -07001110 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001111 if issue:
1112 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001113 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001114 ])
1115 calls.extend([
1116 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1117 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1118 ((['git', 'config', 'remote.origin.url'],),
1119 'https://chromium.googlesource.com/my/repo'),
1120 ((['git', 'config', 'remote.origin.url'],),
1121 'https://chromium.googlesource.com/my/repo'),
1122 ])
1123 return calls
1124
1125 @classmethod
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001126 def _gerrit_base_calls(cls, issue=None, fetched_description=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001127 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001128 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001129 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001130 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001131 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001132 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1133 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001134 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001135 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001136 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1137 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001138 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001139 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001140 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001141 ((['get_or_create_merge_base', 'master',
1142 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001143 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001144 # Calls to verify branch point is ancestor
1145 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1146 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1147 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001148 ((['git', 'rev-parse', '--show-cdup'],), ''),
1149 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001150
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001151 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001152 'diff', '--name-status', '--no-renames', '-r',
1153 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001154 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001155 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001156 ] + ([
1157 (('GetChangeDetail', 'chromium-review.googlesource.com',
1158 '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
1159 {
1160 'change_id': '123456789',
1161 'current_revision': 'sha1_of_current_revision',
1162 'revisions': { 'sha1_of_current_revision': {
1163 'commit': {'message': fetched_description},
1164 }},
1165 }),
1166 ] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001167 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001168 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001170 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001171 ((['git', 'config', 'user.email'],), 'me@example.com'),
1172 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001173 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1174 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001175 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001176 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001177
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001178 @classmethod
1179 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001180 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001181 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001182 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001183 post_amend_description=None, issue=None, cc=None,
1184 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001185 if post_amend_description is None:
1186 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001187 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001188 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001189
tandriia60502f2016-06-20 02:01:53 -07001190 if squash_mode == 'default':
1191 calls.extend([
1192 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1193 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1194 ])
1195 elif squash_mode in ('override_squash', 'override_nosquash'):
1196 calls.extend([
1197 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1198 'true' if squash_mode == 'override_squash' else 'false'),
1199 ])
1200 else:
1201 assert squash_mode in ('squash', 'nosquash')
1202
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001203 # If issue is given, then description is fetched from Gerrit instead.
1204 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001205 calls += [
1206 ((['git', 'log', '--pretty=format:%s\n\n%b',
1207 'fake_ancestor_sha..HEAD'],),
1208 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001209 if squash:
1210 title = 'Initial_upload'
1211 else:
1212 if not title:
1213 calls += [
1214 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1215 (('Title for patchset []: ',), 'User input'),
1216 ]
1217 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001218 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001219 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001220 # DownloadGerritHook(False)
1221 ((False, ),
1222 ''),
1223 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001224 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001225 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001226 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001227 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001228 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001229 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001230 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001231 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001232 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001233 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001234 if not issue:
1235 # Prompting to edit description on first upload.
1236 calls += [
1237 ((['git', 'config', 'core.editor'],), ''),
1238 ((['RunEditor'],), description),
1239 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001240 ref_to_push = 'abcdef0123456789'
1241 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001242 ((['git', 'config', 'branch.master.merge'],),
1243 'refs/heads/master'),
1244 ((['git', 'config', 'branch.master.remote'],),
1245 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001246 ((['get_or_create_merge_base', 'master',
1247 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001248 'origin/master'),
1249 ((['git', 'rev-parse', 'HEAD:'],),
1250 '0123456789abcdef'),
1251 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001252 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001253 ref_to_push),
1254 ]
1255 else:
1256 ref_to_push = 'HEAD'
1257
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001258 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001259 ((['git', 'rev-list',
1260 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001261 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001262
Aaron Gable9b713dd2016-12-14 16:04:21 -08001263 if title:
1264 if ref_suffix:
1265 ref_suffix += ',m=' + title
1266 else:
1267 ref_suffix = '%m=' + title
1268
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001269 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1270 if ref_suffix:
1271 ref_suffix += ',' + notify_suffix
1272 else:
1273 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001274
ukai@chromium.orge8077812012-02-03 03:41:46 +00001275 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001276 ref_suffix += ',' + ','.join('r=%s' % email
1277 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001278
1279 if git_mirror is None:
1280 calls += [
1281 ((['git', 'config', 'remote.origin.url'],),
1282 'https://chromium.googlesource.com/yyy/zzz'),
1283 ]
1284 else:
1285 calls += [
1286 ((['git', 'config', 'remote.origin.url'],),
1287 '/cache/this-dir-exists'),
1288 (('os.path.isdir', '/cache/this-dir-exists'),
1289 True),
1290 # Runs in /cache/this-dir-exists.
1291 ((['git', 'config', 'remote.origin.url'],),
1292 'https://chromium.googlesource.com/yyy/zzz'),
1293 ]
1294
ukai@chromium.orge8077812012-02-03 03:41:46 +00001295 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001296 ((['git', 'push',
1297 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001298 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001299 ('remote:\n'
1300 'remote: Processing changes: (\)\n'
1301 'remote: Processing changes: (|)\n'
1302 'remote: Processing changes: (/)\n'
1303 'remote: Processing changes: (-)\n'
1304 'remote: Processing changes: new: 1 (/)\n'
1305 'remote: Processing changes: new: 1, done\n'
1306 'remote:\n'
1307 'remote: New Changes:\n'
1308 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1309 'remote:\n'
1310 'To https://chromium.googlesource.com/yyy/zzz\n'
1311 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001312 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001313 if squash:
1314 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001315 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001316 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001317 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001318 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001319 ((['git', 'config', 'branch.master.gerritsquashhash',
1320 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001321 ]
tandrii88189772016-09-29 04:29:57 -07001322 calls += [
1323 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001324 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001325 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001326 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001327 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001328 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001329 return calls
1330
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001331 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001332 self,
1333 upload_args,
1334 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001335 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001336 squash=True,
1337 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001338 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001339 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001340 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001341 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001342 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001343 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001344 cc=None,
1345 git_mirror=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001346 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001347 if squash_mode is None:
1348 if '--no-squash' in upload_args:
1349 squash_mode = 'nosquash'
1350 elif '--squash' in upload_args:
1351 squash_mode = 'squash'
1352 else:
1353 squash_mode = 'default'
1354
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001355 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001356 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001357 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001358 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001359 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001360 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1361 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001362 self.mock(git_cl.gclient_utils, 'RunEditor',
1363 lambda *_, **__: self._mocked_call(['RunEditor']))
1364 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1365
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001366 original_os_path_isdir = os.path.isdir
1367 def selective_os_path_isdir_mock(path):
1368 if path == '/cache/this-dir-exists':
1369 return self._mocked_call('os.path.isdir', path)
1370 return original_os_path_isdir(path)
1371 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1372
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001373 self.calls = self._gerrit_base_calls(
1374 issue=issue,
1375 fetched_description=description)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001376 self.calls += self._gerrit_upload_calls(
1377 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001378 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001379 expected_upstream_ref=expected_upstream_ref,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001380 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001381 post_amend_description=post_amend_description,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001382 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001383 # Uncomment when debugging.
1384 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001385 git_cl.main(['upload'] + upload_args)
1386
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001387 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001388 self._run_gerrit_upload_test(
1389 ['--no-squash'],
1390 'desc\n\nBUG=\n',
1391 [],
1392 squash=False,
1393 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1394
1395 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001396 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001397 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001398 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001399 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001400 [],
tandriia60502f2016-06-20 02:01:53 -07001401 squash=False,
1402 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001403 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001404
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001405 def test_gerrit_no_reviewer(self):
1406 self._run_gerrit_upload_test(
1407 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001408 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001409 [],
1410 squash=False,
1411 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001412
tandriieefe8322016-08-17 10:12:24 -07001413 def test_gerrit_patch_bad_chars(self):
1414 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001415 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001416 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001417 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001418 squash=False,
1419 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001420 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001421 self.assertIn(
1422 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001423 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1424 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001425 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001426
ukai@chromium.orge8077812012-02-03 03:41:46 +00001427 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001428 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001429 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001430 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001431 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001432 squash=False,
1433 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001434 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001435
1436 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001437 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001438 [],
bradnelsond975b302016-10-23 12:20:23 -07001439 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1440 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001441 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001442 ['reviewer@example.com', 'another@example.com'],
1443 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001444 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001445 ref_suffix='%l=Code-Review+1',
1446 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001447
1448 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001449 self._run_gerrit_upload_test(
1450 [],
1451 'desc\nBUG=\n\nChange-Id: 123456789',
1452 [],
1453 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001454
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001455 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001456 self._run_gerrit_upload_test(
1457 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001458 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001459 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001460 squash=True,
1461 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001462
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001463 def test_gerrit_upload_squash_first_with_mirror(self):
1464 self._run_gerrit_upload_test(
1465 ['--squash'],
1466 'desc\nBUG=\n\nChange-Id: 123456789',
1467 [],
1468 squash=True,
1469 expected_upstream_ref='origin/master',
1470 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1471
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001472 def test_gerrit_upload_squash_reupload(self):
1473 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001474 self._run_gerrit_upload_test(
1475 ['--squash'],
1476 description,
1477 [],
1478 squash=True,
1479 expected_upstream_ref='origin/master',
1480 issue=123456)
1481
rmistry@google.com2dd99862015-06-22 12:22:18 +00001482 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001483 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001484 def mock_run_git(*args, **_kwargs):
1485 if args[0] == ['for-each-ref',
1486 '--format=%(refname:short) %(upstream:short)',
1487 'refs/heads']:
1488 # Create a local branch dependency tree that looks like this:
1489 # test1 -> test2 -> test3 -> test4 -> test5
1490 # -> test3.1
1491 # test6 -> test0
1492 branch_deps = [
1493 'test2 test1', # test1 -> test2
1494 'test3 test2', # test2 -> test3
1495 'test3.1 test2', # test2 -> test3.1
1496 'test4 test3', # test3 -> test4
1497 'test5 test4', # test4 -> test5
1498 'test6 test0', # test0 -> test6
1499 'test7', # test7
1500 ]
1501 return '\n'.join(branch_deps)
1502 self.mock(git_cl, 'RunGit', mock_run_git)
1503
1504 class RecordCalls:
1505 times_called = 0
1506 record_calls = RecordCalls()
1507 def mock_CMDupload(*args, **_kwargs):
1508 record_calls.times_called += 1
1509 return 0
1510 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1511
1512 self.calls = [
1513 (('[Press enter to continue or ctrl-C to quit]',), ''),
1514 ]
1515
1516 class MockChangelist():
1517 def __init__(self):
1518 pass
1519 def GetBranch(self):
1520 return 'test1'
1521 def GetIssue(self):
1522 return '123'
1523 def GetPatchset(self):
1524 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001525 def IsGerrit(self):
1526 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001527
1528 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1529 # CMDupload should have been called 5 times because of 5 dependent branches.
1530 self.assertEquals(5, record_calls.times_called)
1531 self.assertEquals(0, ret)
1532
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001533 def test_gerrit_change_id(self):
1534 self.calls = [
1535 ((['git', 'write-tree'], ),
1536 'hashtree'),
1537 ((['git', 'rev-parse', 'HEAD~0'], ),
1538 'branch-parent'),
1539 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1540 'A B <a@b.org> 1456848326 +0100'),
1541 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1542 'C D <c@d.org> 1456858326 +0100'),
1543 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1544 'hashchange'),
1545 ]
1546 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1547 self.assertEqual(change_id, 'Ihashchange')
1548
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001549 def test_desecription_append_footer(self):
1550 for init_desc, footer_line, expected_desc in [
1551 # Use unique desc first lines for easy test failure identification.
1552 ('foo', 'R=one', 'foo\n\nR=one'),
1553 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1554 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1555 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1556 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1557 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1558 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1559 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1560 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1561 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1562 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1563 ]:
1564 desc = git_cl.ChangeDescription(init_desc)
1565 desc.append_footer(footer_line)
1566 self.assertEqual(desc.description, expected_desc)
1567
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001568 def test_update_reviewers(self):
1569 data = [
1570 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001571 ('foo\nR=xx', [], 'foo\nR=xx'),
1572 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001573 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001574 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1575 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1576 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001577 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001578 ('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 +00001579 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001580 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1581 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1582 # Same as the line before, but full of whitespaces.
1583 (
1584 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1585 'foo\nBar\n\nR=c@c\n BUG =',
1586 ),
1587 # Whitespaces aren't interpreted as new lines.
1588 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001589 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001590 expected = [i[2] for i in data]
1591 actual = []
1592 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001593 obj = git_cl.ChangeDescription(orig)
1594 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001595 actual.append(obj.description)
1596 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001597
wittman@chromium.org455dc922015-01-26 20:15:50 +00001598 def test_get_target_ref(self):
1599 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001600 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001601 self.assertEqual(None, git_cl.GetTargetRef(None,
1602 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001603 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001604
wittman@chromium.org455dc922015-01-26 20:15:50 +00001605 # Check default target refs for branches.
1606 self.assertEqual('refs/heads/master',
1607 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001608 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001609 self.assertEqual('refs/heads/master',
1610 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001611 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001612 self.assertEqual('refs/heads/master',
1613 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001614 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001615 self.assertEqual('refs/branch-heads/123',
1616 git_cl.GetTargetRef('origin',
1617 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001618 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001619 self.assertEqual('refs/diff/test',
1620 git_cl.GetTargetRef('origin',
1621 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001622 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001623 self.assertEqual('refs/heads/chrome/m42',
1624 git_cl.GetTargetRef('origin',
1625 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001626 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001627
1628 # Check target refs for user-specified target branch.
1629 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1630 'refs/remotes/branch-heads/123'):
1631 self.assertEqual('refs/branch-heads/123',
1632 git_cl.GetTargetRef('origin',
1633 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001634 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001635 for branch in ('origin/master', 'remotes/origin/master',
1636 'refs/remotes/origin/master'):
1637 self.assertEqual('refs/heads/master',
1638 git_cl.GetTargetRef('origin',
1639 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001640 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001641 for branch in ('master', 'heads/master', 'refs/heads/master'):
1642 self.assertEqual('refs/heads/master',
1643 git_cl.GetTargetRef('origin',
1644 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001645 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001646
wychen@chromium.orga872e752015-04-28 23:42:18 +00001647 def test_patch_when_dirty(self):
1648 # Patch when local tree is dirty
1649 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1650 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1651
1652 def test_diff_when_dirty(self):
1653 # Do 'git cl diff' when local tree is dirty
1654 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1655 self.assertNotEqual(git_cl.main(['diff']), 0)
1656
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001657 @staticmethod
1658 def _get_gerrit_codereview_server_calls(branch, value=None,
1659 git_short_host='host',
1660 detect_branch=True):
1661 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1662
1663 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1664 """
1665 calls = []
1666 if detect_branch:
1667 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1668 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1669 CERR1 if value is None else value))
1670 if value is None:
1671 calls += [
1672 ((['git', 'config', 'branch.' + branch + '.merge'],),
1673 'refs/heads' + branch),
1674 ((['git', 'config', 'branch.' + branch + '.remote'],),
1675 'origin'),
1676 ((['git', 'config', 'remote.origin.url'],),
1677 'https://%s.googlesource.com/my/repo' % git_short_host),
1678 ]
1679 return calls
1680
tandriidf09a462016-08-18 16:23:55 -07001681 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001682 new_branch=False, git_short_host='host',
1683 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001684 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001685 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1686 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001687 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001688 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001689 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1690
tandriidf09a462016-08-18 16:23:55 -07001691 if new_branch:
1692 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1693 else:
1694 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001695
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001696 if not force_codereview:
1697 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001698 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001699 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001700 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1701 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001702 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001703 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001704
1705 if is_gerrit:
1706 if not force_codereview:
1707 self.calls += [
1708 ((['git', 'config', 'gerrit.host'],), 'true'),
1709 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001710 if detect_gerrit_server:
1711 self.calls += self._get_gerrit_codereview_server_calls(
1712 'master', git_short_host=git_short_host,
1713 detect_branch=not new_branch and force_codereview)
1714
1715 self.calls += [
1716 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001717 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001718 {
1719 'current_revision': '7777777777',
1720 'revisions': {
1721 '1111111111': {
1722 '_number': 1,
1723 'fetch': {'http': {
1724 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1725 'ref': 'refs/changes/56/123456/1',
1726 }},
1727 },
1728 '7777777777': {
1729 '_number': 7,
1730 'fetch': {'http': {
1731 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1732 'ref': 'refs/changes/56/123456/7',
1733 }},
1734 },
1735 },
1736 }),
1737 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001738 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001739 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001740 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001741 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001742 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001743 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001744 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001745
tandriidf09a462016-08-18 16:23:55 -07001746 def _common_patch_successful(self, new_branch=False):
1747 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001748 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001749 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001750 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001751 'patch from issue 123456 at patchset 60001 ' +
1752 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001753 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001754 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001755 ((['git', 'config', 'branch.master.rietveldserver',
1756 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001757 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001758 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001759 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001760
1761 def test_patch_successful(self):
1762 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001763 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1764
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001765 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001766 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001767 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1768
wychen@chromium.orga872e752015-04-28 23:42:18 +00001769 def test_patch_conflict(self):
1770 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001771 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001772 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001773
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001774 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001775 self._patch_common(is_gerrit=True, git_short_host='chromium',
1776 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001777 self.calls += [
1778 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1779 'refs/changes/56/123456/7'],), ''),
1780 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001781 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001782 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001783 ((['git', 'config', 'branch.master.gerritserver',
1784 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001785 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001786 ]
1787 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1788
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001789 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001790 self._patch_common(is_gerrit=True, force_codereview=True,
1791 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001792 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001793 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001794 'refs/changes/56/123456/7'],), ''),
1795 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001796 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001797 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001798 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001799 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001800 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001801 ]
1802 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1803
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001804 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001805 self._patch_common(is_gerrit=True, git_short_host='else',
1806 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001807 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001808 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001809 'refs/changes/56/123456/1'],), ''),
1810 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001811 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001812 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001813 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001814 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001815 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001816 ]
1817 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001818 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001819
1820 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001821 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1822 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001823 self.calls += [
1824 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1825 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001826 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1827 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1828 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001829 ]
1830 with self.assertRaises(SystemExitMock):
1831 git_cl.main(['patch',
1832 'https://chromium-review.googlesource.com/#/c/123456/1'])
1833
tandriic2405f52016-10-10 08:13:15 -07001834 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001835 def notExists(_issue, *_, **kwargs):
1836 self.assertFalse(kwargs['ignore_404'])
1837 raise git_cl.gerrit_util.GerritError(404, '')
1838 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1839
tandriic2405f52016-10-10 08:13:15 -07001840 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001841 self.calls = [
1842 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1843 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1844 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1845 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1846 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1847 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001848 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001849 'or you have no access to it'],), SystemExitMock()),
1850 ]
1851 with self.assertRaises(SystemExitMock):
1852 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1853
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001854 def _checkout_calls(self):
1855 return [
1856 ((['git', 'config', '--local', '--get-regexp',
1857 'branch\\..*\\.rietveldissue'], ),
1858 ('branch.retrying.rietveldissue 1111111111\n'
1859 'branch.some-fix.rietveldissue 2222222222\n')),
1860 ((['git', 'config', '--local', '--get-regexp',
1861 'branch\\..*\\.gerritissue'], ),
1862 ('branch.ger-branch.gerritissue 123456\n'
1863 'branch.gbranch654.gerritissue 654321\n')),
1864 ]
1865
1866 def test_checkout_gerrit(self):
1867 """Tests git cl checkout <issue>."""
1868 self.calls = self._checkout_calls()
1869 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1870 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1871
1872 def test_checkout_rietveld(self):
1873 """Tests git cl checkout <issue>."""
1874 self.calls = self._checkout_calls()
1875 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1876 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1877
1878 def test_checkout_not_found(self):
1879 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001880 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001881 self.calls = self._checkout_calls()
1882 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1883
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001884 def test_checkout_no_branch_issues(self):
1885 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001886 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001887 self.calls = [
1888 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001889 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001890 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001891 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001892 ]
1893 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1894
tandrii@chromium.org28253532016-04-14 13:46:56 +00001895 def _test_gerrit_ensure_authenticated_common(self, auth,
1896 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001897 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1898 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1899 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001900 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001901 self.mock(git_cl, 'ask_for_data',
1902 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001903 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001904 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001905 cl.branch = 'master'
1906 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001907 cl.lookedup_issue = True
1908 return cl
1909
1910 def test_gerrit_ensure_authenticated_missing(self):
1911 cl = self._test_gerrit_ensure_authenticated_common(auth={
1912 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1913 })
1914 self.calls.append(
1915 ((['DieWithError',
1916 'Credentials for the following hosts are required:\n'
1917 ' chromium-review.googlesource.com\n'
1918 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1919 'You can (re)generate your credentails by visiting '
1920 'https://chromium-review.googlesource.com/new-password'],), ''),)
1921 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1922
1923 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001924 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001925 cl = self._test_gerrit_ensure_authenticated_common(auth={
1926 'chromium.googlesource.com': 'one',
1927 'chromium-review.googlesource.com': 'other',
1928 })
1929 self.calls.append(
1930 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001931 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001932 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1933
1934 def test_gerrit_ensure_authenticated_ok(self):
1935 cl = self._test_gerrit_ensure_authenticated_common(auth={
1936 'chromium.googlesource.com': 'same',
1937 'chromium-review.googlesource.com': 'same',
1938 })
1939 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1940
tandrii@chromium.org28253532016-04-14 13:46:56 +00001941 def test_gerrit_ensure_authenticated_skipped(self):
1942 cl = self._test_gerrit_ensure_authenticated_common(
1943 auth={}, skip_auth_check=True)
1944 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1945
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001946 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001947 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1948 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001949 self.calls = [
1950 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001951 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001952 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1953 ((['git', 'config', 'rietveld.server'],), ''),
1954 ((['git', 'config', 'rietveld.server'],), ''),
1955 ((['git', 'config', 'branch.feature.rietveldserver'],),
1956 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001957 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001958 ]
1959 self.assertEqual(0, git_cl.main(['set-commit']))
1960
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001961 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001962 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001963 lambda h, i, labels, notify=None:
1964 self._mocked_call(['SetReview', h, i, labels, notify]))
1965
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001966 self.calls = [
1967 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001968 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1969 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001970 ((['git', 'config', 'branch.feature.gerritserver'],),
1971 'https://chromium-review.googlesource.com'),
1972 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001973 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001974 ]
tandriid9e5ce52016-07-13 02:32:59 -07001975
1976 def test_cmd_set_commit_gerrit_clear(self):
1977 self._cmd_set_commit_gerrit_common(0)
1978 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1979
1980 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001981 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001982 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1983
tandriid9e5ce52016-07-13 02:32:59 -07001984 def test_cmd_set_commit_gerrit(self):
1985 self._cmd_set_commit_gerrit_common(2)
1986 self.assertEqual(0, git_cl.main(['set-commit']))
1987
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001988 def test_description_display(self):
1989 out = StringIO.StringIO()
1990 self.mock(git_cl.sys, 'stdout', out)
1991
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001992 self.mock(git_cl, 'Changelist', ChangelistMock)
1993 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001994
1995 self.assertEqual(0, git_cl.main(['description', '-d']))
1996 self.assertEqual('foo\n', out.getvalue())
1997
1998 def test_description_rietveld(self):
1999 out = StringIO.StringIO()
2000 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002001 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002002
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002003 self.assertEqual(0, git_cl.main([
2004 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2005 self.assertEqual('foobar\n', out.getvalue())
2006
iannucci3c972b92016-08-17 13:24:10 -07002007 def test_StatusFieldOverrideIssueMissingArgs(self):
2008 out = StringIO.StringIO()
2009 self.mock(git_cl.sys, 'stderr', out)
2010
2011 try:
2012 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2013 except SystemExit as ex:
2014 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002015 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002016
2017 out = StringIO.StringIO()
2018 self.mock(git_cl.sys, 'stderr', out)
2019
2020 try:
2021 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2022 except SystemExit as ex:
2023 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002024 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002025
2026 def test_StatusFieldOverrideIssue(self):
2027 out = StringIO.StringIO()
2028 self.mock(git_cl.sys, 'stdout', out)
2029
2030 def assertIssue(cl_self, *_args):
2031 self.assertEquals(cl_self.issue, 1)
2032 return 'foobar'
2033
2034 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2035 self.calls = [
2036 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2037 ((['git', 'config', 'rietveld.server'],), ''),
2038 ((['git', 'config', 'rietveld.server'],), ''),
2039 ]
iannuccie53c9352016-08-17 14:40:40 -07002040 self.assertEqual(
2041 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2042 0)
iannucci3c972b92016-08-17 13:24:10 -07002043 self.assertEqual(out.getvalue(), 'foobar\n')
2044
iannuccie53c9352016-08-17 14:40:40 -07002045 def test_SetCloseOverrideIssue(self):
2046 def assertIssue(cl_self, *_args):
2047 self.assertEquals(cl_self.issue, 1)
2048 return 'foobar'
2049
2050 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2051 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2052 self.calls = [
2053 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2054 ((['git', 'config', 'rietveld.server'],), ''),
2055 ((['git', 'config', 'rietveld.server'],), ''),
2056 ]
2057 self.assertEqual(
2058 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2059
2060 def test_SetCommitOverrideIssue(self):
2061 def assertIssue(cl_self, *_args):
2062 self.assertEquals(cl_self.issue, 1)
2063 return 'foobar'
2064
2065 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2066 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2067 self.calls = [
2068 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2069 ((['git', 'config', 'rietveld.server'],), ''),
2070 ((['git', 'config', 'rietveld.server'],), ''),
2071 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2072 ((['git', 'config', 'rietveld.server'],), ''),
2073 ((['git', 'config', 'rietveld.server'],), ''),
2074 ]
2075 self.assertEqual(
2076 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2077
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002078 def test_description_gerrit(self):
2079 out = StringIO.StringIO()
2080 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002081 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002082 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002083 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2084 {
2085 'current_revision': 'sha1',
2086 'revisions': {'sha1': {
2087 'commit': {'message': 'foobar'},
2088 }},
2089 }),
2090 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002091 self.assertEqual(0, git_cl.main([
2092 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2093 self.assertEqual('foobar\n', out.getvalue())
2094
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002095 def test_description_set_raw(self):
2096 out = StringIO.StringIO()
2097 self.mock(git_cl.sys, 'stdout', out)
2098
2099 self.mock(git_cl, 'Changelist', ChangelistMock)
2100 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2101
2102 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2103 self.assertEqual('hihi', ChangelistMock.desc)
2104
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002105 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002106 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002107
2108 def RunEditor(desc, _, **kwargs):
2109 self.assertEquals(
2110 '# Enter a description of the change.\n'
2111 '# This will be displayed on the codereview site.\n'
2112 '# The first line will also be used as the subject of the review.\n'
2113 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002114 '--------------------\n'
2115 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002116 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002117 # Simulate user changing something.
2118 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002119
dsansomee2d6fd92016-09-08 00:10:47 -07002120 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002121 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002122
2123 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2124 self.mock(git_cl.Changelist, 'GetDescription',
2125 lambda *args: current_desc)
2126 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2127 UpdateDescriptionRemote)
2128 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2129
2130 self.calls = [
2131 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002132 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002133 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2134 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002135 ((['git', 'config', 'core.editor'],), 'vi'),
2136 ]
2137 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2138
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002139 def test_description_set_stdin(self):
2140 out = StringIO.StringIO()
2141 self.mock(git_cl.sys, 'stdout', out)
2142
2143 self.mock(git_cl, 'Changelist', ChangelistMock)
2144 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2145
2146 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2147 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2148
kmarshall3bff56b2016-06-06 18:31:47 -07002149 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002150 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2151
kmarshall3bff56b2016-06-06 18:31:47 -07002152 self.calls = \
2153 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2154 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002155 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002156 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2157 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002158 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2159 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2160 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002161 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2162 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2163 ((['git', 'branch', '-D', 'foo'],), '')]
2164
kmarshall3bff56b2016-06-06 18:31:47 -07002165 self.mock(git_cl, 'get_cl_statuses',
2166 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002167 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2168 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2169 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002170
2171 self.assertEqual(0, git_cl.main(['archive', '-f']))
2172
2173 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002174 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002175 self.calls = \
2176 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2177 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002178 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002179 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2180 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002181 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2182
kmarshall9249e012016-08-23 12:02:16 -07002183 self.mock(git_cl, 'get_cl_statuses',
2184 lambda branches, fine_grained, max_processes:
2185 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2186
2187 self.assertEqual(1, git_cl.main(['archive', '-f']))
2188
2189 def test_archive_dry_run(self):
2190 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2191
2192 self.calls = \
2193 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2194 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2195 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2196 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2197 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2198 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2199 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2200 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2201 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002202
2203 self.mock(git_cl, 'get_cl_statuses',
2204 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002205 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2206 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2207 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002208
kmarshall9249e012016-08-23 12:02:16 -07002209 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2210
2211 def test_archive_no_tags(self):
2212 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2213
2214 self.calls = \
2215 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2216 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2217 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2218 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2219 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2220 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2221 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2222 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2223 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2224 ((['git', 'branch', '-D', 'foo'],), '')]
2225
2226 self.mock(git_cl, 'get_cl_statuses',
2227 lambda branches, fine_grained, max_processes:
2228 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2229 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2230 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2231
2232 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002233
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002234 def test_cmd_issue_erase_existing(self):
2235 out = StringIO.StringIO()
2236 self.mock(git_cl.sys, 'stdout', out)
2237 self.calls = [
2238 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002239 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2240 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002241 # Let this command raise exception (retcode=1) - it should be ignored.
2242 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002243 CERR1),
2244 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2245 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002246 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2247 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2248 ''),
2249 ]
2250 self.assertEqual(0, git_cl.main(['issue', '0']))
2251
phajdan.jre328cf92016-08-22 04:12:17 -07002252 def test_cmd_issue_json(self):
2253 out = StringIO.StringIO()
2254 self.mock(git_cl.sys, 'stdout', out)
2255 self.calls = [
2256 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002257 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002258 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2259 ((['git', 'config', 'rietveld.server'],),
2260 'https://codereview.chromium.org'),
2261 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2262 (('write_json', 'output.json',
2263 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2264 ''),
2265 ]
2266 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2267
tandriide281ae2016-10-12 06:02:30 -07002268 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002269 self.mock(git_cl.Changelist, 'GetChange',
2270 lambda _, *a: (
2271 self._mocked_call(['GetChange']+list(a))))
2272 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2273 lambda *_, **__: (
2274 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002275 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2276 lambda _, s: self._mocked_call(['SetCQState', s]))
2277 self.calls = [
2278 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002279 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002280 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2281 ((['git', 'config', 'rietveld.server'],),
2282 'https://codereview.chromium.org'),
2283 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2284 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2285 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2286 ((['get_or_create_merge_base', 'feature', 'feature'],),
2287 'fake_ancestor_sha'),
2288 ((['GetChange', 'fake_ancestor_sha', None], ),
2289 git_cl.presubmit_support.GitChange(
2290 '', '', '', '', '', '', '', '')),
2291 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2292 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002293 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2294 ]
2295 out = StringIO.StringIO()
2296 self.mock(git_cl.sys, 'stdout', out)
2297 self.assertEqual(0, git_cl.main(['try']))
2298 self.assertEqual(
2299 out.getvalue(),
2300 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2301
tandrii8c5a3532016-11-04 07:52:02 -07002302 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2303 self.mock(git_cl.Changelist, 'GetChange',
2304 lambda _, *a: (
2305 self._mocked_call(['GetChange']+list(a))))
2306 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2307 lambda *_, **__: (
2308 self._mocked_call(['DoGetTryMasters'])))
2309 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2310 lambda _, s: self._mocked_call(['SetCQState', s]))
2311
tandrii8c5a3532016-11-04 07:52:02 -07002312 self.calls = [
2313 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2314 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2315 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2316 ((['git', 'config', 'branch.feature.gerritserver'],),
2317 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002318 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2319 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2320 'project': 'depot_tools',
2321 'status': 'OPEN',
2322 'owner': {'email': 'owner@e.mail'},
2323 'revisions': {
2324 'deadbeaf': {
2325 '_number': 6,
2326 },
2327 'beeeeeef': {
2328 '_number': 7,
2329 'fetch': {'http': {
2330 'url': 'https://chromium.googlesource.com/depot_tools',
2331 'ref': 'refs/changes/56/123456/7'
2332 }},
2333 },
2334 },
2335 }),
tandrii8c5a3532016-11-04 07:52:02 -07002336 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2337 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2338 ((['get_or_create_merge_base', 'feature', 'feature'],),
2339 'fake_ancestor_sha'),
2340 ((['GetChange', 'fake_ancestor_sha', None], ),
2341 git_cl.presubmit_support.GitChange(
2342 '', '', '', '', '', '', '', '')),
2343 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2344 ((['DoGetTryMasters'], ), None),
2345 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2346 ]
2347 out = StringIO.StringIO()
2348 self.mock(git_cl.sys, 'stdout', out)
2349 self.assertEqual(0, git_cl.main(['try']))
2350 self.assertEqual(
2351 out.getvalue(),
2352 'scheduled CQ Dry Run on '
2353 'https://chromium-review.googlesource.com/123456\n')
2354
2355 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2356 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2357 lambda _: {
2358 'owner_email': 'owner@e.mail',
2359 'private': False,
2360 'closed': False,
2361 'project': 'depot_tools',
2362 'patchsets': [20001],
2363 })
tandriide281ae2016-10-12 06:02:30 -07002364 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2365 self.calls = [
2366 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2367 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2368 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2369 ((['git', 'config', 'rietveld.server'],),
2370 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002371 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002372 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002373 ]
2374
2375 def _buildbucket_retry(*_, **kw):
2376 # self.maxDiff = 10000
2377 body = json.loads(kw['body'])
2378 self.assertEqual(len(body['builds']), 1)
2379 build = body['builds'][0]
2380 params = json.loads(build.pop('parameters_json'))
2381 self.assertEqual(params, {
2382 u'builder_name': u'win',
2383 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2384 u'revision': None}],
2385 u'properties': {
2386 u'category': u'git_cl_try',
2387 u'issue': 123,
2388 u'key': u'val',
2389 u'json': [{u'a': 1}, None],
2390 u'master': u'tryserver.chromium',
2391 u'patch_project': u'depot_tools',
2392 u'patch_storage': u'rietveld',
2393 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002394 u'rietveld': u'https://codereview.chromium.org',
2395 }
2396 })
2397 self.assertEqual(build, {
2398 u'bucket': u'master.tryserver.chromium',
2399 u'client_operation_id': u'uuid4',
2400 u'tags': [u'builder:win',
2401 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002402 u'user_agent:git_cl_try',
2403 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002404 })
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(),
borenet6c0efe62016-10-19 08:13:29 -07002414 'Tried jobs on:\nBucket: master.tryserver.chromium')
2415
tandrii8c5a3532016-11-04 07:52:02 -07002416 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2417 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2418 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2419
tandrii8c5a3532016-11-04 07:52:02 -07002420 self.calls = [
2421 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2422 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2423 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2424 ((['git', 'config', 'branch.feature.gerritserver'],),
2425 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002426 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002427 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002428 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002429 'status': 'OPEN',
2430 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002431 'revisions': {
2432 'deadbeaf': {
2433 '_number': 6,
2434 },
2435 'beeeeeef': {
2436 '_number': 7,
2437 'fetch': {'http': {
2438 'url': 'https://chromium.googlesource.com/depot_tools',
2439 'ref': 'refs/changes/56/123456/7'
2440 }},
2441 },
2442 },
2443 }),
2444 ]
2445
2446 def _buildbucket_retry(*_, **kw):
2447 # self.maxDiff = 10000
2448 body = json.loads(kw['body'])
2449 self.assertEqual(len(body['builds']), 1)
2450 build = body['builds'][0]
2451 params = json.loads(build.pop('parameters_json'))
2452 self.assertEqual(params, {
2453 u'builder_name': u'win',
2454 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2455 u'revision': None}],
2456 u'properties': {
2457 u'category': u'git_cl_try',
2458 u'key': u'val',
2459 u'json': [{u'a': 1}, None],
2460 u'master': u'tryserver.chromium',
2461
2462 u'patch_gerrit_url':
2463 u'https://chromium-review.googlesource.com',
2464 u'patch_issue': 123456,
2465 u'patch_project': u'depot_tools',
2466 u'patch_ref': u'refs/changes/56/123456/7',
2467 u'patch_repository_url':
2468 u'https://chromium.googlesource.com/depot_tools',
2469 u'patch_set': 7,
2470 u'patch_storage': u'gerrit',
2471 }
2472 })
2473 self.assertEqual(build, {
2474 u'bucket': u'master.tryserver.chromium',
2475 u'client_operation_id': u'uuid4',
2476 u'tags': [
2477 u'builder:win',
2478 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2479 u'user_agent:git_cl_try',
2480 u'master:tryserver.chromium'],
2481 })
2482
2483 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2484
2485 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2486 self.assertEqual(0, git_cl.main([
2487 'try', '-m', 'tryserver.chromium', '-b', 'win',
2488 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2489 self.assertRegexpMatches(
2490 git_cl.sys.stdout.getvalue(),
2491 'Tried jobs on:\nBucket: master.tryserver.chromium')
2492
borenet6c0efe62016-10-19 08:13:29 -07002493 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002494 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2495 lambda _: {
2496 'owner_email': 'owner@e.mail',
2497 'private': False,
2498 'closed': False,
2499 'project': 'depot_tools',
2500 'patchsets': [20001],
2501 })
borenet6c0efe62016-10-19 08:13:29 -07002502 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2503 self.calls = [
2504 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2505 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2506 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2507 ((['git', 'config', 'rietveld.server'],),
2508 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002509 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002510 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002511 ]
2512
2513 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002514 body = json.loads(kw['body'])
2515 self.assertEqual(len(body['builds']), 1)
2516 build = body['builds'][0]
2517 params = json.loads(build.pop('parameters_json'))
2518 self.assertEqual(params, {
2519 u'builder_name': u'win',
2520 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2521 u'revision': None}],
2522 u'properties': {
2523 u'category': u'git_cl_try',
2524 u'issue': 123,
2525 u'patch_project': u'depot_tools',
2526 u'patch_storage': u'rietveld',
2527 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002528 u'rietveld': u'https://codereview.chromium.org',
2529 }
2530 })
2531 self.assertEqual(build, {
2532 u'bucket': u'test.bucket',
2533 u'client_operation_id': u'uuid4',
2534 u'tags': [u'builder:win',
2535 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2536 u'user_agent:git_cl_try'],
2537 })
2538
2539 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2540
2541 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2542 self.assertEqual(0, git_cl.main([
2543 'try', '-B', 'test.bucket', '-b', 'win']))
2544 self.assertRegexpMatches(
2545 git_cl.sys.stdout.getvalue(),
2546 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002547
qyearsley123a4682016-10-26 09:12:17 -07002548 def test_git_cl_try_bots_on_multiple_masters(self):
2549 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2550 self.calls = [
2551 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2552 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2553 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2554 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002555 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002556 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2557 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2558 ]
2559
2560 def _buildbucket_retry(*_, **kw):
2561 body = json.loads(kw['body'])
2562 self.assertEqual(len(body['builds']), 2)
2563
2564 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2565 self.assertEqual(first_build_params['builder_name'], 'builder1')
2566 self.assertEqual(first_build_params['properties']['master'], 'master1')
2567
2568 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2569 self.assertEqual(first_build_params['builder_name'], 'builder2')
2570 self.assertEqual(first_build_params['properties']['master'], 'master2')
2571
2572 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2573
2574 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2575 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2576
2577 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2578 self.assertEqual(
2579 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2580 self.assertEqual(
2581 git_cl.sys.stdout.getvalue(),
2582 'Tried jobs on:\n'
2583 'Bucket: master.master1\n'
2584 ' builder1: []\n'
2585 'Bucket: master.master2\n'
2586 ' builder2: []\n'
2587 'To see results here, run: git cl try-results\n'
2588 'To see results in browser, run: git cl web\n')
2589
tandrii16e0b4e2016-06-07 10:34:28 -07002590 def _common_GerritCommitMsgHookCheck(self):
2591 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2592 self.mock(git_cl.os.path, 'abspath',
2593 lambda path: self._mocked_call(['abspath', path]))
2594 self.mock(git_cl.os.path, 'exists',
2595 lambda path: self._mocked_call(['exists', path]))
2596 self.mock(git_cl.gclient_utils, 'FileRead',
2597 lambda path: self._mocked_call(['FileRead', path]))
2598 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2599 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2600 self.calls = [
2601 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2602 ((['abspath', '../'],), '/abs/git_repo_root'),
2603 ]
2604 return git_cl.Changelist(codereview='gerrit', issue=123)
2605
2606 def test_GerritCommitMsgHookCheck_custom_hook(self):
2607 cl = self._common_GerritCommitMsgHookCheck()
2608 self.calls += [
2609 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2610 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2611 '#!/bin/sh\necho "custom hook"')
2612 ]
2613 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2614
2615 def test_GerritCommitMsgHookCheck_not_exists(self):
2616 cl = self._common_GerritCommitMsgHookCheck()
2617 self.calls += [
2618 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2619 ]
2620 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2621
2622 def test_GerritCommitMsgHookCheck(self):
2623 cl = self._common_GerritCommitMsgHookCheck()
2624 self.calls += [
2625 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2626 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2627 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2628 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2629 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2630 ''),
2631 ]
2632 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2633
tandriic4344b52016-08-29 06:04:54 -07002634 def test_GerritCmdLand(self):
2635 self.calls += [
2636 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2637 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2638 'deadbeaf'),
2639 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2640 ((['git', 'config', 'branch.feature.gerritserver'],),
2641 'chromium-review.googlesource.com'),
2642 ]
2643 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2644 cl._codereview_impl._GetChangeDetail = lambda _: {
2645 'labels': {},
2646 'current_revision': 'deadbeaf',
2647 }
agable32978d92016-11-01 12:55:02 -07002648 cl._codereview_impl._GetChangeCommit = lambda: {
2649 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002650 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002651 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2652 }
tandriic4344b52016-08-29 06:04:54 -07002653 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002654 out = StringIO.StringIO()
2655 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002656 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002657 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002658 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002659
tandrii221ab252016-10-06 08:12:04 -07002660 BUILDBUCKET_BUILDS_MAP = {
2661 '9000': {
2662 'id': '9000',
2663 'status': 'STARTED',
2664 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2665 'result_details_json': '{"properties": {}}',
2666 'bucket': 'master.x.y',
2667 'created_by': 'user:someone@chromium.org',
2668 'created_ts': '147200002222000',
2669 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2670 },
2671 '8000': {
2672 'id': '8000',
2673 'status': 'COMPLETED',
2674 'result': 'FAILURE',
2675 'failure_reason': 'BUILD_FAILURE',
2676 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2677 'result_details_json': '{"properties": {}}',
2678 'bucket': 'master.x.y',
2679 'created_by': 'user:someone@chromium.org',
2680 'created_ts': '147200001111000',
2681 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2682 },
2683 }
2684
2685 def test_write_try_results_json(self):
2686 expected_output = [
2687 {
2688 'buildbucket_id': '8000',
2689 'bucket': 'master.x.y',
2690 'builder_name': 'my-builder',
2691 'status': 'COMPLETED',
2692 'result': 'FAILURE',
2693 'failure_reason': 'BUILD_FAILURE',
2694 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2695 },
2696 {
2697 'buildbucket_id': '9000',
2698 'bucket': 'master.x.y',
2699 'builder_name': 'my-builder',
2700 'status': 'STARTED',
2701 'result': None,
2702 'failure_reason': None,
2703 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2704 }
2705 ]
2706 self.calls = [(('write_json', 'output.json', expected_output), '')]
2707 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2708
tandrii45b2a582016-10-11 03:14:16 -07002709 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002710 out = StringIO.StringIO()
2711 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002712 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2713 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002714 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2715 self._mocked_call(['get_authenticator_for_host', host]))
2716 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2717 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002718
2719 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2720 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002721 self.calls += [
2722 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2723 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2724 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2725 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2726 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2727 ((['git', 'config', 'branch.feature.rietveldserver'],),
2728 'codereview.example.com'),
2729 ((['get_authenticator_for_host', 'codereview.example.com'],),
2730 AuthenticatorMock()),
2731 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2732
2733 def test_fetch_try_jobs_none_rietveld(self):
2734 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002735 # Simulate that user isn't logged in.
2736 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002737 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002738 self.assertRegexpMatches(sys.stdout.getvalue(),
2739 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002740 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2741
2742 def test_fetch_try_jobs_some_rietveld(self):
2743 self._setup_fetch_try_jobs_rietveld({
2744 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2745 })
2746 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002747 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2748 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2749 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2750
2751 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2752 self._setup_fetch_try_jobs(most_recent_patchset=13)
2753 self.calls += [
2754 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2755 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2756 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002757 # TODO(tandrii): Uncomment the below if we decide to support checking
2758 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002759 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002760 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002761 ((['git', 'config', 'branch.feature.gerritserver'],),
2762 'https://x-review.googlesource.com'),
2763 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2764 AuthenticatorMock()),
2765 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2766
2767 def test_fetch_try_jobs_none_gerrit(self):
2768 self._setup_fetch_try_jobs_gerrit({})
2769 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002770 # TODO(tandrii): Uncomment the below if we decide to support checking
2771 # patchsets for Gerrit.
2772 # self.assertRegexpMatches(
2773 # sys.stdout.getvalue(),
2774 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002775 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2776
2777 def test_fetch_try_jobs_some_gerrit(self):
2778 self._setup_fetch_try_jobs_gerrit({
2779 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2780 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002781 # TODO(tandrii): Uncomment the below if we decide to support checking
2782 # patchsets for Gerrit.
2783 # self.calls.remove(
2784 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002785 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2786
2787 # ... and doesn't result in warning.
2788 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2789 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002790 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2791 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2792
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002793 def _mock_gerrit_changes_for_detail_cache(self):
2794 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002795
2796 def test_gerrit_change_detail_cache_normalize(self):
2797 self._mock_gerrit_changes_for_detail_cache()
2798 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002799 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002800 ]
2801 cl = git_cl.Changelist(codereview='gerrit')
2802 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2803 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2804 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2805 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2806
2807 def test_gerrit_change_detail_cache_simple(self):
2808 self._mock_gerrit_changes_for_detail_cache()
2809 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002810 (('GetChangeDetail', 'host', '1', []), 'a'),
2811 (('GetChangeDetail', 'host', '2', []), 'b'),
2812 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002813 ]
2814 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2815 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2816 self.assertEqual(cl._GetChangeDetail(), 'a')
2817 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002818 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002819 self.assertEqual(cl._GetChangeDetail(), 'a')
2820 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2821
2822 def test_gerrit_change_detail_cache_options(self):
2823 self._mock_gerrit_changes_for_detail_cache()
2824 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002825 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2826 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2827 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2828 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002829 ]
2830 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2831 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2832 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2833 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2834 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2835 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2836 self.assertEqual(cl._GetChangeDetail(), 'cab')
2837
2838 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2839 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2840 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2841 self.assertEqual(cl._GetChangeDetail(), 'cab')
2842
2843 # Finally, no_cache should invalidate all caches for given change.
2844 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2845 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2846
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002847
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002848if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01002849 logging.basicConfig(
2850 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002851 unittest.main()