blob: a2e37332cb4d1e299f93ff658b25c5b3fd1b5725 [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
Kenneth Russell61e2ed42017-02-15 11:47:13 -080041 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000042 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
Kenneth Russell61e2ed42017-02-15 11:47:13 -080060 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000061 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):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100176 def test_get_description(self):
177 cl = git_cl.Changelist(issue=1, codereview='rietveld',
178 codereview_host='host')
179 cl.description = 'x'
180 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800181 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100182 self.assertEquals(cl.GetDescription(), 'x')
183 self.assertEquals(cl.GetDescription(force=True), 'y')
184 self.assertEquals(cl.GetDescription(), 'y')
185
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000186 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
187 parsed = urlparse.urlparse(url)
188 result = func(parsed)
189 if fail:
190 self.assertIsNone(result)
191 return None
192 self.assertIsNotNone(result)
193 self.assertEqual(result.issue, issue)
194 self.assertEqual(result.patchset, patchset)
195 self.assertEqual(result.hostname, hostname)
196 return result
197
198 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700199 def test(url, issue=None, patchset=None, hostname=None, fail=None):
200 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000201 git_cl._RietveldChangelistImpl.ParseIssueURL,
202 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000203
204 test('http://codereview.chromium.org/123',
205 123, None, 'codereview.chromium.org')
206 test('https://codereview.chromium.org/123',
207 123, None, 'codereview.chromium.org')
208 test('https://codereview.chromium.org/123/',
209 123, None, 'codereview.chromium.org')
210 test('https://codereview.chromium.org/123/whatever',
211 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700212 test('https://codereview.chromium.org/123/#ps20001',
213 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000214 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700215 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000216 # This looks like bad Gerrit, but is actually valid Rietveld.
217 test('https://chrome-review.source.com/123/4/',
218 123, None, 'chrome-review.source.com')
219
220 test('https://codereview.chromium.org/deadbeaf', fail=True)
221 test('https://codereview.chromium.org/api/123', fail=True)
222 test('bad://codereview.chromium.org/123', fail=True)
223 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
224
225 def test_ParseIssueURL_gerrit(self):
226 def test(url, issue=None, patchset=None, hostname=None, fail=None):
227 self._test_ParseIssueUrl(
228 git_cl._GerritChangelistImpl.ParseIssueURL,
229 url, issue, patchset, hostname, fail)
230
231 test('http://chrome-review.source.com/c/123',
232 123, None, 'chrome-review.source.com')
233 test('https://chrome-review.source.com/c/123/',
234 123, None, 'chrome-review.source.com')
235 test('https://chrome-review.source.com/c/123/4',
236 123, 4, 'chrome-review.source.com')
237 test('https://chrome-review.source.com/#/c/123/4',
238 123, 4, 'chrome-review.source.com')
239 test('https://chrome-review.source.com/c/123/4',
240 123, 4, 'chrome-review.source.com')
241 test('https://chrome-review.source.com/123',
242 123, None, 'chrome-review.source.com')
243 test('https://chrome-review.source.com/123/4',
244 123, 4, 'chrome-review.source.com')
245
246 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
247 test('https://chrome-review.source.com/c/abc/', fail=True)
248 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
249
250 def test_ParseIssueNumberArgument(self):
251 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
252 result = git_cl.ParseIssueNumberArgument(arg)
253 self.assertIsNotNone(result)
254 if fail:
255 self.assertFalse(result.valid)
256 else:
257 self.assertEqual(result.issue, issue)
258 self.assertEqual(result.patchset, patchset)
259 self.assertEqual(result.hostname, hostname)
260
261 test('123', 123)
262 test('', fail=True)
263 test('abc', fail=True)
264 test('123/1', fail=True)
265 test('123a', fail=True)
266 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
267 # Rietveld.
268 test('https://codereview.source.com/123',
269 123, None, 'codereview.source.com')
270 test('https://codereview.source.com/www123', fail=True)
271 # Gerrrit.
272 test('https://chrome-review.source.com/c/123/4',
273 123, 4, 'chrome-review.source.com')
274 test('https://chrome-review.source.com/bad/123/4', fail=True)
275
tandriif9aefb72016-07-01 09:06:51 -0700276 def test_get_bug_line_values(self):
277 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
278 self.assertEqual(f('', ''), [])
279 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
280 self.assertEqual(f('v8', '456'), ['v8:456'])
281 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
282 # Not nice, but not worth carying.
283 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
284 ['v8:456', 'chromium:123', 'v8:123'])
285
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100286 def _test_git_number(self, parent_msg, dest_ref, child_msg,
287 parent_hash='parenthash'):
288 desc = git_cl.ChangeDescription(child_msg)
289 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
290 return desc.description
291
292 def assertEqualByLine(self, actual, expected):
293 self.assertEqual(actual.splitlines(), expected.splitlines())
294
295 def test_git_number_bad_parent(self):
296 with self.assertRaises(ValueError):
297 self._test_git_number('Parent', 'refs/heads/master', 'Child')
298
299 def test_git_number_bad_parent_footer(self):
300 with self.assertRaises(AssertionError):
301 self._test_git_number(
302 'Parent\n'
303 '\n'
304 'Cr-Commit-Position: wrong',
305 'refs/heads/master', 'Child')
306
307 def test_git_number_bad_lineage_ignored(self):
308 actual = self._test_git_number(
309 'Parent\n'
310 '\n'
311 'Cr-Commit-Position: refs/heads/master@{#1}\n'
312 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
313 'refs/heads/master', 'Child')
314 self.assertEqualByLine(
315 actual,
316 'Child\n'
317 '\n'
318 'Cr-Commit-Position: refs/heads/master@{#2}\n'
319 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
320
321 def test_git_number_same_branch(self):
322 actual = self._test_git_number(
323 'Parent\n'
324 '\n'
325 'Cr-Commit-Position: refs/heads/master@{#12}',
326 dest_ref='refs/heads/master',
327 child_msg='Child')
328 self.assertEqualByLine(
329 actual,
330 'Child\n'
331 '\n'
332 'Cr-Commit-Position: refs/heads/master@{#13}')
333
334 def test_git_number_same_branch_with_originals(self):
335 actual = self._test_git_number(
336 'Parent\n'
337 '\n'
338 'Cr-Commit-Position: refs/heads/master@{#12}',
339 dest_ref='refs/heads/master',
340 child_msg='Child\n'
341 '\n'
342 'Some users are smart and insert their own footers\n'
343 '\n'
344 'Cr-Whatever: value\n'
345 'Cr-Commit-Position: refs/copy/paste@{#22}')
346 self.assertEqualByLine(
347 actual,
348 'Child\n'
349 '\n'
350 'Some users are smart and insert their own footers\n'
351 '\n'
352 'Cr-Original-Whatever: value\n'
353 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
354 'Cr-Commit-Position: refs/heads/master@{#13}')
355
356 def test_git_number_new_branch(self):
357 actual = self._test_git_number(
358 'Parent\n'
359 '\n'
360 'Cr-Commit-Position: refs/heads/master@{#12}',
361 dest_ref='refs/heads/branch',
362 child_msg='Child')
363 self.assertEqualByLine(
364 actual,
365 'Child\n'
366 '\n'
367 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
368 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
369
370 def test_git_number_lineage(self):
371 actual = self._test_git_number(
372 'Parent\n'
373 '\n'
374 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
375 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
376 dest_ref='refs/heads/branch',
377 child_msg='Child')
378 self.assertEqualByLine(
379 actual,
380 'Child\n'
381 '\n'
382 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
383 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
384
385 def test_git_number_moooooooore_lineage(self):
386 actual = self._test_git_number(
387 'Parent\n'
388 '\n'
389 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
390 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
391 dest_ref='refs/heads/mooore',
392 child_msg='Child')
393 self.assertEqualByLine(
394 actual,
395 'Child\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
398 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
399 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
400
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100401 def test_git_number_ever_moooooooore_lineage(self):
402 self.maxDiff = 10000
403 actual = self._test_git_number(
404 'CQ commit on fresh new branch + numbering.\n'
405 '\n'
406 'NOTRY=True\n'
407 'NOPRESUBMIT=True\n'
408 'BUG=\n'
409 '\n'
410 'Review-Url: https://codereview.chromium.org/2577703003\n'
411 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
412 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
413 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
414 dest_ref='refs/heads/gnumb-test/cl',
415 child_msg='git cl on fresh new branch + numbering.\n'
416 '\n'
417 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
418 self.assertEqualByLine(
419 actual,
420 'git cl on fresh new branch + numbering.\n'
421 '\n'
422 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
423 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
424 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
425 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
426 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100427
428 def test_git_number_cherry_pick(self):
429 actual = self._test_git_number(
430 'Parent\n'
431 '\n'
432 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
433 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
434 dest_ref='refs/heads/branch',
435 child_msg='Child, which is cherry-pick from master\n'
436 '\n'
437 'Cr-Commit-Position: refs/heads/master@{#100}\n'
438 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
439 self.assertEqualByLine(
440 actual,
441 'Child, which is cherry-pick from master\n'
442 '\n'
443 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
444 '\n'
445 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
446 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
447 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
448
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000449
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000450class TestGitCl(TestCase):
451 def setUp(self):
452 super(TestGitCl, self).setUp()
453 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700454 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000455 self.mock(subprocess2, 'call', self._mocked_call)
456 self.mock(subprocess2, 'check_call', self._mocked_call)
457 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700458 self.mock(subprocess2, 'communicate',
459 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000460 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000461 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000462 self.mock(git_common, 'get_or_create_merge_base',
463 lambda *a: (
464 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000465 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000466 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000467 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700468 self.mock(git_cl, 'write_json', lambda path, contents:
469 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000470 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000471 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000472 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700473 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
474 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000475 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000476 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000477 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100478 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
479 lambda *args, **kwargs: self._mocked_call(
480 'GetChangeDetail', *args, **kwargs))
481 self.mock(git_cl.gerrit_util, 'AddReviewers',
482 lambda h, i, add, is_reviewer, notify: self._mocked_call(
483 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000484 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
485 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700486 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100487 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000488 # It's important to reset settings to not have inter-tests interference.
489 git_cl.settings = None
490
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000491
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000492 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000493 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100494 self.assertEquals([], self.calls)
495 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000496 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100497 raise
498 # Sadly, has_failed() returns True if this OR any other tests before this
499 # one have failed.
500 git_cl.logging.exception(
501 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
502 'There are un-consumed self.calls after this test has finished.\n'
503 'If you don\'t know which test this is, run:\n'
504 ' tests/git_cl_tests.py -v\n'
505 '\n'
506 'If you are already running just this single test, then **first** '
507 'fix the problem whose exception is emitted below by unittest '
508 'runner.\n'
509 '\n'
510 'Else, to be sure what\'s going on, run this test **alone** with \n'
511 ' tests/git_cl_tests.py TestGitCl.<name>\n'
512 'and follow instructions above.\n' +
513 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000514 finally:
515 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000516
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000517 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000518 self.assertTrue(
519 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700520 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000521 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000522 expected_args, result = top
523
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000524 # Also logs otherwise it could get caught in a try/finally and be hard to
525 # diagnose.
526 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700527 N = 5
528 prior_calls = '\n '.join(
529 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
530 for i, c in enumerate(self._calls_done[-N:]))
531 following_calls = '\n '.join(
532 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
533 for i, c in enumerate(self.calls[:N]))
534 extended_msg = (
535 'A few prior calls:\n %s\n\n'
536 'This (expected):\n @%d: %r\n'
537 'This (actual):\n @%d: %r\n\n'
538 'A few following expected calls:\n %s' %
539 (prior_calls, len(self._calls_done), expected_args,
540 len(self._calls_done), args, following_calls))
541 git_cl.logging.error(extended_msg)
542
tandrii99a72f22016-08-17 14:33:24 -0700543 self.fail('@%d\n'
544 ' Expected: %r\n'
545 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700546 len(self._calls_done), expected_args, args))
547
548 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700549 if isinstance(result, Exception):
550 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000551 return result
552
tandrii48df5812016-10-17 03:55:37 -0700553 def test_LoadCodereviewSettingsFromFile_gerrit(self):
554 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
555 self.calls = [
556 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
557 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
558 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
559 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
560 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
561 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700562 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
563 CERR1),
564 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700565 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
566 CERR1),
567 ((['git', 'config', 'gerrit.host', 'true'],), ''),
568 ]
569 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
570
maruel@chromium.orga3353652011-11-30 14:26:57 +0000571 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000572 def _is_gerrit_calls(cls, gerrit=False):
573 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
574 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
575
576 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000577 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000578 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000579 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000580
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000581 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000582 def _upload_no_rev_calls(cls, similarity, find_copies):
583 return (cls._git_base_calls(similarity, find_copies) +
584 cls._git_upload_no_rev_calls())
585
586 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000587 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000588 if similarity is None:
589 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700590 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700591 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000592 else:
tandrii33a46ff2016-08-23 05:53:40 -0700593 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700594 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000595
596 if find_copies is None:
597 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700598 find_copies_call = ((['git', 'config', '--bool',
599 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000600 else:
tandrii5d48c322016-08-18 16:19:37 -0700601 val = str(find_copies).lower()
602 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000603 'branch.master.git-find-copies', val],), '')
604
605 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000606 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800607 '-l100000', '-C'+similarity,
608 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000609 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000610 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000611 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000612
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000613 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000614 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000615 similarity_call,
616 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
617 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000618 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000619 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700620 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
621 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000622 ((['git', 'config', 'rietveld.server'],),
623 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000624 ((['git', 'config', 'branch.master.merge'],), 'master'),
625 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000626 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000627 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000628 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000629 ((['git', 'rev-parse', '--show-cdup'],), ''),
630 ((['git', 'rev-parse', 'HEAD'],), '12345'),
631 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000632 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000633 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700634 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000635 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000636 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000637 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000638 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000639 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000640 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000641 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000642 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000643 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000644 ]
645
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000646 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000647 def _git_upload_no_rev_calls(cls):
648 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000649 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000650 ]
651
652 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000653 def _git_upload_calls(cls, private):
654 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000655 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000656 private_call = []
657 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000658 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000659 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000660 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000661
maruel@chromium.orga3353652011-11-30 14:26:57 +0000662 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000663 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000664 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000665 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800666 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000667 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700668 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000669 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000670 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000671 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700672 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000673 ] + cls._git_post_upload_calls()
674
675 @classmethod
676 def _git_post_upload_calls(cls):
677 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000678 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
679 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
680 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000681 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000682 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000683 ]
684
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000685 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000686 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000687 fake_ancestor = 'fake_ancestor'
688 fake_cl = 'fake_cl_for_patch'
689 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000690 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000691 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000692 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000693 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000694 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000695 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000696 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000697 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700698 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000699 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000700 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000701 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000702 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000703 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000704 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000705 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000706 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000707 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000708 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000709 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000710
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000711 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700712 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000713 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000714 return [
715 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000716 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000717 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000718 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700719 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000720 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000721 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100722 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000723 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000724 ]
725
726 def _run_reviewer_test(
727 self,
728 upload_args,
729 expected_description,
730 returned_description,
731 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000732 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700733 private=False,
734 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000735 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000736 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000737 try:
738 similarity = upload_args[upload_args.index('--similarity')+1]
739 except ValueError:
740 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000741
742 if '--find-copies' in upload_args:
743 find_copies = True
744 elif '--no-find-copies' in upload_args:
745 find_copies = False
746 else:
747 find_copies = None
748
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000749 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700750 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000751
752 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000753
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000754 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000755 self.assertEquals(
756 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000757 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000758 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000759 '#--------------------This line is 72 characters long'
760 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000761 expected_description,
762 desc)
763 return returned_description
764 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000765
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000766 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000767 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700768 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000769 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000770 return 1, 2
771 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000772
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000773 git_cl.main(['upload'] + upload_args)
774
775 def test_no_reviewer(self):
776 self._run_reviewer_test(
777 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000778 'desc\n\nBUG=',
779 '# Blah blah comment.\ndesc\n\nBUG=',
780 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000781 [])
782
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000783 def test_keep_similarity(self):
784 self._run_reviewer_test(
785 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000786 'desc\n\nBUG=',
787 '# Blah blah comment.\ndesc\n\nBUG=',
788 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000789 [])
790
iannucci@chromium.org79540052012-10-19 23:15:26 +0000791 def test_keep_find_copies(self):
792 self._run_reviewer_test(
793 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000794 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000795 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000796 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000797 [])
798
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000799 def test_private(self):
800 self._run_reviewer_test(
801 ['--private'],
802 'desc\n\nBUG=',
803 '# Blah blah comment.\ndesc\n\nBUG=\n',
804 'desc\n\nBUG=',
805 [])
806
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000807 def test_reviewers_cmd_line(self):
808 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000809 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000810 self._run_reviewer_test(
811 ['-r' 'foo@example.com'],
812 description,
813 '\n%s\n' % description,
814 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000815 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000816
817 def test_reviewer_tbr_overriden(self):
818 # Reviewer is overriden with TBR
819 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000820 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000821 self._run_reviewer_test(
822 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000823 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000824 description.strip('\n'),
825 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000826 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000827
828 def test_reviewer_multiple(self):
829 # Handles multiple R= or TBR= lines.
830 description = (
bradnelsond975b302016-10-23 12:20:23 -0700831 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
832 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000833 self._run_reviewer_test(
834 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000835 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000836 description,
837 description,
bradnelsond975b302016-10-23 12:20:23 -0700838 ['--reviewers=another@example.com,reviewer@example.com'],
839 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000840
maruel@chromium.orga3353652011-11-30 14:26:57 +0000841 def test_reviewer_send_mail(self):
842 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000843 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000844 self._run_reviewer_test(
845 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000846 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000847 description.strip('\n'),
848 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000849 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000850
851 def test_reviewer_send_mail_no_rev(self):
852 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000853 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700854 self.calls = self._upload_no_rev_calls(None, None) + [
855 ((['DieWithError', 'Must specify reviewers to send email.'],),
856 SystemExitMock())
857 ]
858
859 def RunEditor(desc, _, **kwargs):
860 return desc
861 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
862 self.mock(sys, 'stdout', stdout)
863 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000864 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700865 self.assertEqual(
866 'Using 50% similarity for rename/copy detection. Override with '
867 '--similarity.\n',
868 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000869
tandriif9aefb72016-07-01 09:06:51 -0700870 def test_bug_on_cmd(self):
871 self._run_reviewer_test(
872 ['--bug=500658,proj:123'],
873 'desc\n\nBUG=500658\nBUG=proj:123',
874 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
875 'desc\n\nBUG=500658\nBUG=proj:1234',
876 [])
877
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100878 def _land_rietveld_common(self, debug=False):
879 if debug:
880 # Very useful due to finally clause in git cl land raising exceptions and
881 # shadowing real cause of failure.
882 self.mock(git_cl, '_IS_BEING_TESTED', True)
883 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100884 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100885
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100886 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
887 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100888 self.mock(RietveldMock, 'update_description', staticmethod(
889 lambda i, d: self._mocked_call(['update_description', i, d])))
890 self.mock(RietveldMock, 'add_comment', staticmethod(
891 lambda i, c: self._mocked_call(['add_comment', i, c])))
892 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100893 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
894 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
895 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
896 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
897 CERR1),
898 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
899 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800900 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100901 ((['git', 'config', 'rietveld.server'],),
902 'https://codereview.chromium.org'),
903 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
904 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
905 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
906 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100907 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
908 ''), # No commits to rebase, according to local view of origin.
909 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
910 'fake_ancestor_sha'),
911 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
912 ((['git', 'rev-parse', '--show-cdup'],), ''),
913 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
914 ((['git', 'diff', '--name-status', '--no-renames', '-r',
915 'fake_ancestor_sha...', '.'],),
916 'M\tfile1.cpp'),
917 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
918 ((['git', 'config', 'branch.feature.rietveldserver'],),
919 'https://codereview.chromium.org'),
920 ((['git', 'config', 'user.email'],), 'user@e.mail'),
921 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
922 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
923 'fake_ancestor_sha', 'feature'],),
924 # This command just prints smth like this:
925 # file1.cpp | 53 ++++++--
926 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
927 ''),
928 ((['git', 'show-ref', '--quiet', '--verify',
929 'refs/heads/git-cl-commit'],),
930 ''), # 0 return code means branch exists.
931 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
932 ((['git', 'show-ref', '--quiet', '--verify',
933 'refs/heads/git-cl-cherry-pick'],),
934 CERR1), # This means git-cl-cherry-pick branch does not exist.
935 ((['git', 'rev-parse', '--show-cdup'],), ''),
936 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
937 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
938 ((['git', 'commit', '-m',
939 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100940 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100941 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
942 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
943 ((['git', 'config', '--get', 'remote.origin.url'],),
944 'https://chromium.googlesource.com/infra/infra'),
945 ]
946
947 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100948 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100949 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100950 ((['git', 'config', 'remote.origin.url'],),
951 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100952 (('_is_git_numberer_enabled',
953 'https://chromium.googlesource.com/infra/infra',
954 'refs/heads/master'),
955 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100956 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
957 ''),
958 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
959 ((['git', 'checkout', '-q', 'feature'],), ''),
960 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
961 ((['git', 'config', 'rietveld.viewvc-url'],),
962 'https://chromium.googlesource.com/infra/infra/+/'),
963 ((['update_description', 123,
964 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
965 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
966 ''),
967 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
968 'fake_sha_rebased (presubmit successful).'],), ''),
969 ]
970 git_cl.main(['land'])
971
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100972 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100973 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100974
975 # Special mocks to check validity of timestamp.
976 original_git_amend_head = git_cl._git_amend_head
977 def _git_amend_head_mock(msg, tstamp):
978 self._mocked_call(['git_amend_head committer timestamp', tstamp])
979 return original_git_amend_head(msg, tstamp)
980 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
981
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100982 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100983 ((['git', 'config', 'remote.origin.url'],),
984 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100985 (('_is_git_numberer_enabled',
986 'https://chromium.googlesource.com/chromium/src',
987 'refs/heads/master'),
988 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100989 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
990 'This is parent commit.\n'
991 '\n'
992 'Cr-Commit-Position: refs/heads/master@{#543}\n'
993 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100994 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
995 '1480022355'), # Committer's unix timestamp.
996 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
997 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100998
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100999 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001000 ((['git', 'commit', '--amend', '-m',
1001 'Issue: 123\n\nR=john@chromium.org\n'
1002 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001003 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001004 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1005 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1006
1007 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1008 ''),
1009 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1010 ((['git', 'checkout', '-q', 'feature'],), ''),
1011 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1012 ((['git', 'config', 'rietveld.viewvc-url'],),
1013 'https://chromium.googlesource.com/infra/infra/+/'),
1014 ((['update_description', 123,
1015 'Issue: 123\n\nR=john@chromium.org\n'
1016 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001017 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001018 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1019 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1020 'Committed: '
1021 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1022 ''),
1023 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1024 'fake_sha_rebased (presubmit successful).'],), ''),
1025 ]
1026 git_cl.main(['land'])
1027
1028 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001029 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001030 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001031 ((['git', 'config', 'remote.origin.url'],),
1032 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001033 (('_is_git_numberer_enabled',
1034 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1035 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001036
1037 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1038 'This is parent commit with no footer.'),
1039
1040 ((['git', 'checkout', '-q', 'feature'],), ''),
1041 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1042 ]
1043 with self.assertRaises(ValueError) as cm:
1044 git_cl.main(['land'])
1045 self.assertEqual(cm.exception.message,
1046 'Unable to infer commit position from footers')
1047
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001048 def test_git_numberer_not_whitelisted_repo(self):
1049 self.calls = []
1050 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001051 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1052 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001053 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001054
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001055 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001056 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1057 self.calls = [
1058 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001059 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001060 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001061 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001062 remote_url='https://chromium.googlesource.com/chromium/src',
1063 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001064 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001065
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001066 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001067 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001068 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001069 def fake_temporary_directory(**kwargs):
1070 yield tempdir
1071 self.mock(git_cl.gclient_utils, 'temporary_directory',
1072 fake_temporary_directory)
1073 self._test_GitNumbererState_valid_configs_inner(tempdir)
1074
1075 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001076 self.calls = [
1077 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001078 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001079 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1080 '''
1081 [plugin "git-numberer"]
1082 validate-enabled-refglob = refs/else/*
1083 validate-enabled-refglob = refs/heads/*
1084 validate-disabled-refglob = refs/heads/disabled
1085 validate-disabled-refglob = refs/branch-heads/*
1086 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001087 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1088 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001089 'refs/else/*\n'
1090 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001091 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1092 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001093 'refs/heads/disabled\n'
1094 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001095 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001096
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001097 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001098 remote_url='https://chromium.googlesource.com/chromium/src',
1099 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001100 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001101
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001102 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001103 remote_url='https://chromium.googlesource.com/chromium/src',
1104 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001105 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001106
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001107 # Validator is disabled by default, even if it's not explicitely in disabled
1108 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001109 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001110 remote_url='https://chromium.googlesource.com/chromium/src',
1111 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001112 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001113
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001114 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001115 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001116 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001117 if skip_auth_check:
1118 return [((cmd, ), 'true')]
1119
tandrii5d48c322016-08-18 16:19:37 -07001120 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001121 if issue:
1122 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001123 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001124 ])
1125 calls.extend([
1126 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1127 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1128 ((['git', 'config', 'remote.origin.url'],),
1129 'https://chromium.googlesource.com/my/repo'),
1130 ((['git', 'config', 'remote.origin.url'],),
1131 'https://chromium.googlesource.com/my/repo'),
1132 ])
1133 return calls
1134
1135 @classmethod
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001136 def _gerrit_base_calls(cls, issue=None, fetched_description=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001137 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001138 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001139 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001140 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001141 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001142 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1143 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001144 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001145 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001146 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1147 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001148 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001149 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001150 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001151 ((['get_or_create_merge_base', 'master',
1152 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001153 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001154 # Calls to verify branch point is ancestor
1155 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1156 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1157 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001158 ((['git', 'rev-parse', '--show-cdup'],), ''),
1159 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001160
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001161 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001162 'diff', '--name-status', '--no-renames', '-r',
1163 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001164 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001165 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001166 ] + ([
1167 (('GetChangeDetail', 'chromium-review.googlesource.com',
1168 '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
1169 {
1170 'change_id': '123456789',
1171 'current_revision': 'sha1_of_current_revision',
1172 'revisions': { 'sha1_of_current_revision': {
1173 'commit': {'message': fetched_description},
1174 }},
1175 }),
1176 ] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001177 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001178 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001180 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001181 ((['git', 'config', 'user.email'],), 'me@example.com'),
1182 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001183 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1184 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001185 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001186 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001187
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001188 @classmethod
1189 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001190 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001191 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001192 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001193 post_amend_description=None, issue=None, cc=None,
1194 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001195 if post_amend_description is None:
1196 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001197 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001198 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001199
tandriia60502f2016-06-20 02:01:53 -07001200 if squash_mode == 'default':
1201 calls.extend([
1202 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1203 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1204 ])
1205 elif squash_mode in ('override_squash', 'override_nosquash'):
1206 calls.extend([
1207 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1208 'true' if squash_mode == 'override_squash' else 'false'),
1209 ])
1210 else:
1211 assert squash_mode in ('squash', 'nosquash')
1212
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001213 # If issue is given, then description is fetched from Gerrit instead.
1214 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001215 calls += [
1216 ((['git', 'log', '--pretty=format:%s\n\n%b',
1217 'fake_ancestor_sha..HEAD'],),
1218 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001219 if squash:
1220 title = 'Initial_upload'
1221 else:
1222 if not title:
1223 calls += [
1224 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1225 (('Title for patchset []: ',), 'User input'),
1226 ]
1227 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001228 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001229 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001230 # DownloadGerritHook(False)
1231 ((False, ),
1232 ''),
1233 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001234 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001235 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001236 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001237 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001238 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001239 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001240 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001241 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001242 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001243 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001244 if not issue:
1245 # Prompting to edit description on first upload.
1246 calls += [
1247 ((['git', 'config', 'core.editor'],), ''),
1248 ((['RunEditor'],), description),
1249 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001250 ref_to_push = 'abcdef0123456789'
1251 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001252 ((['git', 'config', 'branch.master.merge'],),
1253 'refs/heads/master'),
1254 ((['git', 'config', 'branch.master.remote'],),
1255 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001256 ((['get_or_create_merge_base', 'master',
1257 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001258 'origin/master'),
1259 ((['git', 'rev-parse', 'HEAD:'],),
1260 '0123456789abcdef'),
1261 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001262 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001263 ref_to_push),
1264 ]
1265 else:
1266 ref_to_push = 'HEAD'
1267
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001268 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001269 ((['git', 'rev-list',
1270 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001271 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001272
Aaron Gable9b713dd2016-12-14 16:04:21 -08001273 if title:
1274 if ref_suffix:
1275 ref_suffix += ',m=' + title
1276 else:
1277 ref_suffix = '%m=' + title
1278
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001279 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1280 if ref_suffix:
1281 ref_suffix += ',' + notify_suffix
1282 else:
1283 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001284
ukai@chromium.orge8077812012-02-03 03:41:46 +00001285 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001286 ref_suffix += ',' + ','.join('r=%s' % email
1287 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001288
1289 if git_mirror is None:
1290 calls += [
1291 ((['git', 'config', 'remote.origin.url'],),
1292 'https://chromium.googlesource.com/yyy/zzz'),
1293 ]
1294 else:
1295 calls += [
1296 ((['git', 'config', 'remote.origin.url'],),
1297 '/cache/this-dir-exists'),
1298 (('os.path.isdir', '/cache/this-dir-exists'),
1299 True),
1300 # Runs in /cache/this-dir-exists.
1301 ((['git', 'config', 'remote.origin.url'],),
1302 'https://chromium.googlesource.com/yyy/zzz'),
1303 ]
1304
ukai@chromium.orge8077812012-02-03 03:41:46 +00001305 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001306 ((['git', 'push',
1307 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001308 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001309 ('remote:\n'
1310 'remote: Processing changes: (\)\n'
1311 'remote: Processing changes: (|)\n'
1312 'remote: Processing changes: (/)\n'
1313 'remote: Processing changes: (-)\n'
1314 'remote: Processing changes: new: 1 (/)\n'
1315 'remote: Processing changes: new: 1, done\n'
1316 'remote:\n'
1317 'remote: New Changes:\n'
1318 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1319 'remote:\n'
1320 'To https://chromium.googlesource.com/yyy/zzz\n'
1321 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001322 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001323 if squash:
1324 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001325 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001326 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001327 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001328 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001329 ((['git', 'config', 'branch.master.gerritsquashhash',
1330 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001331 ]
tandrii88189772016-09-29 04:29:57 -07001332 calls += [
1333 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001334 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001335 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001336 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001337 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001338 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001339 return calls
1340
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001341 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001342 self,
1343 upload_args,
1344 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001345 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001346 squash=True,
1347 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001348 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001349 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001350 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001351 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001352 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001353 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001354 cc=None,
1355 git_mirror=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001356 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001357 if squash_mode is None:
1358 if '--no-squash' in upload_args:
1359 squash_mode = 'nosquash'
1360 elif '--squash' in upload_args:
1361 squash_mode = 'squash'
1362 else:
1363 squash_mode = 'default'
1364
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001365 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001366 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001367 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001368 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001369 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001370 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1371 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001372 self.mock(git_cl.gclient_utils, 'RunEditor',
1373 lambda *_, **__: self._mocked_call(['RunEditor']))
1374 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1375
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001376 original_os_path_isdir = os.path.isdir
1377 def selective_os_path_isdir_mock(path):
1378 if path == '/cache/this-dir-exists':
1379 return self._mocked_call('os.path.isdir', path)
1380 return original_os_path_isdir(path)
1381 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1382
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001383 self.calls = self._gerrit_base_calls(
1384 issue=issue,
1385 fetched_description=description)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001386 self.calls += self._gerrit_upload_calls(
1387 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001388 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001389 expected_upstream_ref=expected_upstream_ref,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001390 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001391 post_amend_description=post_amend_description,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001392 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001393 # Uncomment when debugging.
1394 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001395 git_cl.main(['upload'] + upload_args)
1396
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001397 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001398 self._run_gerrit_upload_test(
1399 ['--no-squash'],
1400 'desc\n\nBUG=\n',
1401 [],
1402 squash=False,
1403 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1404
1405 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001406 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001407 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001408 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001409 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001410 [],
tandriia60502f2016-06-20 02:01:53 -07001411 squash=False,
1412 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001413 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001414
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001415 def test_gerrit_no_reviewer(self):
1416 self._run_gerrit_upload_test(
1417 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001418 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001419 [],
1420 squash=False,
1421 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001422
tandriieefe8322016-08-17 10:12:24 -07001423 def test_gerrit_patch_bad_chars(self):
1424 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001425 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001426 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001427 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001428 squash=False,
1429 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001430 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001431 self.assertIn(
1432 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001433 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1434 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001435 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001436
ukai@chromium.orge8077812012-02-03 03:41:46 +00001437 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001438 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001439 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001440 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001441 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001442 squash=False,
1443 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001444 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001445
1446 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001447 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001448 [],
bradnelsond975b302016-10-23 12:20:23 -07001449 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1450 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001451 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001452 ['reviewer@example.com', 'another@example.com'],
1453 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001454 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001455 ref_suffix='%l=Code-Review+1',
1456 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001457
1458 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001459 self._run_gerrit_upload_test(
1460 [],
1461 'desc\nBUG=\n\nChange-Id: 123456789',
1462 [],
1463 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001464
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001465 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001466 self._run_gerrit_upload_test(
1467 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001468 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001469 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001470 squash=True,
1471 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001472
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001473 def test_gerrit_upload_squash_first_with_mirror(self):
1474 self._run_gerrit_upload_test(
1475 ['--squash'],
1476 'desc\nBUG=\n\nChange-Id: 123456789',
1477 [],
1478 squash=True,
1479 expected_upstream_ref='origin/master',
1480 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1481
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001482 def test_gerrit_upload_squash_reupload(self):
1483 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001484 self._run_gerrit_upload_test(
1485 ['--squash'],
1486 description,
1487 [],
1488 squash=True,
1489 expected_upstream_ref='origin/master',
1490 issue=123456)
1491
rmistry@google.com2dd99862015-06-22 12:22:18 +00001492 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001493 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001494 def mock_run_git(*args, **_kwargs):
1495 if args[0] == ['for-each-ref',
1496 '--format=%(refname:short) %(upstream:short)',
1497 'refs/heads']:
1498 # Create a local branch dependency tree that looks like this:
1499 # test1 -> test2 -> test3 -> test4 -> test5
1500 # -> test3.1
1501 # test6 -> test0
1502 branch_deps = [
1503 'test2 test1', # test1 -> test2
1504 'test3 test2', # test2 -> test3
1505 'test3.1 test2', # test2 -> test3.1
1506 'test4 test3', # test3 -> test4
1507 'test5 test4', # test4 -> test5
1508 'test6 test0', # test0 -> test6
1509 'test7', # test7
1510 ]
1511 return '\n'.join(branch_deps)
1512 self.mock(git_cl, 'RunGit', mock_run_git)
1513
1514 class RecordCalls:
1515 times_called = 0
1516 record_calls = RecordCalls()
1517 def mock_CMDupload(*args, **_kwargs):
1518 record_calls.times_called += 1
1519 return 0
1520 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1521
1522 self.calls = [
1523 (('[Press enter to continue or ctrl-C to quit]',), ''),
1524 ]
1525
1526 class MockChangelist():
1527 def __init__(self):
1528 pass
1529 def GetBranch(self):
1530 return 'test1'
1531 def GetIssue(self):
1532 return '123'
1533 def GetPatchset(self):
1534 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001535 def IsGerrit(self):
1536 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001537
1538 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1539 # CMDupload should have been called 5 times because of 5 dependent branches.
1540 self.assertEquals(5, record_calls.times_called)
1541 self.assertEquals(0, ret)
1542
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001543 def test_gerrit_change_id(self):
1544 self.calls = [
1545 ((['git', 'write-tree'], ),
1546 'hashtree'),
1547 ((['git', 'rev-parse', 'HEAD~0'], ),
1548 'branch-parent'),
1549 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1550 'A B <a@b.org> 1456848326 +0100'),
1551 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1552 'C D <c@d.org> 1456858326 +0100'),
1553 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1554 'hashchange'),
1555 ]
1556 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1557 self.assertEqual(change_id, 'Ihashchange')
1558
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001559 def test_desecription_append_footer(self):
1560 for init_desc, footer_line, expected_desc in [
1561 # Use unique desc first lines for easy test failure identification.
1562 ('foo', 'R=one', 'foo\n\nR=one'),
1563 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1564 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1565 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1566 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1567 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1568 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1569 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1570 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1571 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1572 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1573 ]:
1574 desc = git_cl.ChangeDescription(init_desc)
1575 desc.append_footer(footer_line)
1576 self.assertEqual(desc.description, expected_desc)
1577
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001578 def test_update_reviewers(self):
1579 data = [
1580 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001581 ('foo\nR=xx', [], 'foo\nR=xx'),
1582 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001583 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001584 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1585 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1586 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001587 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001588 ('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 +00001589 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001590 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1591 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1592 # Same as the line before, but full of whitespaces.
1593 (
1594 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1595 'foo\nBar\n\nR=c@c\n BUG =',
1596 ),
1597 # Whitespaces aren't interpreted as new lines.
1598 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001599 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001600 expected = [i[2] for i in data]
1601 actual = []
1602 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001603 obj = git_cl.ChangeDescription(orig)
1604 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001605 actual.append(obj.description)
1606 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001607
wittman@chromium.org455dc922015-01-26 20:15:50 +00001608 def test_get_target_ref(self):
1609 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001610 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001611 self.assertEqual(None, git_cl.GetTargetRef(None,
1612 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001613 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001614
wittman@chromium.org455dc922015-01-26 20:15:50 +00001615 # Check default target refs for branches.
1616 self.assertEqual('refs/heads/master',
1617 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001618 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001619 self.assertEqual('refs/heads/master',
1620 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001621 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001622 self.assertEqual('refs/heads/master',
1623 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001624 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001625 self.assertEqual('refs/branch-heads/123',
1626 git_cl.GetTargetRef('origin',
1627 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001628 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001629 self.assertEqual('refs/diff/test',
1630 git_cl.GetTargetRef('origin',
1631 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001632 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001633 self.assertEqual('refs/heads/chrome/m42',
1634 git_cl.GetTargetRef('origin',
1635 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001636 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001637
1638 # Check target refs for user-specified target branch.
1639 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1640 'refs/remotes/branch-heads/123'):
1641 self.assertEqual('refs/branch-heads/123',
1642 git_cl.GetTargetRef('origin',
1643 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001644 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001645 for branch in ('origin/master', 'remotes/origin/master',
1646 'refs/remotes/origin/master'):
1647 self.assertEqual('refs/heads/master',
1648 git_cl.GetTargetRef('origin',
1649 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001650 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001651 for branch in ('master', 'heads/master', 'refs/heads/master'):
1652 self.assertEqual('refs/heads/master',
1653 git_cl.GetTargetRef('origin',
1654 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001655 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001656
wychen@chromium.orga872e752015-04-28 23:42:18 +00001657 def test_patch_when_dirty(self):
1658 # Patch when local tree is dirty
1659 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1660 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1661
1662 def test_diff_when_dirty(self):
1663 # Do 'git cl diff' when local tree is dirty
1664 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1665 self.assertNotEqual(git_cl.main(['diff']), 0)
1666
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001667 @staticmethod
1668 def _get_gerrit_codereview_server_calls(branch, value=None,
1669 git_short_host='host',
1670 detect_branch=True):
1671 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1672
1673 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1674 """
1675 calls = []
1676 if detect_branch:
1677 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1678 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1679 CERR1 if value is None else value))
1680 if value is None:
1681 calls += [
1682 ((['git', 'config', 'branch.' + branch + '.merge'],),
1683 'refs/heads' + branch),
1684 ((['git', 'config', 'branch.' + branch + '.remote'],),
1685 'origin'),
1686 ((['git', 'config', 'remote.origin.url'],),
1687 'https://%s.googlesource.com/my/repo' % git_short_host),
1688 ]
1689 return calls
1690
tandriidf09a462016-08-18 16:23:55 -07001691 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001692 new_branch=False, git_short_host='host',
1693 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001694 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001695 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1696 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001697 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001698 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001699 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1700
tandriidf09a462016-08-18 16:23:55 -07001701 if new_branch:
1702 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1703 else:
1704 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001705
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001706 if not force_codereview:
1707 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001708 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001709 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001710 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1711 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001712 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001713 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001714
1715 if is_gerrit:
1716 if not force_codereview:
1717 self.calls += [
1718 ((['git', 'config', 'gerrit.host'],), 'true'),
1719 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001720 if detect_gerrit_server:
1721 self.calls += self._get_gerrit_codereview_server_calls(
1722 'master', git_short_host=git_short_host,
1723 detect_branch=not new_branch and force_codereview)
1724
1725 self.calls += [
1726 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001727 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001728 {
1729 'current_revision': '7777777777',
1730 'revisions': {
1731 '1111111111': {
1732 '_number': 1,
1733 'fetch': {'http': {
1734 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1735 'ref': 'refs/changes/56/123456/1',
1736 }},
1737 },
1738 '7777777777': {
1739 '_number': 7,
1740 'fetch': {'http': {
1741 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1742 'ref': 'refs/changes/56/123456/7',
1743 }},
1744 },
1745 },
1746 }),
1747 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001748 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001749 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001750 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001751 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001752 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001753 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001754 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001755
tandriidf09a462016-08-18 16:23:55 -07001756 def _common_patch_successful(self, new_branch=False):
1757 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001758 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001759 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001760 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001761 'patch from issue 123456 at patchset 60001 ' +
1762 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001763 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001764 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001765 ((['git', 'config', 'branch.master.rietveldserver',
1766 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001767 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001768 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001769 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001770
1771 def test_patch_successful(self):
1772 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001773 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1774
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001775 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001776 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001777 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1778
wychen@chromium.orga872e752015-04-28 23:42:18 +00001779 def test_patch_conflict(self):
1780 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001781 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001782 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001783
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001784 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001785 self._patch_common(is_gerrit=True, git_short_host='chromium',
1786 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001787 self.calls += [
1788 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1789 'refs/changes/56/123456/7'],), ''),
1790 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001791 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001792 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001793 ((['git', 'config', 'branch.master.gerritserver',
1794 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001795 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001796 ]
1797 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1798
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001799 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001800 self._patch_common(is_gerrit=True, force_codereview=True,
1801 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001802 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001803 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001804 'refs/changes/56/123456/7'],), ''),
1805 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001806 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001807 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001808 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001809 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001810 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001811 ]
1812 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1813
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001814 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001815 self._patch_common(is_gerrit=True, git_short_host='else',
1816 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001817 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001818 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001819 'refs/changes/56/123456/1'],), ''),
1820 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001821 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001822 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001823 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001824 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001825 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001826 ]
1827 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001828 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001829
1830 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001831 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1832 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001833 self.calls += [
1834 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1835 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001836 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1837 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1838 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001839 ]
1840 with self.assertRaises(SystemExitMock):
1841 git_cl.main(['patch',
1842 'https://chromium-review.googlesource.com/#/c/123456/1'])
1843
tandriic2405f52016-10-10 08:13:15 -07001844 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001845 def notExists(_issue, *_, **kwargs):
1846 self.assertFalse(kwargs['ignore_404'])
1847 raise git_cl.gerrit_util.GerritError(404, '')
1848 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1849
tandriic2405f52016-10-10 08:13:15 -07001850 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001851 self.calls = [
1852 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1853 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1854 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1855 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1856 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1857 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001858 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001859 'or you have no access to it'],), SystemExitMock()),
1860 ]
1861 with self.assertRaises(SystemExitMock):
1862 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1863
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001864 def _checkout_calls(self):
1865 return [
1866 ((['git', 'config', '--local', '--get-regexp',
1867 'branch\\..*\\.rietveldissue'], ),
1868 ('branch.retrying.rietveldissue 1111111111\n'
1869 'branch.some-fix.rietveldissue 2222222222\n')),
1870 ((['git', 'config', '--local', '--get-regexp',
1871 'branch\\..*\\.gerritissue'], ),
1872 ('branch.ger-branch.gerritissue 123456\n'
1873 'branch.gbranch654.gerritissue 654321\n')),
1874 ]
1875
1876 def test_checkout_gerrit(self):
1877 """Tests git cl checkout <issue>."""
1878 self.calls = self._checkout_calls()
1879 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1880 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1881
1882 def test_checkout_rietveld(self):
1883 """Tests git cl checkout <issue>."""
1884 self.calls = self._checkout_calls()
1885 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1886 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1887
1888 def test_checkout_not_found(self):
1889 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001890 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001891 self.calls = self._checkout_calls()
1892 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1893
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001894 def test_checkout_no_branch_issues(self):
1895 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001896 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001897 self.calls = [
1898 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001899 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001900 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001901 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001902 ]
1903 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1904
tandrii@chromium.org28253532016-04-14 13:46:56 +00001905 def _test_gerrit_ensure_authenticated_common(self, auth,
1906 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001907 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1908 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1909 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001910 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001911 self.mock(git_cl, 'ask_for_data',
1912 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001913 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001914 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001915 cl.branch = 'master'
1916 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001917 cl.lookedup_issue = True
1918 return cl
1919
1920 def test_gerrit_ensure_authenticated_missing(self):
1921 cl = self._test_gerrit_ensure_authenticated_common(auth={
1922 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1923 })
1924 self.calls.append(
1925 ((['DieWithError',
1926 'Credentials for the following hosts are required:\n'
1927 ' chromium-review.googlesource.com\n'
1928 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1929 'You can (re)generate your credentails by visiting '
1930 'https://chromium-review.googlesource.com/new-password'],), ''),)
1931 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1932
1933 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001934 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001935 cl = self._test_gerrit_ensure_authenticated_common(auth={
1936 'chromium.googlesource.com': 'one',
1937 'chromium-review.googlesource.com': 'other',
1938 })
1939 self.calls.append(
1940 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001941 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001942 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1943
1944 def test_gerrit_ensure_authenticated_ok(self):
1945 cl = self._test_gerrit_ensure_authenticated_common(auth={
1946 'chromium.googlesource.com': 'same',
1947 'chromium-review.googlesource.com': 'same',
1948 })
1949 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1950
tandrii@chromium.org28253532016-04-14 13:46:56 +00001951 def test_gerrit_ensure_authenticated_skipped(self):
1952 cl = self._test_gerrit_ensure_authenticated_common(
1953 auth={}, skip_auth_check=True)
1954 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1955
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001956 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001957 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1958 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001959 self.calls = [
1960 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001961 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001962 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1963 ((['git', 'config', 'rietveld.server'],), ''),
1964 ((['git', 'config', 'rietveld.server'],), ''),
1965 ((['git', 'config', 'branch.feature.rietveldserver'],),
1966 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001967 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001968 ]
1969 self.assertEqual(0, git_cl.main(['set-commit']))
1970
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001971 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001972 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001973 lambda h, i, labels, notify=None:
1974 self._mocked_call(['SetReview', h, i, labels, notify]))
1975
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001976 self.calls = [
1977 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001978 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1979 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001980 ((['git', 'config', 'branch.feature.gerritserver'],),
1981 'https://chromium-review.googlesource.com'),
1982 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001983 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001984 ]
tandriid9e5ce52016-07-13 02:32:59 -07001985
1986 def test_cmd_set_commit_gerrit_clear(self):
1987 self._cmd_set_commit_gerrit_common(0)
1988 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1989
1990 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001991 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001992 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1993
tandriid9e5ce52016-07-13 02:32:59 -07001994 def test_cmd_set_commit_gerrit(self):
1995 self._cmd_set_commit_gerrit_common(2)
1996 self.assertEqual(0, git_cl.main(['set-commit']))
1997
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001998 def test_description_display(self):
1999 out = StringIO.StringIO()
2000 self.mock(git_cl.sys, 'stdout', out)
2001
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002002 self.mock(git_cl, 'Changelist', ChangelistMock)
2003 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002004
2005 self.assertEqual(0, git_cl.main(['description', '-d']))
2006 self.assertEqual('foo\n', out.getvalue())
2007
2008 def test_description_rietveld(self):
2009 out = StringIO.StringIO()
2010 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002011 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002012
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002013 self.assertEqual(0, git_cl.main([
2014 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2015 self.assertEqual('foobar\n', out.getvalue())
2016
iannucci3c972b92016-08-17 13:24:10 -07002017 def test_StatusFieldOverrideIssueMissingArgs(self):
2018 out = StringIO.StringIO()
2019 self.mock(git_cl.sys, 'stderr', out)
2020
2021 try:
2022 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2023 except SystemExit as ex:
2024 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002025 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002026
2027 out = StringIO.StringIO()
2028 self.mock(git_cl.sys, 'stderr', out)
2029
2030 try:
2031 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2032 except SystemExit as ex:
2033 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002034 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002035
2036 def test_StatusFieldOverrideIssue(self):
2037 out = StringIO.StringIO()
2038 self.mock(git_cl.sys, 'stdout', out)
2039
2040 def assertIssue(cl_self, *_args):
2041 self.assertEquals(cl_self.issue, 1)
2042 return 'foobar'
2043
2044 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2045 self.calls = [
2046 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2047 ((['git', 'config', 'rietveld.server'],), ''),
2048 ((['git', 'config', 'rietveld.server'],), ''),
2049 ]
iannuccie53c9352016-08-17 14:40:40 -07002050 self.assertEqual(
2051 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2052 0)
iannucci3c972b92016-08-17 13:24:10 -07002053 self.assertEqual(out.getvalue(), 'foobar\n')
2054
iannuccie53c9352016-08-17 14:40:40 -07002055 def test_SetCloseOverrideIssue(self):
2056 def assertIssue(cl_self, *_args):
2057 self.assertEquals(cl_self.issue, 1)
2058 return 'foobar'
2059
2060 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2061 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2062 self.calls = [
2063 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2064 ((['git', 'config', 'rietveld.server'],), ''),
2065 ((['git', 'config', 'rietveld.server'],), ''),
2066 ]
2067 self.assertEqual(
2068 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2069
2070 def test_SetCommitOverrideIssue(self):
2071 def assertIssue(cl_self, *_args):
2072 self.assertEquals(cl_self.issue, 1)
2073 return 'foobar'
2074
2075 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2076 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2077 self.calls = [
2078 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2079 ((['git', 'config', 'rietveld.server'],), ''),
2080 ((['git', 'config', 'rietveld.server'],), ''),
2081 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2082 ((['git', 'config', 'rietveld.server'],), ''),
2083 ((['git', 'config', 'rietveld.server'],), ''),
2084 ]
2085 self.assertEqual(
2086 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2087
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002088 def test_description_gerrit(self):
2089 out = StringIO.StringIO()
2090 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002091 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002092 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002093 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2094 {
2095 'current_revision': 'sha1',
2096 'revisions': {'sha1': {
2097 'commit': {'message': 'foobar'},
2098 }},
2099 }),
2100 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002101 self.assertEqual(0, git_cl.main([
2102 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2103 self.assertEqual('foobar\n', out.getvalue())
2104
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002105 def test_description_set_raw(self):
2106 out = StringIO.StringIO()
2107 self.mock(git_cl.sys, 'stdout', out)
2108
2109 self.mock(git_cl, 'Changelist', ChangelistMock)
2110 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2111
2112 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2113 self.assertEqual('hihi', ChangelistMock.desc)
2114
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002115 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002116 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002117
2118 def RunEditor(desc, _, **kwargs):
2119 self.assertEquals(
2120 '# Enter a description of the change.\n'
2121 '# This will be displayed on the codereview site.\n'
2122 '# The first line will also be used as the subject of the review.\n'
2123 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002124 '--------------------\n'
2125 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002126 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002127 # Simulate user changing something.
2128 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002129
dsansomee2d6fd92016-09-08 00:10:47 -07002130 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002131 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002132
2133 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2134 self.mock(git_cl.Changelist, 'GetDescription',
2135 lambda *args: current_desc)
2136 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2137 UpdateDescriptionRemote)
2138 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2139
2140 self.calls = [
2141 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002142 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002143 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2144 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002145 ((['git', 'config', 'core.editor'],), 'vi'),
2146 ]
2147 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2148
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002149 def test_description_set_stdin(self):
2150 out = StringIO.StringIO()
2151 self.mock(git_cl.sys, 'stdout', out)
2152
2153 self.mock(git_cl, 'Changelist', ChangelistMock)
2154 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2155
2156 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2157 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2158
kmarshall3bff56b2016-06-06 18:31:47 -07002159 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002160 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2161
kmarshall3bff56b2016-06-06 18:31:47 -07002162 self.calls = \
2163 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2164 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002165 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002166 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2167 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002168 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2169 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2170 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002171 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2172 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2173 ((['git', 'branch', '-D', 'foo'],), '')]
2174
kmarshall3bff56b2016-06-06 18:31:47 -07002175 self.mock(git_cl, 'get_cl_statuses',
2176 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002177 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2178 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2179 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002180
2181 self.assertEqual(0, git_cl.main(['archive', '-f']))
2182
2183 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002184 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002185 self.calls = \
2186 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2187 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002188 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002189 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2190 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002191 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2192
kmarshall9249e012016-08-23 12:02:16 -07002193 self.mock(git_cl, 'get_cl_statuses',
2194 lambda branches, fine_grained, max_processes:
2195 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2196
2197 self.assertEqual(1, git_cl.main(['archive', '-f']))
2198
2199 def test_archive_dry_run(self):
2200 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2201
2202 self.calls = \
2203 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2204 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2205 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2206 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2207 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2208 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2209 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2210 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2211 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002212
2213 self.mock(git_cl, 'get_cl_statuses',
2214 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002215 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2216 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2217 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002218
kmarshall9249e012016-08-23 12:02:16 -07002219 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2220
2221 def test_archive_no_tags(self):
2222 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2223
2224 self.calls = \
2225 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2226 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2227 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2228 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2229 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2230 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2231 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2232 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2233 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2234 ((['git', 'branch', '-D', 'foo'],), '')]
2235
2236 self.mock(git_cl, 'get_cl_statuses',
2237 lambda branches, fine_grained, max_processes:
2238 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2239 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2240 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2241
2242 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002243
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002244 def test_cmd_issue_erase_existing(self):
2245 out = StringIO.StringIO()
2246 self.mock(git_cl.sys, 'stdout', out)
2247 self.calls = [
2248 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002249 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2250 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002251 # Let this command raise exception (retcode=1) - it should be ignored.
2252 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002253 CERR1),
2254 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2255 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002256 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2257 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2258 ''),
2259 ]
2260 self.assertEqual(0, git_cl.main(['issue', '0']))
2261
phajdan.jre328cf92016-08-22 04:12:17 -07002262 def test_cmd_issue_json(self):
2263 out = StringIO.StringIO()
2264 self.mock(git_cl.sys, 'stdout', out)
2265 self.calls = [
2266 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002267 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002268 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2269 ((['git', 'config', 'rietveld.server'],),
2270 'https://codereview.chromium.org'),
2271 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2272 (('write_json', 'output.json',
2273 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2274 ''),
2275 ]
2276 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2277
tandriide281ae2016-10-12 06:02:30 -07002278 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002279 self.mock(git_cl.Changelist, 'GetChange',
2280 lambda _, *a: (
2281 self._mocked_call(['GetChange']+list(a))))
2282 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2283 lambda *_, **__: (
2284 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002285 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2286 lambda _, s: self._mocked_call(['SetCQState', s]))
2287 self.calls = [
2288 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002289 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002290 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2291 ((['git', 'config', 'rietveld.server'],),
2292 'https://codereview.chromium.org'),
2293 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2294 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2295 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2296 ((['get_or_create_merge_base', 'feature', 'feature'],),
2297 'fake_ancestor_sha'),
2298 ((['GetChange', 'fake_ancestor_sha', None], ),
2299 git_cl.presubmit_support.GitChange(
2300 '', '', '', '', '', '', '', '')),
2301 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2302 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002303 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2304 ]
2305 out = StringIO.StringIO()
2306 self.mock(git_cl.sys, 'stdout', out)
2307 self.assertEqual(0, git_cl.main(['try']))
2308 self.assertEqual(
2309 out.getvalue(),
2310 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2311
tandrii8c5a3532016-11-04 07:52:02 -07002312 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2313 self.mock(git_cl.Changelist, 'GetChange',
2314 lambda _, *a: (
2315 self._mocked_call(['GetChange']+list(a))))
2316 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2317 lambda *_, **__: (
2318 self._mocked_call(['DoGetTryMasters'])))
2319 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2320 lambda _, s: self._mocked_call(['SetCQState', s]))
2321
tandrii8c5a3532016-11-04 07:52:02 -07002322 self.calls = [
2323 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2324 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2325 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2326 ((['git', 'config', 'branch.feature.gerritserver'],),
2327 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002328 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2329 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2330 'project': 'depot_tools',
2331 'status': 'OPEN',
2332 'owner': {'email': 'owner@e.mail'},
2333 'revisions': {
2334 'deadbeaf': {
2335 '_number': 6,
2336 },
2337 'beeeeeef': {
2338 '_number': 7,
2339 'fetch': {'http': {
2340 'url': 'https://chromium.googlesource.com/depot_tools',
2341 'ref': 'refs/changes/56/123456/7'
2342 }},
2343 },
2344 },
2345 }),
tandrii8c5a3532016-11-04 07:52:02 -07002346 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2347 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2348 ((['get_or_create_merge_base', 'feature', 'feature'],),
2349 'fake_ancestor_sha'),
2350 ((['GetChange', 'fake_ancestor_sha', None], ),
2351 git_cl.presubmit_support.GitChange(
2352 '', '', '', '', '', '', '', '')),
2353 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2354 ((['DoGetTryMasters'], ), None),
2355 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2356 ]
2357 out = StringIO.StringIO()
2358 self.mock(git_cl.sys, 'stdout', out)
2359 self.assertEqual(0, git_cl.main(['try']))
2360 self.assertEqual(
2361 out.getvalue(),
2362 'scheduled CQ Dry Run on '
2363 'https://chromium-review.googlesource.com/123456\n')
2364
2365 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2366 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2367 lambda _: {
2368 'owner_email': 'owner@e.mail',
2369 'private': False,
2370 'closed': False,
2371 'project': 'depot_tools',
2372 'patchsets': [20001],
2373 })
tandriide281ae2016-10-12 06:02:30 -07002374 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2375 self.calls = [
2376 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2377 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2378 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2379 ((['git', 'config', 'rietveld.server'],),
2380 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002381 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002382 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002383 ]
2384
2385 def _buildbucket_retry(*_, **kw):
2386 # self.maxDiff = 10000
2387 body = json.loads(kw['body'])
2388 self.assertEqual(len(body['builds']), 1)
2389 build = body['builds'][0]
2390 params = json.loads(build.pop('parameters_json'))
2391 self.assertEqual(params, {
2392 u'builder_name': u'win',
2393 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2394 u'revision': None}],
2395 u'properties': {
2396 u'category': u'git_cl_try',
2397 u'issue': 123,
2398 u'key': u'val',
2399 u'json': [{u'a': 1}, None],
2400 u'master': u'tryserver.chromium',
2401 u'patch_project': u'depot_tools',
2402 u'patch_storage': u'rietveld',
2403 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002404 u'rietveld': u'https://codereview.chromium.org',
2405 }
2406 })
2407 self.assertEqual(build, {
2408 u'bucket': u'master.tryserver.chromium',
2409 u'client_operation_id': u'uuid4',
2410 u'tags': [u'builder:win',
2411 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002412 u'user_agent:git_cl_try',
2413 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002414 })
2415
2416 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2417
2418 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2419 self.assertEqual(0, git_cl.main([
2420 'try', '-m', 'tryserver.chromium', '-b', 'win',
2421 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2422 self.assertRegexpMatches(
2423 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002424 'Tried jobs on:\nBucket: master.tryserver.chromium')
2425
tandrii8c5a3532016-11-04 07:52:02 -07002426 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2427 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2428 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2429
tandrii8c5a3532016-11-04 07:52:02 -07002430 self.calls = [
2431 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2432 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2433 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2434 ((['git', 'config', 'branch.feature.gerritserver'],),
2435 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002436 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002437 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002438 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002439 'status': 'OPEN',
2440 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002441 'revisions': {
2442 'deadbeaf': {
2443 '_number': 6,
2444 },
2445 'beeeeeef': {
2446 '_number': 7,
2447 'fetch': {'http': {
2448 'url': 'https://chromium.googlesource.com/depot_tools',
2449 'ref': 'refs/changes/56/123456/7'
2450 }},
2451 },
2452 },
2453 }),
2454 ]
2455
2456 def _buildbucket_retry(*_, **kw):
2457 # self.maxDiff = 10000
2458 body = json.loads(kw['body'])
2459 self.assertEqual(len(body['builds']), 1)
2460 build = body['builds'][0]
2461 params = json.loads(build.pop('parameters_json'))
2462 self.assertEqual(params, {
2463 u'builder_name': u'win',
2464 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2465 u'revision': None}],
2466 u'properties': {
2467 u'category': u'git_cl_try',
2468 u'key': u'val',
2469 u'json': [{u'a': 1}, None],
2470 u'master': u'tryserver.chromium',
2471
2472 u'patch_gerrit_url':
2473 u'https://chromium-review.googlesource.com',
2474 u'patch_issue': 123456,
2475 u'patch_project': u'depot_tools',
2476 u'patch_ref': u'refs/changes/56/123456/7',
2477 u'patch_repository_url':
2478 u'https://chromium.googlesource.com/depot_tools',
2479 u'patch_set': 7,
2480 u'patch_storage': u'gerrit',
2481 }
2482 })
2483 self.assertEqual(build, {
2484 u'bucket': u'master.tryserver.chromium',
2485 u'client_operation_id': u'uuid4',
2486 u'tags': [
2487 u'builder:win',
2488 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2489 u'user_agent:git_cl_try',
2490 u'master:tryserver.chromium'],
2491 })
2492
2493 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2494
2495 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2496 self.assertEqual(0, git_cl.main([
2497 'try', '-m', 'tryserver.chromium', '-b', 'win',
2498 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2499 self.assertRegexpMatches(
2500 git_cl.sys.stdout.getvalue(),
2501 'Tried jobs on:\nBucket: master.tryserver.chromium')
2502
borenet6c0efe62016-10-19 08:13:29 -07002503 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002504 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2505 lambda _: {
2506 'owner_email': 'owner@e.mail',
2507 'private': False,
2508 'closed': False,
2509 'project': 'depot_tools',
2510 'patchsets': [20001],
2511 })
borenet6c0efe62016-10-19 08:13:29 -07002512 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2513 self.calls = [
2514 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2515 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2516 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2517 ((['git', 'config', 'rietveld.server'],),
2518 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002519 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002520 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002521 ]
2522
2523 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002524 body = json.loads(kw['body'])
2525 self.assertEqual(len(body['builds']), 1)
2526 build = body['builds'][0]
2527 params = json.loads(build.pop('parameters_json'))
2528 self.assertEqual(params, {
2529 u'builder_name': u'win',
2530 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2531 u'revision': None}],
2532 u'properties': {
2533 u'category': u'git_cl_try',
2534 u'issue': 123,
2535 u'patch_project': u'depot_tools',
2536 u'patch_storage': u'rietveld',
2537 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002538 u'rietveld': u'https://codereview.chromium.org',
2539 }
2540 })
2541 self.assertEqual(build, {
2542 u'bucket': u'test.bucket',
2543 u'client_operation_id': u'uuid4',
2544 u'tags': [u'builder:win',
2545 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2546 u'user_agent:git_cl_try'],
2547 })
2548
2549 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2550
2551 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2552 self.assertEqual(0, git_cl.main([
2553 'try', '-B', 'test.bucket', '-b', 'win']))
2554 self.assertRegexpMatches(
2555 git_cl.sys.stdout.getvalue(),
2556 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002557
qyearsley123a4682016-10-26 09:12:17 -07002558 def test_git_cl_try_bots_on_multiple_masters(self):
2559 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2560 self.calls = [
2561 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2562 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2563 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2564 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002565 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002566 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2567 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2568 ]
2569
2570 def _buildbucket_retry(*_, **kw):
2571 body = json.loads(kw['body'])
2572 self.assertEqual(len(body['builds']), 2)
2573
2574 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2575 self.assertEqual(first_build_params['builder_name'], 'builder1')
2576 self.assertEqual(first_build_params['properties']['master'], 'master1')
2577
2578 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2579 self.assertEqual(first_build_params['builder_name'], 'builder2')
2580 self.assertEqual(first_build_params['properties']['master'], 'master2')
2581
2582 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2583
2584 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2585 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2586
2587 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2588 self.assertEqual(
2589 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2590 self.assertEqual(
2591 git_cl.sys.stdout.getvalue(),
2592 'Tried jobs on:\n'
2593 'Bucket: master.master1\n'
2594 ' builder1: []\n'
2595 'Bucket: master.master2\n'
2596 ' builder2: []\n'
2597 'To see results here, run: git cl try-results\n'
2598 'To see results in browser, run: git cl web\n')
2599
tandrii16e0b4e2016-06-07 10:34:28 -07002600 def _common_GerritCommitMsgHookCheck(self):
2601 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2602 self.mock(git_cl.os.path, 'abspath',
2603 lambda path: self._mocked_call(['abspath', path]))
2604 self.mock(git_cl.os.path, 'exists',
2605 lambda path: self._mocked_call(['exists', path]))
2606 self.mock(git_cl.gclient_utils, 'FileRead',
2607 lambda path: self._mocked_call(['FileRead', path]))
2608 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2609 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2610 self.calls = [
2611 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2612 ((['abspath', '../'],), '/abs/git_repo_root'),
2613 ]
2614 return git_cl.Changelist(codereview='gerrit', issue=123)
2615
2616 def test_GerritCommitMsgHookCheck_custom_hook(self):
2617 cl = self._common_GerritCommitMsgHookCheck()
2618 self.calls += [
2619 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2620 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2621 '#!/bin/sh\necho "custom hook"')
2622 ]
2623 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2624
2625 def test_GerritCommitMsgHookCheck_not_exists(self):
2626 cl = self._common_GerritCommitMsgHookCheck()
2627 self.calls += [
2628 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2629 ]
2630 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2631
2632 def test_GerritCommitMsgHookCheck(self):
2633 cl = self._common_GerritCommitMsgHookCheck()
2634 self.calls += [
2635 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2636 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2637 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2638 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2639 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2640 ''),
2641 ]
2642 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2643
tandriic4344b52016-08-29 06:04:54 -07002644 def test_GerritCmdLand(self):
2645 self.calls += [
2646 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2647 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2648 'deadbeaf'),
2649 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2650 ((['git', 'config', 'branch.feature.gerritserver'],),
2651 'chromium-review.googlesource.com'),
2652 ]
2653 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2654 cl._codereview_impl._GetChangeDetail = lambda _: {
2655 'labels': {},
2656 'current_revision': 'deadbeaf',
2657 }
agable32978d92016-11-01 12:55:02 -07002658 cl._codereview_impl._GetChangeCommit = lambda: {
2659 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002660 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002661 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2662 }
tandriic4344b52016-08-29 06:04:54 -07002663 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002664 out = StringIO.StringIO()
2665 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002666 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002667 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002668 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002669
tandrii221ab252016-10-06 08:12:04 -07002670 BUILDBUCKET_BUILDS_MAP = {
2671 '9000': {
2672 'id': '9000',
2673 'status': 'STARTED',
2674 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2675 'result_details_json': '{"properties": {}}',
2676 'bucket': 'master.x.y',
2677 'created_by': 'user:someone@chromium.org',
2678 'created_ts': '147200002222000',
2679 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2680 },
2681 '8000': {
2682 'id': '8000',
2683 'status': 'COMPLETED',
2684 'result': 'FAILURE',
2685 'failure_reason': 'BUILD_FAILURE',
2686 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2687 'result_details_json': '{"properties": {}}',
2688 'bucket': 'master.x.y',
2689 'created_by': 'user:someone@chromium.org',
2690 'created_ts': '147200001111000',
2691 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2692 },
2693 }
2694
2695 def test_write_try_results_json(self):
2696 expected_output = [
2697 {
2698 'buildbucket_id': '8000',
2699 'bucket': 'master.x.y',
2700 'builder_name': 'my-builder',
2701 'status': 'COMPLETED',
2702 'result': 'FAILURE',
2703 'failure_reason': 'BUILD_FAILURE',
2704 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2705 },
2706 {
2707 'buildbucket_id': '9000',
2708 'bucket': 'master.x.y',
2709 'builder_name': 'my-builder',
2710 'status': 'STARTED',
2711 'result': None,
2712 'failure_reason': None,
2713 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2714 }
2715 ]
2716 self.calls = [(('write_json', 'output.json', expected_output), '')]
2717 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2718
tandrii45b2a582016-10-11 03:14:16 -07002719 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002720 out = StringIO.StringIO()
2721 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002722 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2723 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002724 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2725 self._mocked_call(['get_authenticator_for_host', host]))
2726 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2727 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002728
2729 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2730 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002731 self.calls += [
2732 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2733 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2734 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2735 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2736 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2737 ((['git', 'config', 'branch.feature.rietveldserver'],),
2738 'codereview.example.com'),
2739 ((['get_authenticator_for_host', 'codereview.example.com'],),
2740 AuthenticatorMock()),
2741 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2742
2743 def test_fetch_try_jobs_none_rietveld(self):
2744 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002745 # Simulate that user isn't logged in.
2746 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002747 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002748 self.assertRegexpMatches(sys.stdout.getvalue(),
2749 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002750 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2751
2752 def test_fetch_try_jobs_some_rietveld(self):
2753 self._setup_fetch_try_jobs_rietveld({
2754 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2755 })
2756 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002757 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2758 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2759 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2760
2761 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2762 self._setup_fetch_try_jobs(most_recent_patchset=13)
2763 self.calls += [
2764 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2765 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2766 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002767 # TODO(tandrii): Uncomment the below if we decide to support checking
2768 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002769 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002770 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002771 ((['git', 'config', 'branch.feature.gerritserver'],),
2772 'https://x-review.googlesource.com'),
2773 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2774 AuthenticatorMock()),
2775 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2776
2777 def test_fetch_try_jobs_none_gerrit(self):
2778 self._setup_fetch_try_jobs_gerrit({})
2779 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002780 # TODO(tandrii): Uncomment the below if we decide to support checking
2781 # patchsets for Gerrit.
2782 # self.assertRegexpMatches(
2783 # sys.stdout.getvalue(),
2784 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002785 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2786
2787 def test_fetch_try_jobs_some_gerrit(self):
2788 self._setup_fetch_try_jobs_gerrit({
2789 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2790 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002791 # TODO(tandrii): Uncomment the below if we decide to support checking
2792 # patchsets for Gerrit.
2793 # self.calls.remove(
2794 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002795 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2796
2797 # ... and doesn't result in warning.
2798 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2799 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002800 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2801 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2802
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002803 def _mock_gerrit_changes_for_detail_cache(self):
2804 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002805
2806 def test_gerrit_change_detail_cache_normalize(self):
2807 self._mock_gerrit_changes_for_detail_cache()
2808 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002809 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002810 ]
2811 cl = git_cl.Changelist(codereview='gerrit')
2812 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2813 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2814 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2815 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2816
2817 def test_gerrit_change_detail_cache_simple(self):
2818 self._mock_gerrit_changes_for_detail_cache()
2819 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002820 (('GetChangeDetail', 'host', '1', []), 'a'),
2821 (('GetChangeDetail', 'host', '2', []), 'b'),
2822 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002823 ]
2824 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2825 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2826 self.assertEqual(cl._GetChangeDetail(), 'a')
2827 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002828 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002829 self.assertEqual(cl._GetChangeDetail(), 'a')
2830 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2831
2832 def test_gerrit_change_detail_cache_options(self):
2833 self._mock_gerrit_changes_for_detail_cache()
2834 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002835 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2836 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2837 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2838 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002839 ]
2840 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2841 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2842 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2843 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2844 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2845 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2846 self.assertEqual(cl._GetChangeDetail(), 'cab')
2847
2848 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2849 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2850 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2851 self.assertEqual(cl._GetChangeDetail(), 'cab')
2852
2853 # Finally, no_cache should invalidate all caches for given change.
2854 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2855 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2856
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002857 def test_gerrit_description_caching(self):
2858 def gen_detail(rev, desc):
2859 return {
2860 'current_revision': rev,
2861 'revisions': {rev: {'commit': {'message': desc}}}
2862 }
2863 self.calls = [
2864 (('GetChangeDetail', 'host', '1',
2865 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2866 gen_detail('rev1', 'desc1')),
2867 (('GetChangeDetail', 'host', '1',
2868 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2869 gen_detail('rev2', 'desc2')),
2870 ]
2871
2872 self._mock_gerrit_changes_for_detail_cache()
2873 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2874 self.assertEqual(cl.GetDescription(), 'desc1')
2875 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
2876 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002877
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002878if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01002879 logging.basicConfig(
2880 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002881 unittest.main()