blob: 708368dba2f4fb9c3ec2f547ff1fbbf9a8a7b469 [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Unit tests for git_cl.py."""
7
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
tandriide281ae2016-10-12 06:02:30 -07009import json
maruel@chromium.orgddd59412011-11-30 14:20:38 +000010import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000011import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import sys
13import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000014import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000015
16sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
17
18from testing_support.auto_stub import TestCase
19
20import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000021import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000022import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000023import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000024
tandrii5d48c322016-08-18 16:19:37 -070025def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
26 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
27
28
29CERR1 = callError(1)
30
31
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000032class ChangelistMock(object):
33 # A class variable so we can access it when we don't have access to the
34 # instance that's being set.
35 desc = ""
36 def __init__(self, **kwargs):
37 pass
38 def GetIssue(self):
39 return 1
40 def GetDescription(self):
41 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070042 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 ChangelistMock.desc = desc
44
tandrii5d48c322016-08-18 16:19:37 -070045
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000046class PresubmitMock(object):
47 def __init__(self, *args, **kwargs):
48 self.reviewers = []
49 @staticmethod
50 def should_continue():
51 return True
52
53
54class RietveldMock(object):
55 def __init__(self, *args, **kwargs):
56 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000057
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000058 @staticmethod
59 def get_description(issue):
60 return 'Issue: %d' % issue
61
maruel@chromium.org78936cb2013-04-11 00:17:52 +000062 @staticmethod
63 def get_issue_properties(_issue, _messages):
64 return {
65 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
66 'messages': [
67 {
68 'approval': True,
69 'sender': 'john@chromium.org',
70 },
71 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010072 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000073 }
74
iannuccie53c9352016-08-17 14:40:40 -070075 @staticmethod
76 def close_issue(_issue):
77 return 'Closed'
78
skobes6468b902016-10-24 08:45:10 -070079 @staticmethod
80 def get_patch(issue, patchset):
81 return 'patch set from issue %s patchset %s' % (issue, patchset)
82
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010083 @staticmethod
84 def update_description(_issue, _description):
85 return 'Updated'
86
87 @staticmethod
88 def add_comment(_issue, _comment):
89 return 'Commented'
90
91
92
skobes6468b902016-10-24 08:45:10 -070093
94class GitCheckoutMock(object):
95 def __init__(self, *args, **kwargs):
96 pass
97
98 @staticmethod
99 def reset():
100 GitCheckoutMock.conflict = False
101
102 def apply_patch(self, p):
103 if GitCheckoutMock.conflict:
104 raise Exception('failed')
105
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000106
107class WatchlistsMock(object):
108 def __init__(self, _):
109 pass
110 @staticmethod
111 def GetWatchersForPaths(_):
112 return ['joe@example.com']
113
114
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000115class CodereviewSettingsFileMock(object):
116 def __init__(self):
117 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800118 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000119 def read(self):
120 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000121 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000122
123
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000124class AuthenticatorMock(object):
125 def __init__(self, *_args):
126 pass
127 def has_cached_credentials(self):
128 return True
tandrii221ab252016-10-06 08:12:04 -0700129 def authorize(self, http):
130 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000131
132
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000133def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
134 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
135
136 Usage:
137 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
138 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
139
140 OR
141 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
142 CookiesAuthenticatorMockFactory(cookie='cookie'))
143 """
144 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800145 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000146 # Intentionally not calling super() because it reads actual cookie files.
147 pass
148 @classmethod
149 def get_gitcookies_path(cls):
150 return '~/.gitcookies'
151 @classmethod
152 def get_netrc_path(cls):
153 return '~/.netrc'
154 def get_auth_header(self, host):
155 if same_cookie:
156 return same_cookie
157 return (hosts_with_creds or {}).get(host)
158 return CookiesAuthenticatorMock
159
kmarshall9249e012016-08-23 12:02:16 -0700160class MockChangelistWithBranchAndIssue():
161 def __init__(self, branch, issue):
162 self.branch = branch
163 self.issue = issue
164 def GetBranch(self):
165 return self.branch
166 def GetIssue(self):
167 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000168
tandriic2405f52016-10-10 08:13:15 -0700169
170class SystemExitMock(Exception):
171 pass
172
173
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000174class TestGitClBasic(unittest.TestCase):
175 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
176 parsed = urlparse.urlparse(url)
177 result = func(parsed)
178 if fail:
179 self.assertIsNone(result)
180 return None
181 self.assertIsNotNone(result)
182 self.assertEqual(result.issue, issue)
183 self.assertEqual(result.patchset, patchset)
184 self.assertEqual(result.hostname, hostname)
185 return result
186
187 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700188 def test(url, issue=None, patchset=None, hostname=None, fail=None):
189 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000190 git_cl._RietveldChangelistImpl.ParseIssueURL,
191 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000192
193 test('http://codereview.chromium.org/123',
194 123, None, 'codereview.chromium.org')
195 test('https://codereview.chromium.org/123',
196 123, None, 'codereview.chromium.org')
197 test('https://codereview.chromium.org/123/',
198 123, None, 'codereview.chromium.org')
199 test('https://codereview.chromium.org/123/whatever',
200 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700201 test('https://codereview.chromium.org/123/#ps20001',
202 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000203 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700204 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000205 # This looks like bad Gerrit, but is actually valid Rietveld.
206 test('https://chrome-review.source.com/123/4/',
207 123, None, 'chrome-review.source.com')
208
209 test('https://codereview.chromium.org/deadbeaf', fail=True)
210 test('https://codereview.chromium.org/api/123', fail=True)
211 test('bad://codereview.chromium.org/123', fail=True)
212 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
213
214 def test_ParseIssueURL_gerrit(self):
215 def test(url, issue=None, patchset=None, hostname=None, fail=None):
216 self._test_ParseIssueUrl(
217 git_cl._GerritChangelistImpl.ParseIssueURL,
218 url, issue, patchset, hostname, fail)
219
220 test('http://chrome-review.source.com/c/123',
221 123, None, 'chrome-review.source.com')
222 test('https://chrome-review.source.com/c/123/',
223 123, None, 'chrome-review.source.com')
224 test('https://chrome-review.source.com/c/123/4',
225 123, 4, 'chrome-review.source.com')
226 test('https://chrome-review.source.com/#/c/123/4',
227 123, 4, 'chrome-review.source.com')
228 test('https://chrome-review.source.com/c/123/4',
229 123, 4, 'chrome-review.source.com')
230 test('https://chrome-review.source.com/123',
231 123, None, 'chrome-review.source.com')
232 test('https://chrome-review.source.com/123/4',
233 123, 4, 'chrome-review.source.com')
234
235 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
236 test('https://chrome-review.source.com/c/abc/', fail=True)
237 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
238
239 def test_ParseIssueNumberArgument(self):
240 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
241 result = git_cl.ParseIssueNumberArgument(arg)
242 self.assertIsNotNone(result)
243 if fail:
244 self.assertFalse(result.valid)
245 else:
246 self.assertEqual(result.issue, issue)
247 self.assertEqual(result.patchset, patchset)
248 self.assertEqual(result.hostname, hostname)
249
250 test('123', 123)
251 test('', fail=True)
252 test('abc', fail=True)
253 test('123/1', fail=True)
254 test('123a', fail=True)
255 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
256 # Rietveld.
257 test('https://codereview.source.com/123',
258 123, None, 'codereview.source.com')
259 test('https://codereview.source.com/www123', fail=True)
260 # Gerrrit.
261 test('https://chrome-review.source.com/c/123/4',
262 123, 4, 'chrome-review.source.com')
263 test('https://chrome-review.source.com/bad/123/4', fail=True)
264
tandriif9aefb72016-07-01 09:06:51 -0700265 def test_get_bug_line_values(self):
266 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
267 self.assertEqual(f('', ''), [])
268 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
269 self.assertEqual(f('v8', '456'), ['v8:456'])
270 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
271 # Not nice, but not worth carying.
272 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
273 ['v8:456', 'chromium:123', 'v8:123'])
274
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100275 def _test_git_number(self, parent_msg, dest_ref, child_msg,
276 parent_hash='parenthash'):
277 desc = git_cl.ChangeDescription(child_msg)
278 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
279 return desc.description
280
281 def assertEqualByLine(self, actual, expected):
282 self.assertEqual(actual.splitlines(), expected.splitlines())
283
284 def test_git_number_bad_parent(self):
285 with self.assertRaises(ValueError):
286 self._test_git_number('Parent', 'refs/heads/master', 'Child')
287
288 def test_git_number_bad_parent_footer(self):
289 with self.assertRaises(AssertionError):
290 self._test_git_number(
291 'Parent\n'
292 '\n'
293 'Cr-Commit-Position: wrong',
294 'refs/heads/master', 'Child')
295
296 def test_git_number_bad_lineage_ignored(self):
297 actual = self._test_git_number(
298 'Parent\n'
299 '\n'
300 'Cr-Commit-Position: refs/heads/master@{#1}\n'
301 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
302 'refs/heads/master', 'Child')
303 self.assertEqualByLine(
304 actual,
305 'Child\n'
306 '\n'
307 'Cr-Commit-Position: refs/heads/master@{#2}\n'
308 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
309
310 def test_git_number_same_branch(self):
311 actual = self._test_git_number(
312 'Parent\n'
313 '\n'
314 'Cr-Commit-Position: refs/heads/master@{#12}',
315 dest_ref='refs/heads/master',
316 child_msg='Child')
317 self.assertEqualByLine(
318 actual,
319 'Child\n'
320 '\n'
321 'Cr-Commit-Position: refs/heads/master@{#13}')
322
323 def test_git_number_same_branch_with_originals(self):
324 actual = self._test_git_number(
325 'Parent\n'
326 '\n'
327 'Cr-Commit-Position: refs/heads/master@{#12}',
328 dest_ref='refs/heads/master',
329 child_msg='Child\n'
330 '\n'
331 'Some users are smart and insert their own footers\n'
332 '\n'
333 'Cr-Whatever: value\n'
334 'Cr-Commit-Position: refs/copy/paste@{#22}')
335 self.assertEqualByLine(
336 actual,
337 'Child\n'
338 '\n'
339 'Some users are smart and insert their own footers\n'
340 '\n'
341 'Cr-Original-Whatever: value\n'
342 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
343 'Cr-Commit-Position: refs/heads/master@{#13}')
344
345 def test_git_number_new_branch(self):
346 actual = self._test_git_number(
347 'Parent\n'
348 '\n'
349 'Cr-Commit-Position: refs/heads/master@{#12}',
350 dest_ref='refs/heads/branch',
351 child_msg='Child')
352 self.assertEqualByLine(
353 actual,
354 'Child\n'
355 '\n'
356 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
357 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
358
359 def test_git_number_lineage(self):
360 actual = self._test_git_number(
361 'Parent\n'
362 '\n'
363 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
364 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
365 dest_ref='refs/heads/branch',
366 child_msg='Child')
367 self.assertEqualByLine(
368 actual,
369 'Child\n'
370 '\n'
371 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
372 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
373
374 def test_git_number_moooooooore_lineage(self):
375 actual = self._test_git_number(
376 'Parent\n'
377 '\n'
378 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
379 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
380 dest_ref='refs/heads/mooore',
381 child_msg='Child')
382 self.assertEqualByLine(
383 actual,
384 'Child\n'
385 '\n'
386 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
387 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
388 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
389
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100390 def test_git_number_ever_moooooooore_lineage(self):
391 self.maxDiff = 10000
392 actual = self._test_git_number(
393 'CQ commit on fresh new branch + numbering.\n'
394 '\n'
395 'NOTRY=True\n'
396 'NOPRESUBMIT=True\n'
397 'BUG=\n'
398 '\n'
399 'Review-Url: https://codereview.chromium.org/2577703003\n'
400 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
401 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
402 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
403 dest_ref='refs/heads/gnumb-test/cl',
404 child_msg='git cl on fresh new branch + numbering.\n'
405 '\n'
406 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
407 self.assertEqualByLine(
408 actual,
409 'git cl on fresh new branch + numbering.\n'
410 '\n'
411 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
412 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
413 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
414 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
415 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100416
417 def test_git_number_cherry_pick(self):
418 actual = self._test_git_number(
419 'Parent\n'
420 '\n'
421 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
422 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
423 dest_ref='refs/heads/branch',
424 child_msg='Child, which is cherry-pick from master\n'
425 '\n'
426 'Cr-Commit-Position: refs/heads/master@{#100}\n'
427 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
428 self.assertEqualByLine(
429 actual,
430 'Child, which is cherry-pick from master\n'
431 '\n'
432 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
433 '\n'
434 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
435 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
436 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
437
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000438
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000439class TestGitCl(TestCase):
440 def setUp(self):
441 super(TestGitCl, self).setUp()
442 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700443 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000444 self.mock(subprocess2, 'call', self._mocked_call)
445 self.mock(subprocess2, 'check_call', self._mocked_call)
446 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700447 self.mock(subprocess2, 'communicate',
448 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000449 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000450 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000451 self.mock(git_common, 'get_or_create_merge_base',
452 lambda *a: (
453 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000454 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000455 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000456 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700457 self.mock(git_cl, 'write_json', lambda path, contents:
458 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000459 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000460 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000461 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700462 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
463 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000464 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000465 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000466 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000467 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
468 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700469 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100470 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000471 # It's important to reset settings to not have inter-tests interference.
472 git_cl.settings = None
473
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000474
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000475 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000476 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000477 # Note: has_failed returns True if at least 1 test ran so far, current
478 # included, has failed. That means current test may have actually ran
479 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000480 if not self.has_failed():
481 self.assertEquals([], self.calls)
482 finally:
483 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000484
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000485 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000486 self.assertTrue(
487 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700488 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000489 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000490 expected_args, result = top
491
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000492 # Also logs otherwise it could get caught in a try/finally and be hard to
493 # diagnose.
494 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700495 N = 5
496 prior_calls = '\n '.join(
497 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
498 for i, c in enumerate(self._calls_done[-N:]))
499 following_calls = '\n '.join(
500 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
501 for i, c in enumerate(self.calls[:N]))
502 extended_msg = (
503 'A few prior calls:\n %s\n\n'
504 'This (expected):\n @%d: %r\n'
505 'This (actual):\n @%d: %r\n\n'
506 'A few following expected calls:\n %s' %
507 (prior_calls, len(self._calls_done), expected_args,
508 len(self._calls_done), args, following_calls))
509 git_cl.logging.error(extended_msg)
510
tandrii99a72f22016-08-17 14:33:24 -0700511 self.fail('@%d\n'
512 ' Expected: %r\n'
513 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700514 len(self._calls_done), expected_args, args))
515
516 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700517 if isinstance(result, Exception):
518 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000519 return result
520
tandrii48df5812016-10-17 03:55:37 -0700521 def test_LoadCodereviewSettingsFromFile_gerrit(self):
522 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
523 self.calls = [
524 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
525 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
526 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
527 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
528 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
529 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700530 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
531 CERR1),
532 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700533 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
534 CERR1),
535 ((['git', 'config', 'gerrit.host', 'true'],), ''),
536 ]
537 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
538
maruel@chromium.orga3353652011-11-30 14:26:57 +0000539 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000540 def _is_gerrit_calls(cls, gerrit=False):
541 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
542 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
543
544 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000545 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000546 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000547 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000548
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000549 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000550 def _upload_no_rev_calls(cls, similarity, find_copies):
551 return (cls._git_base_calls(similarity, find_copies) +
552 cls._git_upload_no_rev_calls())
553
554 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000555 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000556 if similarity is None:
557 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700558 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700559 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000560 else:
tandrii33a46ff2016-08-23 05:53:40 -0700561 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700562 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000563
564 if find_copies is None:
565 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700566 find_copies_call = ((['git', 'config', '--bool',
567 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000568 else:
tandrii5d48c322016-08-18 16:19:37 -0700569 val = str(find_copies).lower()
570 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000571 'branch.master.git-find-copies', val],), '')
572
573 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000574 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800575 '-l100000', '-C'+similarity,
576 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000577 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000578 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000579 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000580
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000581 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000582 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000583 similarity_call,
584 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
585 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000586 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000587 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700588 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
589 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000590 ((['git', 'config', 'rietveld.server'],),
591 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000592 ((['git', 'config', 'branch.master.merge'],), 'master'),
593 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000594 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000595 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000596 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000597 ((['git', 'rev-parse', '--show-cdup'],), ''),
598 ((['git', 'rev-parse', 'HEAD'],), '12345'),
599 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000600 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000601 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700602 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000603 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000604 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000605 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000606 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000607 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000608 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000609 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000610 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000611 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000612 ]
613
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000614 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000615 def _git_upload_no_rev_calls(cls):
616 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000617 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000618 ]
619
620 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000621 def _git_upload_calls(cls, private):
622 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000623 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000624 private_call = []
625 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000626 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000627 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000628 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000629
maruel@chromium.orga3353652011-11-30 14:26:57 +0000630 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000631 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000632 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000633 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800634 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000635 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700636 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000637 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000638 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000639 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700640 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000641 ] + cls._git_post_upload_calls()
642
643 @classmethod
644 def _git_post_upload_calls(cls):
645 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000646 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
647 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
648 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000649 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000650 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651 ]
652
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000653 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000654 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000655 fake_ancestor = 'fake_ancestor'
656 fake_cl = 'fake_cl_for_patch'
657 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000658 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000659 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000660 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000661 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000662 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000663 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000664 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000665 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700666 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000667 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000668 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000669 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000670 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000671 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000672 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000673 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000674 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000675 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000676 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000677 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000678
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000679 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700680 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000681 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000682 return [
683 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000684 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000685 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000686 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700687 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000688 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000689 '--git_similarity', similarity or '50'
690 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000691 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000692 ]
693
694 def _run_reviewer_test(
695 self,
696 upload_args,
697 expected_description,
698 returned_description,
699 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000700 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700701 private=False,
702 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000703 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000704 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000705 try:
706 similarity = upload_args[upload_args.index('--similarity')+1]
707 except ValueError:
708 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000709
710 if '--find-copies' in upload_args:
711 find_copies = True
712 elif '--no-find-copies' in upload_args:
713 find_copies = False
714 else:
715 find_copies = None
716
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000717 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700718 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000719
720 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000721
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000722 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000723 self.assertEquals(
724 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000725 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000726 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000727 '#--------------------This line is 72 characters long'
728 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000729 expected_description,
730 desc)
731 return returned_description
732 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000733
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000734 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700736 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000737 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000738 return 1, 2
739 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000740
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000741 git_cl.main(['upload'] + upload_args)
742
743 def test_no_reviewer(self):
744 self._run_reviewer_test(
745 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000746 'desc\n\nBUG=',
747 '# Blah blah comment.\ndesc\n\nBUG=',
748 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000749 [])
750
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000751 def test_keep_similarity(self):
752 self._run_reviewer_test(
753 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000754 'desc\n\nBUG=',
755 '# Blah blah comment.\ndesc\n\nBUG=',
756 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000757 [])
758
iannucci@chromium.org79540052012-10-19 23:15:26 +0000759 def test_keep_find_copies(self):
760 self._run_reviewer_test(
761 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000762 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000763 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000764 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000765 [])
766
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000767 def test_private(self):
768 self._run_reviewer_test(
769 ['--private'],
770 'desc\n\nBUG=',
771 '# Blah blah comment.\ndesc\n\nBUG=\n',
772 'desc\n\nBUG=',
773 [])
774
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000775 def test_reviewers_cmd_line(self):
776 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000777 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000778 self._run_reviewer_test(
779 ['-r' 'foo@example.com'],
780 description,
781 '\n%s\n' % description,
782 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000783 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000784
785 def test_reviewer_tbr_overriden(self):
786 # Reviewer is overriden with TBR
787 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000788 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000789 self._run_reviewer_test(
790 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000791 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000792 description.strip('\n'),
793 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000794 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000795
796 def test_reviewer_multiple(self):
797 # Handles multiple R= or TBR= lines.
798 description = (
bradnelsond975b302016-10-23 12:20:23 -0700799 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
800 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000801 self._run_reviewer_test(
802 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000803 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000804 description,
805 description,
bradnelsond975b302016-10-23 12:20:23 -0700806 ['--reviewers=another@example.com,reviewer@example.com'],
807 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000808
maruel@chromium.orga3353652011-11-30 14:26:57 +0000809 def test_reviewer_send_mail(self):
810 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000811 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000812 self._run_reviewer_test(
813 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000814 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000815 description.strip('\n'),
816 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000817 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000818
819 def test_reviewer_send_mail_no_rev(self):
820 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000821 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700822 self.calls = self._upload_no_rev_calls(None, None) + [
823 ((['DieWithError', 'Must specify reviewers to send email.'],),
824 SystemExitMock())
825 ]
826
827 def RunEditor(desc, _, **kwargs):
828 return desc
829 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
830 self.mock(sys, 'stdout', stdout)
831 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000832 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700833 self.assertEqual(
834 'Using 50% similarity for rename/copy detection. Override with '
835 '--similarity.\n',
836 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000837
tandriif9aefb72016-07-01 09:06:51 -0700838 def test_bug_on_cmd(self):
839 self._run_reviewer_test(
840 ['--bug=500658,proj:123'],
841 'desc\n\nBUG=500658\nBUG=proj:123',
842 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
843 'desc\n\nBUG=500658\nBUG=proj:1234',
844 [])
845
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100846 def _land_rietveld_common(self, debug=False):
847 if debug:
848 # Very useful due to finally clause in git cl land raising exceptions and
849 # shadowing real cause of failure.
850 self.mock(git_cl, '_IS_BEING_TESTED', True)
851 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100852 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100853
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100854 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
855 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100856 self.mock(RietveldMock, 'update_description', staticmethod(
857 lambda i, d: self._mocked_call(['update_description', i, d])))
858 self.mock(RietveldMock, 'add_comment', staticmethod(
859 lambda i, c: self._mocked_call(['add_comment', i, c])))
860 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100861 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
862 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
863 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
864 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
865 CERR1),
866 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
867 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800868 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100869 ((['git', 'config', 'rietveld.server'],),
870 'https://codereview.chromium.org'),
871 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
872 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
873 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
874 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100875 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
876 ''), # No commits to rebase, according to local view of origin.
877 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
878 'fake_ancestor_sha'),
879 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
880 ((['git', 'rev-parse', '--show-cdup'],), ''),
881 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
882 ((['git', 'diff', '--name-status', '--no-renames', '-r',
883 'fake_ancestor_sha...', '.'],),
884 'M\tfile1.cpp'),
885 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
886 ((['git', 'config', 'branch.feature.rietveldserver'],),
887 'https://codereview.chromium.org'),
888 ((['git', 'config', 'user.email'],), 'user@e.mail'),
889 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
890 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
891 'fake_ancestor_sha', 'feature'],),
892 # This command just prints smth like this:
893 # file1.cpp | 53 ++++++--
894 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
895 ''),
896 ((['git', 'show-ref', '--quiet', '--verify',
897 'refs/heads/git-cl-commit'],),
898 ''), # 0 return code means branch exists.
899 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
900 ((['git', 'show-ref', '--quiet', '--verify',
901 'refs/heads/git-cl-cherry-pick'],),
902 CERR1), # This means git-cl-cherry-pick branch does not exist.
903 ((['git', 'rev-parse', '--show-cdup'],), ''),
904 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
905 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
906 ((['git', 'commit', '-m',
907 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100908 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100909 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
910 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
911 ((['git', 'config', '--get', 'remote.origin.url'],),
912 'https://chromium.googlesource.com/infra/infra'),
913 ]
914
915 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100916 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100917 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100918 ((['git', 'config', 'remote.origin.url'],),
919 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100920 (('_is_git_numberer_enabled',
921 'https://chromium.googlesource.com/infra/infra',
922 'refs/heads/master'),
923 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100924 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
925 ''),
926 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
927 ((['git', 'checkout', '-q', 'feature'],), ''),
928 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
929 ((['git', 'config', 'rietveld.viewvc-url'],),
930 'https://chromium.googlesource.com/infra/infra/+/'),
931 ((['update_description', 123,
932 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
933 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
934 ''),
935 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
936 'fake_sha_rebased (presubmit successful).'],), ''),
937 ]
938 git_cl.main(['land'])
939
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100940 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100941 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100942
943 # Special mocks to check validity of timestamp.
944 original_git_amend_head = git_cl._git_amend_head
945 def _git_amend_head_mock(msg, tstamp):
946 self._mocked_call(['git_amend_head committer timestamp', tstamp])
947 return original_git_amend_head(msg, tstamp)
948 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
949
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100950 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100951 ((['git', 'config', 'remote.origin.url'],),
952 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100953 (('_is_git_numberer_enabled',
954 'https://chromium.googlesource.com/chromium/src',
955 'refs/heads/master'),
956 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100957 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
958 'This is parent commit.\n'
959 '\n'
960 'Cr-Commit-Position: refs/heads/master@{#543}\n'
961 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100962 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
963 '1480022355'), # Committer's unix timestamp.
964 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
965 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100966
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100967 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100968 ((['git', 'commit', '--amend', '-m',
969 'Issue: 123\n\nR=john@chromium.org\n'
970 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100971 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100972 'Cr-Commit-Position: refs/heads/master@{#544}\n'
973 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
974
975 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
976 ''),
977 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
978 ((['git', 'checkout', '-q', 'feature'],), ''),
979 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
980 ((['git', 'config', 'rietveld.viewvc-url'],),
981 'https://chromium.googlesource.com/infra/infra/+/'),
982 ((['update_description', 123,
983 'Issue: 123\n\nR=john@chromium.org\n'
984 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100985 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100986 'Cr-Commit-Position: refs/heads/master@{#544}\n'
987 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
988 'Committed: '
989 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
990 ''),
991 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
992 'fake_sha_rebased (presubmit successful).'],), ''),
993 ]
994 git_cl.main(['land'])
995
996 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100997 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100998 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100999 ((['git', 'config', 'remote.origin.url'],),
1000 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001001 (('_is_git_numberer_enabled',
1002 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1003 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001004
1005 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1006 'This is parent commit with no footer.'),
1007
1008 ((['git', 'checkout', '-q', 'feature'],), ''),
1009 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1010 ]
1011 with self.assertRaises(ValueError) as cm:
1012 git_cl.main(['land'])
1013 self.assertEqual(cm.exception.message,
1014 'Unable to infer commit position from footers')
1015
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001016 def test_git_numberer_not_whitelisted_repo(self):
1017 self.calls = []
1018 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001019 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1020 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001021 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001022
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001023 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001024 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1025 self.calls = [
1026 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001027 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001028 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001029 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001030 remote_url='https://chromium.googlesource.com/chromium/src',
1031 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001032 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001033
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001034 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001035 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001036 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001037 def fake_temporary_directory(**kwargs):
1038 yield tempdir
1039 self.mock(git_cl.gclient_utils, 'temporary_directory',
1040 fake_temporary_directory)
1041 self._test_GitNumbererState_valid_configs_inner(tempdir)
1042
1043 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001044 self.calls = [
1045 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001046 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001047 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1048 '''
1049 [plugin "git-numberer"]
1050 validate-enabled-refglob = refs/else/*
1051 validate-enabled-refglob = refs/heads/*
1052 validate-disabled-refglob = refs/heads/disabled
1053 validate-disabled-refglob = refs/branch-heads/*
1054 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001055 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1056 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001057 'refs/else/*\n'
1058 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001059 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1060 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001061 'refs/heads/disabled\n'
1062 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001063 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001064
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001065 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001066 remote_url='https://chromium.googlesource.com/chromium/src',
1067 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001068 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001069
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001070 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001071 remote_url='https://chromium.googlesource.com/chromium/src',
1072 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001073 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001074
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001075 # Validator is disabled by default, even if it's not explicitely in disabled
1076 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001077 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001078 remote_url='https://chromium.googlesource.com/chromium/src',
1079 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001080 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001081
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001082 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001083 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001084 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001085 if skip_auth_check:
1086 return [((cmd, ), 'true')]
1087
tandrii5d48c322016-08-18 16:19:37 -07001088 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001089 if issue:
1090 calls.extend([
1091 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1092 ])
1093 calls.extend([
1094 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1095 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1096 ((['git', 'config', 'remote.origin.url'],),
1097 'https://chromium.googlesource.com/my/repo'),
1098 ((['git', 'config', 'remote.origin.url'],),
1099 'https://chromium.googlesource.com/my/repo'),
1100 ])
1101 return calls
1102
1103 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001104 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001105 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001106 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001107 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001108 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001109 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001110 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1111 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001112 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001113 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001114 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1115 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001116 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001117 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001118 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001119 ((['get_or_create_merge_base', 'master',
1120 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001121 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001122 # Calls to verify branch point is ancestor
1123 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1124 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1125 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001126 ((['git', 'rev-parse', '--show-cdup'],), ''),
1127 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001128
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001129 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001130 'diff', '--name-status', '--no-renames', '-r',
1131 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001132 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001133 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001134 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001135 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001136 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001137 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001138 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001139 ((['git', 'config', 'user.email'],), 'me@example.com'),
1140 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001141 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1142 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001143 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001144 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001145
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001146 @classmethod
1147 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001148 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001149 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001150 ref_suffix='', title=None, notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001151 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001152 if post_amend_description is None:
1153 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001154 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001155 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001156
tandriia60502f2016-06-20 02:01:53 -07001157 if squash_mode == 'default':
1158 calls.extend([
1159 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1160 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1161 ])
1162 elif squash_mode in ('override_squash', 'override_nosquash'):
1163 calls.extend([
1164 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1165 'true' if squash_mode == 'override_squash' else 'false'),
1166 ])
1167 else:
1168 assert squash_mode in ('squash', 'nosquash')
1169
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001170 # If issue is given, then description is fetched from Gerrit instead.
1171 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001172 calls += [
1173 ((['git', 'log', '--pretty=format:%s\n\n%b',
1174 'fake_ancestor_sha..HEAD'],),
1175 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001176 if squash:
1177 title = 'Initial_upload'
1178 else:
1179 if not title:
1180 calls += [
1181 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1182 (('Title for patchset []: ',), 'User input'),
1183 ]
1184 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001185 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001186 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001187 # DownloadGerritHook(False)
1188 ((False, ),
1189 ''),
1190 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001191 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001192 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001193 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001194 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001195 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001196 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001197 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001198 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001199 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001200 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001201 if not issue:
1202 # Prompting to edit description on first upload.
1203 calls += [
1204 ((['git', 'config', 'core.editor'],), ''),
1205 ((['RunEditor'],), description),
1206 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001207 ref_to_push = 'abcdef0123456789'
1208 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001209 ((['git', 'config', 'branch.master.merge'],),
1210 'refs/heads/master'),
1211 ((['git', 'config', 'branch.master.remote'],),
1212 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001213 ((['get_or_create_merge_base', 'master',
1214 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001215 'origin/master'),
1216 ((['git', 'rev-parse', 'HEAD:'],),
1217 '0123456789abcdef'),
1218 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001219 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001220 ref_to_push),
1221 ]
1222 else:
1223 ref_to_push = 'HEAD'
1224
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001225 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001226 ((['git', 'rev-list',
1227 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001228 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001229
Aaron Gable9b713dd2016-12-14 16:04:21 -08001230 if title:
1231 if ref_suffix:
1232 ref_suffix += ',m=' + title
1233 else:
1234 ref_suffix = '%m=' + title
1235
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001236 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1237 if ref_suffix:
1238 ref_suffix += ',' + notify_suffix
1239 else:
1240 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001241
ukai@chromium.orge8077812012-02-03 03:41:46 +00001242 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001243 ref_suffix += ',' + ','.join('r=%s' % email
1244 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001245 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001246 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001247 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001248 ('remote:\n'
1249 'remote: Processing changes: (\)\n'
1250 'remote: Processing changes: (|)\n'
1251 'remote: Processing changes: (/)\n'
1252 'remote: Processing changes: (-)\n'
1253 'remote: Processing changes: new: 1 (/)\n'
1254 'remote: Processing changes: new: 1, done\n'
1255 'remote:\n'
1256 'remote: New Changes:\n'
1257 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1258 'remote:\n'
1259 'To https://chromium.googlesource.com/yyy/zzz\n'
1260 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001261 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001262 if squash:
1263 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001264 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001265 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001266 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001267 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001268 ((['git', 'config', 'branch.master.gerritsquashhash',
1269 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001270 ]
tandrii88189772016-09-29 04:29:57 -07001271 calls += [
1272 ((['git', 'config', 'rietveld.cc'],), ''),
1273 ((['AddReviewers', 'chromium-review.googlesource.com',
1274 123456 if squash else None,
Aaron Gable59f48512017-01-12 10:54:46 -08001275 ['joe@example.com'] + cc, False, notify],), ''),
tandrii88189772016-09-29 04:29:57 -07001276 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001277 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001278 return calls
1279
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001280 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001281 self,
1282 upload_args,
1283 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001284 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001285 squash=True,
1286 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001287 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001288 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001289 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001290 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001291 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001292 issue=None,
1293 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001294 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001295 if squash_mode is None:
1296 if '--no-squash' in upload_args:
1297 squash_mode = 'nosquash'
1298 elif '--squash' in upload_args:
1299 squash_mode = 'squash'
1300 else:
1301 squash_mode = 'default'
1302
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001303 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001304 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001305 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001306 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001307 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001308 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1309 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001310 self.mock(git_cl.gclient_utils, 'RunEditor',
1311 lambda *_, **__: self._mocked_call(['RunEditor']))
1312 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001313 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable59f48512017-01-12 10:54:46 -08001314 lambda h, i, add, is_reviewer, notify: self._mocked_call(
1315 ['AddReviewers', h, i, add, is_reviewer, notify]))
tandriia60502f2016-06-20 02:01:53 -07001316
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001317 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001318 self.calls += self._gerrit_upload_calls(
1319 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001320 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001321 expected_upstream_ref=expected_upstream_ref,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001322 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001323 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001324 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001325 # Uncomment when debugging.
1326 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001327 git_cl.main(['upload'] + upload_args)
1328
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001329 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001330 self._run_gerrit_upload_test(
1331 ['--no-squash'],
1332 'desc\n\nBUG=\n',
1333 [],
1334 squash=False,
1335 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1336
1337 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001338 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001339 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001340 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001341 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001342 [],
tandriia60502f2016-06-20 02:01:53 -07001343 squash=False,
1344 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001345 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001346
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001347 def test_gerrit_no_reviewer(self):
1348 self._run_gerrit_upload_test(
1349 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001350 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001351 [],
1352 squash=False,
1353 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001354
tandriieefe8322016-08-17 10:12:24 -07001355 def test_gerrit_patch_bad_chars(self):
1356 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001357 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001358 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001359 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001360 squash=False,
1361 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001362 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001363 self.assertIn(
1364 'WARNING: Patchset title may only contain alphanumeric chars '
1365 'and spaces. Cleaned up title:\nDont put bad chars\n',
1366 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001367
ukai@chromium.orge8077812012-02-03 03:41:46 +00001368 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001369 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001370 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001371 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001372 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001373 squash=False,
1374 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001375 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001376
1377 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001378 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001379 [],
bradnelsond975b302016-10-23 12:20:23 -07001380 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1381 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001382 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001383 ['reviewer@example.com', 'another@example.com'],
1384 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001385 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001386 ref_suffix='%l=Code-Review+1',
1387 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001388
1389 def test_gerrit_upload_squash_first_is_default(self):
1390 # Mock Gerrit CL description to indicate the first upload.
1391 self.mock(git_cl.Changelist, 'GetDescription',
1392 lambda *_: None)
1393 self._run_gerrit_upload_test(
1394 [],
1395 'desc\nBUG=\n\nChange-Id: 123456789',
1396 [],
1397 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001398
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001399 def test_gerrit_upload_squash_first(self):
1400 # Mock Gerrit CL description to indicate the first upload.
1401 self.mock(git_cl.Changelist, 'GetDescription',
1402 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001403 self._run_gerrit_upload_test(
1404 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001405 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001406 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001407 squash=True,
1408 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001409
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001410 def test_gerrit_upload_squash_reupload(self):
1411 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1412 # Mock Gerrit CL description to indicate re-upload.
1413 self.mock(git_cl.Changelist, 'GetDescription',
1414 lambda *args: description)
1415 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1416 lambda *args: 1)
1417 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1418 lambda *args: {'change_id': '123456789'})
1419 self._run_gerrit_upload_test(
1420 ['--squash'],
1421 description,
1422 [],
1423 squash=True,
1424 expected_upstream_ref='origin/master',
1425 issue=123456)
1426
rmistry@google.com2dd99862015-06-22 12:22:18 +00001427 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001428 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001429 def mock_run_git(*args, **_kwargs):
1430 if args[0] == ['for-each-ref',
1431 '--format=%(refname:short) %(upstream:short)',
1432 'refs/heads']:
1433 # Create a local branch dependency tree that looks like this:
1434 # test1 -> test2 -> test3 -> test4 -> test5
1435 # -> test3.1
1436 # test6 -> test0
1437 branch_deps = [
1438 'test2 test1', # test1 -> test2
1439 'test3 test2', # test2 -> test3
1440 'test3.1 test2', # test2 -> test3.1
1441 'test4 test3', # test3 -> test4
1442 'test5 test4', # test4 -> test5
1443 'test6 test0', # test0 -> test6
1444 'test7', # test7
1445 ]
1446 return '\n'.join(branch_deps)
1447 self.mock(git_cl, 'RunGit', mock_run_git)
1448
1449 class RecordCalls:
1450 times_called = 0
1451 record_calls = RecordCalls()
1452 def mock_CMDupload(*args, **_kwargs):
1453 record_calls.times_called += 1
1454 return 0
1455 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1456
1457 self.calls = [
1458 (('[Press enter to continue or ctrl-C to quit]',), ''),
1459 ]
1460
1461 class MockChangelist():
1462 def __init__(self):
1463 pass
1464 def GetBranch(self):
1465 return 'test1'
1466 def GetIssue(self):
1467 return '123'
1468 def GetPatchset(self):
1469 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001470 def IsGerrit(self):
1471 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001472
1473 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1474 # CMDupload should have been called 5 times because of 5 dependent branches.
1475 self.assertEquals(5, record_calls.times_called)
1476 self.assertEquals(0, ret)
1477
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001478 def test_gerrit_change_id(self):
1479 self.calls = [
1480 ((['git', 'write-tree'], ),
1481 'hashtree'),
1482 ((['git', 'rev-parse', 'HEAD~0'], ),
1483 'branch-parent'),
1484 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1485 'A B <a@b.org> 1456848326 +0100'),
1486 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1487 'C D <c@d.org> 1456858326 +0100'),
1488 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1489 'hashchange'),
1490 ]
1491 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1492 self.assertEqual(change_id, 'Ihashchange')
1493
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001494 def test_desecription_append_footer(self):
1495 for init_desc, footer_line, expected_desc in [
1496 # Use unique desc first lines for easy test failure identification.
1497 ('foo', 'R=one', 'foo\n\nR=one'),
1498 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1499 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1500 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1501 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1502 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1503 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1504 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1505 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1506 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1507 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1508 ]:
1509 desc = git_cl.ChangeDescription(init_desc)
1510 desc.append_footer(footer_line)
1511 self.assertEqual(desc.description, expected_desc)
1512
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001513 def test_update_reviewers(self):
1514 data = [
1515 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001516 ('foo\nR=xx', [], 'foo\nR=xx'),
1517 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001518 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001519 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1520 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1521 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001522 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001523 ('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 +00001524 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001525 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1526 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1527 # Same as the line before, but full of whitespaces.
1528 (
1529 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1530 'foo\nBar\n\nR=c@c\n BUG =',
1531 ),
1532 # Whitespaces aren't interpreted as new lines.
1533 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001534 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001535 expected = [i[2] for i in data]
1536 actual = []
1537 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001538 obj = git_cl.ChangeDescription(orig)
1539 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001540 actual.append(obj.description)
1541 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001542
wittman@chromium.org455dc922015-01-26 20:15:50 +00001543 def test_get_target_ref(self):
1544 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001545 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001546 self.assertEqual(None, git_cl.GetTargetRef(None,
1547 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001548 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001549
wittman@chromium.org455dc922015-01-26 20:15:50 +00001550 # Check default target refs for branches.
1551 self.assertEqual('refs/heads/master',
1552 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001553 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001554 self.assertEqual('refs/heads/master',
1555 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001556 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001557 self.assertEqual('refs/heads/master',
1558 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001559 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001560 self.assertEqual('refs/branch-heads/123',
1561 git_cl.GetTargetRef('origin',
1562 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001563 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001564 self.assertEqual('refs/diff/test',
1565 git_cl.GetTargetRef('origin',
1566 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001567 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001568 self.assertEqual('refs/heads/chrome/m42',
1569 git_cl.GetTargetRef('origin',
1570 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001571 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001572
1573 # Check target refs for user-specified target branch.
1574 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1575 'refs/remotes/branch-heads/123'):
1576 self.assertEqual('refs/branch-heads/123',
1577 git_cl.GetTargetRef('origin',
1578 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001579 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001580 for branch in ('origin/master', 'remotes/origin/master',
1581 'refs/remotes/origin/master'):
1582 self.assertEqual('refs/heads/master',
1583 git_cl.GetTargetRef('origin',
1584 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001585 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001586 for branch in ('master', 'heads/master', 'refs/heads/master'):
1587 self.assertEqual('refs/heads/master',
1588 git_cl.GetTargetRef('origin',
1589 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001590 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001591
wychen@chromium.orga872e752015-04-28 23:42:18 +00001592 def test_patch_when_dirty(self):
1593 # Patch when local tree is dirty
1594 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1595 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1596
1597 def test_diff_when_dirty(self):
1598 # Do 'git cl diff' when local tree is dirty
1599 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1600 self.assertNotEqual(git_cl.main(['diff']), 0)
1601
tandriidf09a462016-08-18 16:23:55 -07001602 def _patch_common(self, is_gerrit=False, force_codereview=False,
1603 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001604 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001605 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1606 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001607 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1608 lambda *args: {
1609 'current_revision': '7777777777',
1610 'revisions': {
1611 '1111111111': {
1612 '_number': 1,
1613 'fetch': {'http': {
1614 'url': 'https://chromium.googlesource.com/my/repo',
1615 'ref': 'refs/changes/56/123456/1',
1616 }},
1617 },
1618 '7777777777': {
1619 '_number': 7,
1620 'fetch': {'http': {
1621 'url': 'https://chromium.googlesource.com/my/repo',
1622 'ref': 'refs/changes/56/123456/7',
1623 }},
1624 },
1625 },
1626 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001627 self.mock(git_cl.Changelist, 'GetDescription',
1628 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001629 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1630
tandriidf09a462016-08-18 16:23:55 -07001631 if new_branch:
1632 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1633 else:
1634 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001635 if not force_codereview:
1636 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001637 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001638 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001639 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1640 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001641 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001642 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001643
1644 if is_gerrit:
1645 if not force_codereview:
1646 self.calls += [
1647 ((['git', 'config', 'gerrit.host'],), 'true'),
1648 ]
1649 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001650 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001651 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001652 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001653 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001654 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001655 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001656
tandriidf09a462016-08-18 16:23:55 -07001657 def _common_patch_successful(self, new_branch=False):
1658 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001659 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001660 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001661 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001662 'patch from issue 123456 at patchset 60001 ' +
1663 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001664 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001665 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001666 ((['git', 'config', 'branch.master.rietveldserver',
1667 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001668 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001669 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001670 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001671
1672 def test_patch_successful(self):
1673 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001674 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1675
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001676 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001677 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001678 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1679
wychen@chromium.orga872e752015-04-28 23:42:18 +00001680 def test_patch_conflict(self):
1681 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001682 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001683 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001684
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001685 def test_gerrit_patch_successful(self):
1686 self._patch_common(is_gerrit=True)
1687 self.calls += [
1688 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1689 'refs/changes/56/123456/7'],), ''),
1690 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001691 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001692 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001693 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1694 ((['git', 'config', 'branch.master.merge'],), 'master'),
1695 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1696 ((['git', 'config', 'remote.origin.url'],),
1697 'https://chromium.googlesource.com/my/repo'),
1698 ((['git', 'config', 'branch.master.gerritserver',
1699 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001700 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001701 ]
1702 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1703
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001704 def test_patch_force_codereview(self):
1705 self._patch_common(is_gerrit=True, force_codereview=True)
1706 self.calls += [
1707 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1708 'refs/changes/56/123456/7'],), ''),
1709 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1710 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001711 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001712 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001713 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1714 ((['git', 'config', 'branch.master.merge'],), 'master'),
1715 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1716 ((['git', 'config', 'remote.origin.url'],),
1717 'https://chromium.googlesource.com/my/repo'),
1718 ((['git', 'config', 'branch.master.gerritserver',
1719 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001720 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001721 ]
1722 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1723
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001724 def test_gerrit_patch_url_successful(self):
1725 self._patch_common(is_gerrit=True)
1726 self.calls += [
1727 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1728 'refs/changes/56/123456/1'],), ''),
1729 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001730 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001731 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001732 ((['git', 'config', 'branch.master.gerritserver',
1733 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001734 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001735 ]
1736 self.assertEqual(git_cl.main(
1737 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1738
1739 def test_gerrit_patch_conflict(self):
1740 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001741 self.calls += [
1742 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1743 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001744 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1745 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1746 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001747 ]
1748 with self.assertRaises(SystemExitMock):
1749 git_cl.main(['patch',
1750 'https://chromium-review.googlesource.com/#/c/123456/1'])
1751
tandriic2405f52016-10-10 08:13:15 -07001752 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001753 def notExists(_issue, *_, **kwargs):
1754 self.assertFalse(kwargs['ignore_404'])
1755 raise git_cl.gerrit_util.GerritError(404, '')
1756 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1757
tandriic2405f52016-10-10 08:13:15 -07001758 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001759 self.calls = [
1760 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1761 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1762 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1763 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1764 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1765 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001766 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001767 'or you have no access to it'],), SystemExitMock()),
1768 ]
1769 with self.assertRaises(SystemExitMock):
1770 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1771
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001772 def _checkout_calls(self):
1773 return [
1774 ((['git', 'config', '--local', '--get-regexp',
1775 'branch\\..*\\.rietveldissue'], ),
1776 ('branch.retrying.rietveldissue 1111111111\n'
1777 'branch.some-fix.rietveldissue 2222222222\n')),
1778 ((['git', 'config', '--local', '--get-regexp',
1779 'branch\\..*\\.gerritissue'], ),
1780 ('branch.ger-branch.gerritissue 123456\n'
1781 'branch.gbranch654.gerritissue 654321\n')),
1782 ]
1783
1784 def test_checkout_gerrit(self):
1785 """Tests git cl checkout <issue>."""
1786 self.calls = self._checkout_calls()
1787 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1788 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1789
1790 def test_checkout_rietveld(self):
1791 """Tests git cl checkout <issue>."""
1792 self.calls = self._checkout_calls()
1793 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1794 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1795
1796 def test_checkout_not_found(self):
1797 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001798 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001799 self.calls = self._checkout_calls()
1800 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1801
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001802 def test_checkout_no_branch_issues(self):
1803 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001804 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001805 self.calls = [
1806 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001807 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001808 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001809 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001810 ]
1811 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1812
tandrii@chromium.org28253532016-04-14 13:46:56 +00001813 def _test_gerrit_ensure_authenticated_common(self, auth,
1814 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001815 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1816 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1817 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001818 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001819 self.mock(git_cl, 'ask_for_data',
1820 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001821 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001822 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001823 cl.branch = 'master'
1824 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001825 cl.lookedup_issue = True
1826 return cl
1827
1828 def test_gerrit_ensure_authenticated_missing(self):
1829 cl = self._test_gerrit_ensure_authenticated_common(auth={
1830 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1831 })
1832 self.calls.append(
1833 ((['DieWithError',
1834 'Credentials for the following hosts are required:\n'
1835 ' chromium-review.googlesource.com\n'
1836 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1837 'You can (re)generate your credentails by visiting '
1838 'https://chromium-review.googlesource.com/new-password'],), ''),)
1839 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1840
1841 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001842 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001843 cl = self._test_gerrit_ensure_authenticated_common(auth={
1844 'chromium.googlesource.com': 'one',
1845 'chromium-review.googlesource.com': 'other',
1846 })
1847 self.calls.append(
1848 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001849 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001850 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1851
1852 def test_gerrit_ensure_authenticated_ok(self):
1853 cl = self._test_gerrit_ensure_authenticated_common(auth={
1854 'chromium.googlesource.com': 'same',
1855 'chromium-review.googlesource.com': 'same',
1856 })
1857 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1858
tandrii@chromium.org28253532016-04-14 13:46:56 +00001859 def test_gerrit_ensure_authenticated_skipped(self):
1860 cl = self._test_gerrit_ensure_authenticated_common(
1861 auth={}, skip_auth_check=True)
1862 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1863
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001864 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001865 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1866 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001867 self.calls = [
1868 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001869 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001870 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1871 ((['git', 'config', 'rietveld.server'],), ''),
1872 ((['git', 'config', 'rietveld.server'],), ''),
1873 ((['git', 'config', 'branch.feature.rietveldserver'],),
1874 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001875 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001876 ]
1877 self.assertEqual(0, git_cl.main(['set-commit']))
1878
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001879 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001880 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001881 lambda h, i, labels, notify=None:
1882 self._mocked_call(['SetReview', h, i, labels, notify]))
1883
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001884 self.calls = [
1885 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001886 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1887 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001888 ((['git', 'config', 'branch.feature.gerritserver'],),
1889 'https://chromium-review.googlesource.com'),
1890 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001891 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001892 ]
tandriid9e5ce52016-07-13 02:32:59 -07001893
1894 def test_cmd_set_commit_gerrit_clear(self):
1895 self._cmd_set_commit_gerrit_common(0)
1896 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1897
1898 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001899 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001900 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1901
tandriid9e5ce52016-07-13 02:32:59 -07001902 def test_cmd_set_commit_gerrit(self):
1903 self._cmd_set_commit_gerrit_common(2)
1904 self.assertEqual(0, git_cl.main(['set-commit']))
1905
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001906 def test_description_display(self):
1907 out = StringIO.StringIO()
1908 self.mock(git_cl.sys, 'stdout', out)
1909
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001910 self.mock(git_cl, 'Changelist', ChangelistMock)
1911 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001912
1913 self.assertEqual(0, git_cl.main(['description', '-d']))
1914 self.assertEqual('foo\n', out.getvalue())
1915
1916 def test_description_rietveld(self):
1917 out = StringIO.StringIO()
1918 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001919 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001920
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001921 self.assertEqual(0, git_cl.main([
1922 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1923 self.assertEqual('foobar\n', out.getvalue())
1924
iannucci3c972b92016-08-17 13:24:10 -07001925 def test_StatusFieldOverrideIssueMissingArgs(self):
1926 out = StringIO.StringIO()
1927 self.mock(git_cl.sys, 'stderr', out)
1928
1929 try:
1930 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1931 except SystemExit as ex:
1932 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001933 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001934
1935 out = StringIO.StringIO()
1936 self.mock(git_cl.sys, 'stderr', out)
1937
1938 try:
1939 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1940 except SystemExit as ex:
1941 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001942 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001943
1944 def test_StatusFieldOverrideIssue(self):
1945 out = StringIO.StringIO()
1946 self.mock(git_cl.sys, 'stdout', out)
1947
1948 def assertIssue(cl_self, *_args):
1949 self.assertEquals(cl_self.issue, 1)
1950 return 'foobar'
1951
1952 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1953 self.calls = [
1954 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1955 ((['git', 'config', 'rietveld.server'],), ''),
1956 ((['git', 'config', 'rietveld.server'],), ''),
1957 ]
iannuccie53c9352016-08-17 14:40:40 -07001958 self.assertEqual(
1959 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1960 0)
iannucci3c972b92016-08-17 13:24:10 -07001961 self.assertEqual(out.getvalue(), 'foobar\n')
1962
iannuccie53c9352016-08-17 14:40:40 -07001963 def test_SetCloseOverrideIssue(self):
1964 def assertIssue(cl_self, *_args):
1965 self.assertEquals(cl_self.issue, 1)
1966 return 'foobar'
1967
1968 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1969 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1970 self.calls = [
1971 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1972 ((['git', 'config', 'rietveld.server'],), ''),
1973 ((['git', 'config', 'rietveld.server'],), ''),
1974 ]
1975 self.assertEqual(
1976 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1977
1978 def test_SetCommitOverrideIssue(self):
1979 def assertIssue(cl_self, *_args):
1980 self.assertEquals(cl_self.issue, 1)
1981 return 'foobar'
1982
1983 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1984 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1985 self.calls = [
1986 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1987 ((['git', 'config', 'rietveld.server'],), ''),
1988 ((['git', 'config', 'rietveld.server'],), ''),
1989 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1990 ((['git', 'config', 'rietveld.server'],), ''),
1991 ((['git', 'config', 'rietveld.server'],), ''),
1992 ]
1993 self.assertEqual(
1994 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1995
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001996 def test_description_gerrit(self):
1997 out = StringIO.StringIO()
1998 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001999 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002000
2001 self.assertEqual(0, git_cl.main([
2002 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2003 self.assertEqual('foobar\n', out.getvalue())
2004
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002005 def test_description_set_raw(self):
2006 out = StringIO.StringIO()
2007 self.mock(git_cl.sys, 'stdout', out)
2008
2009 self.mock(git_cl, 'Changelist', ChangelistMock)
2010 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2011
2012 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2013 self.assertEqual('hihi', ChangelistMock.desc)
2014
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002015 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002016 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002017
2018 def RunEditor(desc, _, **kwargs):
2019 self.assertEquals(
2020 '# Enter a description of the change.\n'
2021 '# This will be displayed on the codereview site.\n'
2022 '# The first line will also be used as the subject of the review.\n'
2023 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002024 '--------------------\n'
2025 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002026 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002027 # Simulate user changing something.
2028 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002029
dsansomee2d6fd92016-09-08 00:10:47 -07002030 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002031 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002032
2033 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2034 self.mock(git_cl.Changelist, 'GetDescription',
2035 lambda *args: current_desc)
2036 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2037 UpdateDescriptionRemote)
2038 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2039
2040 self.calls = [
2041 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002042 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002043 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2044 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002045 ((['git', 'config', 'core.editor'],), 'vi'),
2046 ]
2047 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2048
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002049 def test_description_set_stdin(self):
2050 out = StringIO.StringIO()
2051 self.mock(git_cl.sys, 'stdout', out)
2052
2053 self.mock(git_cl, 'Changelist', ChangelistMock)
2054 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2055
2056 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2057 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2058
kmarshall3bff56b2016-06-06 18:31:47 -07002059 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002060 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2061
kmarshall3bff56b2016-06-06 18:31:47 -07002062 self.calls = \
2063 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2064 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002065 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002066 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2067 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002068 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2069 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2070 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002071 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2072 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2073 ((['git', 'branch', '-D', 'foo'],), '')]
2074
kmarshall3bff56b2016-06-06 18:31:47 -07002075 self.mock(git_cl, 'get_cl_statuses',
2076 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002077 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2078 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2079 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002080
2081 self.assertEqual(0, git_cl.main(['archive', '-f']))
2082
2083 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002084 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002085 self.calls = \
2086 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2087 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002088 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002089 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2090 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002091 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2092
kmarshall9249e012016-08-23 12:02:16 -07002093 self.mock(git_cl, 'get_cl_statuses',
2094 lambda branches, fine_grained, max_processes:
2095 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2096
2097 self.assertEqual(1, git_cl.main(['archive', '-f']))
2098
2099 def test_archive_dry_run(self):
2100 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2101
2102 self.calls = \
2103 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2104 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2105 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2106 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2107 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2108 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2109 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2110 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2111 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002112
2113 self.mock(git_cl, 'get_cl_statuses',
2114 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002115 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2116 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2117 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002118
kmarshall9249e012016-08-23 12:02:16 -07002119 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2120
2121 def test_archive_no_tags(self):
2122 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2123
2124 self.calls = \
2125 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2126 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2127 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2128 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2129 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2130 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2131 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2132 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2133 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2134 ((['git', 'branch', '-D', 'foo'],), '')]
2135
2136 self.mock(git_cl, 'get_cl_statuses',
2137 lambda branches, fine_grained, max_processes:
2138 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2139 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2140 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2141
2142 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002143
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002144 def test_cmd_issue_erase_existing(self):
2145 out = StringIO.StringIO()
2146 self.mock(git_cl.sys, 'stdout', out)
2147 self.calls = [
2148 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002149 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2150 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002151 # Let this command raise exception (retcode=1) - it should be ignored.
2152 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002153 CERR1),
2154 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2155 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002156 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2157 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2158 ''),
2159 ]
2160 self.assertEqual(0, git_cl.main(['issue', '0']))
2161
phajdan.jre328cf92016-08-22 04:12:17 -07002162 def test_cmd_issue_json(self):
2163 out = StringIO.StringIO()
2164 self.mock(git_cl.sys, 'stdout', out)
2165 self.calls = [
2166 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002167 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002168 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2169 ((['git', 'config', 'rietveld.server'],),
2170 'https://codereview.chromium.org'),
2171 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2172 (('write_json', 'output.json',
2173 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2174 ''),
2175 ]
2176 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2177
tandriide281ae2016-10-12 06:02:30 -07002178 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002179 self.mock(git_cl.Changelist, 'GetChange',
2180 lambda _, *a: (
2181 self._mocked_call(['GetChange']+list(a))))
2182 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2183 lambda *_, **__: (
2184 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002185 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2186 lambda _, s: self._mocked_call(['SetCQState', s]))
2187 self.calls = [
2188 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002189 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002190 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2191 ((['git', 'config', 'rietveld.server'],),
2192 'https://codereview.chromium.org'),
2193 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2194 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2195 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2196 ((['get_or_create_merge_base', 'feature', 'feature'],),
2197 'fake_ancestor_sha'),
2198 ((['GetChange', 'fake_ancestor_sha', None], ),
2199 git_cl.presubmit_support.GitChange(
2200 '', '', '', '', '', '', '', '')),
2201 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2202 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002203 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2204 ]
2205 out = StringIO.StringIO()
2206 self.mock(git_cl.sys, 'stdout', out)
2207 self.assertEqual(0, git_cl.main(['try']))
2208 self.assertEqual(
2209 out.getvalue(),
2210 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2211
tandrii8c5a3532016-11-04 07:52:02 -07002212 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2213 self.mock(git_cl.Changelist, 'GetChange',
2214 lambda _, *a: (
2215 self._mocked_call(['GetChange']+list(a))))
2216 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2217 lambda *_, **__: (
2218 self._mocked_call(['DoGetTryMasters'])))
2219 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2220 lambda _, s: self._mocked_call(['SetCQState', s]))
2221
2222 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2223 # Get realistic expectations.
2224 gerrit_change_list_impl._GetGerritHost()
2225 return self._mocked_call(['_GetChangeDetail', opts or []])
2226 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2227 _GetChangeDetail)
2228
2229 self.calls = [
2230 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2231 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2232 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2233 ((['git', 'config', 'branch.feature.gerritserver'],),
2234 'https://chromium-review.googlesource.com'),
2235 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2236 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2237 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2238 ((['get_or_create_merge_base', 'feature', 'feature'],),
2239 'fake_ancestor_sha'),
2240 ((['GetChange', 'fake_ancestor_sha', None], ),
2241 git_cl.presubmit_support.GitChange(
2242 '', '', '', '', '', '', '', '')),
2243 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2244 ((['DoGetTryMasters'], ), None),
2245 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2246 ]
2247 out = StringIO.StringIO()
2248 self.mock(git_cl.sys, 'stdout', out)
2249 self.assertEqual(0, git_cl.main(['try']))
2250 self.assertEqual(
2251 out.getvalue(),
2252 'scheduled CQ Dry Run on '
2253 'https://chromium-review.googlesource.com/123456\n')
2254
2255 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2256 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2257 lambda _: {
2258 'owner_email': 'owner@e.mail',
2259 'private': False,
2260 'closed': False,
2261 'project': 'depot_tools',
2262 'patchsets': [20001],
2263 })
tandriide281ae2016-10-12 06:02:30 -07002264 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2265 self.calls = [
2266 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2267 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2268 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2269 ((['git', 'config', 'rietveld.server'],),
2270 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002271 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002272 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002273 ]
2274
2275 def _buildbucket_retry(*_, **kw):
2276 # self.maxDiff = 10000
2277 body = json.loads(kw['body'])
2278 self.assertEqual(len(body['builds']), 1)
2279 build = body['builds'][0]
2280 params = json.loads(build.pop('parameters_json'))
2281 self.assertEqual(params, {
2282 u'builder_name': u'win',
2283 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2284 u'revision': None}],
2285 u'properties': {
2286 u'category': u'git_cl_try',
2287 u'issue': 123,
2288 u'key': u'val',
2289 u'json': [{u'a': 1}, None],
2290 u'master': u'tryserver.chromium',
2291 u'patch_project': u'depot_tools',
2292 u'patch_storage': u'rietveld',
2293 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002294 u'rietveld': u'https://codereview.chromium.org',
2295 }
2296 })
2297 self.assertEqual(build, {
2298 u'bucket': u'master.tryserver.chromium',
2299 u'client_operation_id': u'uuid4',
2300 u'tags': [u'builder:win',
2301 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002302 u'user_agent:git_cl_try',
2303 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002304 })
2305
2306 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2307
2308 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2309 self.assertEqual(0, git_cl.main([
2310 'try', '-m', 'tryserver.chromium', '-b', 'win',
2311 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2312 self.assertRegexpMatches(
2313 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002314 'Tried jobs on:\nBucket: master.tryserver.chromium')
2315
tandrii8c5a3532016-11-04 07:52:02 -07002316 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2317 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2318 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2319
2320 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2321 # Get realistic expectations.
2322 gerrit_change_list_impl._GetGerritHost()
2323 return self._mocked_call(['_GetChangeDetail', opts or []])
2324 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2325 _GetChangeDetail)
2326
2327 self.calls = [
2328 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2329 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2330 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2331 ((['git', 'config', 'branch.feature.gerritserver'],),
2332 'https://chromium-review.googlesource.com'),
2333 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002334 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2335 {'owner': {'email': 'owner@e.mail'}}),
2336 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2337 'project': 'depot_tools',
2338 'revisions': {
2339 'deadbeaf': {
2340 '_number': 6,
2341 },
2342 'beeeeeef': {
2343 '_number': 7,
2344 'fetch': {'http': {
2345 'url': 'https://chromium.googlesource.com/depot_tools',
2346 'ref': 'refs/changes/56/123456/7'
2347 }},
2348 },
2349 },
2350 }),
2351 ]
2352
2353 def _buildbucket_retry(*_, **kw):
2354 # self.maxDiff = 10000
2355 body = json.loads(kw['body'])
2356 self.assertEqual(len(body['builds']), 1)
2357 build = body['builds'][0]
2358 params = json.loads(build.pop('parameters_json'))
2359 self.assertEqual(params, {
2360 u'builder_name': u'win',
2361 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2362 u'revision': None}],
2363 u'properties': {
2364 u'category': u'git_cl_try',
2365 u'key': u'val',
2366 u'json': [{u'a': 1}, None],
2367 u'master': u'tryserver.chromium',
2368
2369 u'patch_gerrit_url':
2370 u'https://chromium-review.googlesource.com',
2371 u'patch_issue': 123456,
2372 u'patch_project': u'depot_tools',
2373 u'patch_ref': u'refs/changes/56/123456/7',
2374 u'patch_repository_url':
2375 u'https://chromium.googlesource.com/depot_tools',
2376 u'patch_set': 7,
2377 u'patch_storage': u'gerrit',
2378 }
2379 })
2380 self.assertEqual(build, {
2381 u'bucket': u'master.tryserver.chromium',
2382 u'client_operation_id': u'uuid4',
2383 u'tags': [
2384 u'builder:win',
2385 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2386 u'user_agent:git_cl_try',
2387 u'master:tryserver.chromium'],
2388 })
2389
2390 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2391
2392 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2393 self.assertEqual(0, git_cl.main([
2394 'try', '-m', 'tryserver.chromium', '-b', 'win',
2395 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2396 self.assertRegexpMatches(
2397 git_cl.sys.stdout.getvalue(),
2398 'Tried jobs on:\nBucket: master.tryserver.chromium')
2399
borenet6c0efe62016-10-19 08:13:29 -07002400 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002401 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2402 lambda _: {
2403 'owner_email': 'owner@e.mail',
2404 'private': False,
2405 'closed': False,
2406 'project': 'depot_tools',
2407 'patchsets': [20001],
2408 })
borenet6c0efe62016-10-19 08:13:29 -07002409 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2410 self.calls = [
2411 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2412 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2413 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2414 ((['git', 'config', 'rietveld.server'],),
2415 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002416 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002417 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002418 ]
2419
2420 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002421 body = json.loads(kw['body'])
2422 self.assertEqual(len(body['builds']), 1)
2423 build = body['builds'][0]
2424 params = json.loads(build.pop('parameters_json'))
2425 self.assertEqual(params, {
2426 u'builder_name': u'win',
2427 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2428 u'revision': None}],
2429 u'properties': {
2430 u'category': u'git_cl_try',
2431 u'issue': 123,
2432 u'patch_project': u'depot_tools',
2433 u'patch_storage': u'rietveld',
2434 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002435 u'rietveld': u'https://codereview.chromium.org',
2436 }
2437 })
2438 self.assertEqual(build, {
2439 u'bucket': u'test.bucket',
2440 u'client_operation_id': u'uuid4',
2441 u'tags': [u'builder:win',
2442 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2443 u'user_agent:git_cl_try'],
2444 })
2445
2446 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2447
2448 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2449 self.assertEqual(0, git_cl.main([
2450 'try', '-B', 'test.bucket', '-b', 'win']))
2451 self.assertRegexpMatches(
2452 git_cl.sys.stdout.getvalue(),
2453 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002454
qyearsley123a4682016-10-26 09:12:17 -07002455 def test_git_cl_try_bots_on_multiple_masters(self):
2456 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2457 self.calls = [
2458 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2459 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2460 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2461 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002462 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002463 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2464 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2465 ]
2466
2467 def _buildbucket_retry(*_, **kw):
2468 body = json.loads(kw['body'])
2469 self.assertEqual(len(body['builds']), 2)
2470
2471 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2472 self.assertEqual(first_build_params['builder_name'], 'builder1')
2473 self.assertEqual(first_build_params['properties']['master'], 'master1')
2474
2475 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2476 self.assertEqual(first_build_params['builder_name'], 'builder2')
2477 self.assertEqual(first_build_params['properties']['master'], 'master2')
2478
2479 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2480
2481 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2482 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2483
2484 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2485 self.assertEqual(
2486 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2487 self.assertEqual(
2488 git_cl.sys.stdout.getvalue(),
2489 'Tried jobs on:\n'
2490 'Bucket: master.master1\n'
2491 ' builder1: []\n'
2492 'Bucket: master.master2\n'
2493 ' builder2: []\n'
2494 'To see results here, run: git cl try-results\n'
2495 'To see results in browser, run: git cl web\n')
2496
tandrii16e0b4e2016-06-07 10:34:28 -07002497 def _common_GerritCommitMsgHookCheck(self):
2498 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2499 self.mock(git_cl.os.path, 'abspath',
2500 lambda path: self._mocked_call(['abspath', path]))
2501 self.mock(git_cl.os.path, 'exists',
2502 lambda path: self._mocked_call(['exists', path]))
2503 self.mock(git_cl.gclient_utils, 'FileRead',
2504 lambda path: self._mocked_call(['FileRead', path]))
2505 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2506 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2507 self.calls = [
2508 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2509 ((['abspath', '../'],), '/abs/git_repo_root'),
2510 ]
2511 return git_cl.Changelist(codereview='gerrit', issue=123)
2512
2513 def test_GerritCommitMsgHookCheck_custom_hook(self):
2514 cl = self._common_GerritCommitMsgHookCheck()
2515 self.calls += [
2516 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2517 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2518 '#!/bin/sh\necho "custom hook"')
2519 ]
2520 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2521
2522 def test_GerritCommitMsgHookCheck_not_exists(self):
2523 cl = self._common_GerritCommitMsgHookCheck()
2524 self.calls += [
2525 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2526 ]
2527 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2528
2529 def test_GerritCommitMsgHookCheck(self):
2530 cl = self._common_GerritCommitMsgHookCheck()
2531 self.calls += [
2532 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2533 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2534 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2535 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2536 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2537 ''),
2538 ]
2539 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2540
tandriic4344b52016-08-29 06:04:54 -07002541 def test_GerritCmdLand(self):
2542 self.calls += [
2543 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2544 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2545 'deadbeaf'),
2546 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2547 ((['git', 'config', 'branch.feature.gerritserver'],),
2548 'chromium-review.googlesource.com'),
2549 ]
2550 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2551 cl._codereview_impl._GetChangeDetail = lambda _: {
2552 'labels': {},
2553 'current_revision': 'deadbeaf',
2554 }
agable32978d92016-11-01 12:55:02 -07002555 cl._codereview_impl._GetChangeCommit = lambda: {
2556 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002557 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002558 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2559 }
tandriic4344b52016-08-29 06:04:54 -07002560 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002561 out = StringIO.StringIO()
2562 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002563 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002564 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002565 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002566
tandrii221ab252016-10-06 08:12:04 -07002567 BUILDBUCKET_BUILDS_MAP = {
2568 '9000': {
2569 'id': '9000',
2570 'status': 'STARTED',
2571 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2572 'result_details_json': '{"properties": {}}',
2573 'bucket': 'master.x.y',
2574 'created_by': 'user:someone@chromium.org',
2575 'created_ts': '147200002222000',
2576 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2577 },
2578 '8000': {
2579 'id': '8000',
2580 'status': 'COMPLETED',
2581 'result': 'FAILURE',
2582 'failure_reason': 'BUILD_FAILURE',
2583 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2584 'result_details_json': '{"properties": {}}',
2585 'bucket': 'master.x.y',
2586 'created_by': 'user:someone@chromium.org',
2587 'created_ts': '147200001111000',
2588 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2589 },
2590 }
2591
2592 def test_write_try_results_json(self):
2593 expected_output = [
2594 {
2595 'buildbucket_id': '8000',
2596 'bucket': 'master.x.y',
2597 'builder_name': 'my-builder',
2598 'status': 'COMPLETED',
2599 'result': 'FAILURE',
2600 'failure_reason': 'BUILD_FAILURE',
2601 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2602 },
2603 {
2604 'buildbucket_id': '9000',
2605 'bucket': 'master.x.y',
2606 'builder_name': 'my-builder',
2607 'status': 'STARTED',
2608 'result': None,
2609 'failure_reason': None,
2610 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2611 }
2612 ]
2613 self.calls = [(('write_json', 'output.json', expected_output), '')]
2614 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2615
tandrii45b2a582016-10-11 03:14:16 -07002616 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002617 out = StringIO.StringIO()
2618 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002619 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2620 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002621 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2622 self._mocked_call(['get_authenticator_for_host', host]))
2623 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2624 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002625
2626 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2627 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002628 self.calls += [
2629 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2630 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2631 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2632 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2633 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2634 ((['git', 'config', 'branch.feature.rietveldserver'],),
2635 'codereview.example.com'),
2636 ((['get_authenticator_for_host', 'codereview.example.com'],),
2637 AuthenticatorMock()),
2638 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2639
2640 def test_fetch_try_jobs_none_rietveld(self):
2641 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002642 # Simulate that user isn't logged in.
2643 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002644 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002645 self.assertRegexpMatches(sys.stdout.getvalue(),
2646 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002647 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2648
2649 def test_fetch_try_jobs_some_rietveld(self):
2650 self._setup_fetch_try_jobs_rietveld({
2651 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2652 })
2653 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002654 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2655 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2656 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2657
2658 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2659 self._setup_fetch_try_jobs(most_recent_patchset=13)
2660 self.calls += [
2661 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2662 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2663 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002664 # TODO(tandrii): Uncomment the below if we decide to support checking
2665 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002666 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002667 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002668 ((['git', 'config', 'branch.feature.gerritserver'],),
2669 'https://x-review.googlesource.com'),
2670 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2671 AuthenticatorMock()),
2672 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2673
2674 def test_fetch_try_jobs_none_gerrit(self):
2675 self._setup_fetch_try_jobs_gerrit({})
2676 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002677 # TODO(tandrii): Uncomment the below if we decide to support checking
2678 # patchsets for Gerrit.
2679 # self.assertRegexpMatches(
2680 # sys.stdout.getvalue(),
2681 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002682 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2683
2684 def test_fetch_try_jobs_some_gerrit(self):
2685 self._setup_fetch_try_jobs_gerrit({
2686 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2687 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002688 # TODO(tandrii): Uncomment the below if we decide to support checking
2689 # patchsets for Gerrit.
2690 # self.calls.remove(
2691 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002692 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2693
2694 # ... and doesn't result in warning.
2695 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2696 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002697 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2698 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2699
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002700 def _mock_gerrit_changes_for_detail_cache(self):
2701 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
2702 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
2703 lambda _, issue, options, **__:
2704 self._mocked_call('RPC', issue, options))
2705
2706 def test_gerrit_change_detail_cache_normalize(self):
2707 self._mock_gerrit_changes_for_detail_cache()
2708 self.calls = [
2709 (('RPC', '2', ['CASE']), 'b'),
2710 ]
2711 cl = git_cl.Changelist(codereview='gerrit')
2712 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2713 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2714 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2715 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2716
2717 def test_gerrit_change_detail_cache_simple(self):
2718 self._mock_gerrit_changes_for_detail_cache()
2719 self.calls = [
2720 (('RPC', '1', []), 'a'),
2721 (('RPC', '2', []), 'b'),
2722 (('RPC', '2', []), 'b2'),
2723 ]
2724 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2725 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2726 self.assertEqual(cl._GetChangeDetail(), 'a')
2727 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
2728 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
2729 self.assertEqual(cl._GetChangeDetail(), 'a')
2730 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2731
2732 def test_gerrit_change_detail_cache_options(self):
2733 self._mock_gerrit_changes_for_detail_cache()
2734 self.calls = [
2735 (('RPC', '1', ['C', 'A', 'B']), 'cab'),
2736 (('RPC', '1', ['A', 'D']), 'ad'),
2737 (('RPC', '1', ['A']), 'a'), # no_cache=True
2738 (('RPC', '1', ['B']), 'b'), # no longer in cache.
2739 ]
2740 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2741 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2742 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2743 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2744 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2745 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2746 self.assertEqual(cl._GetChangeDetail(), 'cab')
2747
2748 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2749 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2750 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2751 self.assertEqual(cl._GetChangeDetail(), 'cab')
2752
2753 # Finally, no_cache should invalidate all caches for given change.
2754 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2755 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2756
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002757
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002758if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002759 git_cl.logging.basicConfig(
2760 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002761 unittest.main()