blob: c4d75176365d7b6491a2f0f867424d8fefd9c907 [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',
470 lambda msg: 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),
530 ((['git', 'config', '--unset-all', 'rietveld.force-https-commit-url'],),
531 CERR1),
532 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
533 CERR1),
534 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
535 ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],),
536 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700537 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
538 CERR1),
539 ((['git', 'config', 'gerrit.host', 'true'],), ''),
540 ]
541 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
542
maruel@chromium.orga3353652011-11-30 14:26:57 +0000543 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000544 def _is_gerrit_calls(cls, gerrit=False):
545 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
546 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
547
548 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000549 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000550 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000551 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000552
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000553 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000554 def _upload_no_rev_calls(cls, similarity, find_copies):
555 return (cls._git_base_calls(similarity, find_copies) +
556 cls._git_upload_no_rev_calls())
557
558 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000559 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000560 if similarity is None:
561 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700562 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700563 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000564 else:
tandrii33a46ff2016-08-23 05:53:40 -0700565 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700566 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000567
568 if find_copies is None:
569 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700570 find_copies_call = ((['git', 'config', '--bool',
571 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000572 else:
tandrii5d48c322016-08-18 16:19:37 -0700573 val = str(find_copies).lower()
574 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000575 'branch.master.git-find-copies', val],), '')
576
577 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000578 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800579 '-l100000', '-C'+similarity,
580 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000581 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000582 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000583 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000584
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000585 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000586 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000587 similarity_call,
588 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
589 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000590 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000591 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700592 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
593 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000594 ((['git', 'config', 'rietveld.server'],),
595 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000596 ((['git', 'config', 'branch.master.merge'],), 'master'),
597 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000598 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000599 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000600 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000601 ((['git', 'rev-parse', '--show-cdup'],), ''),
602 ((['git', 'rev-parse', 'HEAD'],), '12345'),
603 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000604 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000605 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700606 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000607 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000608 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000609 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000610 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000611 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000612 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000613 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000614 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000615 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000616 ]
617
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000618 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000619 def _git_upload_no_rev_calls(cls):
620 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000621 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000622 ]
623
624 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000625 def _git_upload_calls(cls, private):
626 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000627 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000628 private_call = []
629 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000630 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000631 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000632 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000633
maruel@chromium.orga3353652011-11-30 14:26:57 +0000634 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000635 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000636 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000637 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800638 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000639 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700640 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000641 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000642 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000643 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700644 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000645 ] + cls._git_post_upload_calls()
646
647 @classmethod
648 def _git_post_upload_calls(cls):
649 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000650 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
651 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
652 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000653 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000654 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000655 ]
656
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000657 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000658 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000659 fake_ancestor = 'fake_ancestor'
660 fake_cl = 'fake_cl_for_patch'
661 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000662 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000663 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000664 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000665 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000666 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000667 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000668 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000669 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700670 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000671 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000672 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000673 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000674 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000675 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000676 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000677 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000678 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000679 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000680 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000681 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000682
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000683 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700684 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000685 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000686 return [
687 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000688 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000689 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000690 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700691 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000692 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000693 '--git_similarity', similarity or '50'
694 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000695 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000696 ]
697
698 def _run_reviewer_test(
699 self,
700 upload_args,
701 expected_description,
702 returned_description,
703 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000704 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700705 private=False,
706 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000707 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000708 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000709 try:
710 similarity = upload_args[upload_args.index('--similarity')+1]
711 except ValueError:
712 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000713
714 if '--find-copies' in upload_args:
715 find_copies = True
716 elif '--no-find-copies' in upload_args:
717 find_copies = False
718 else:
719 find_copies = None
720
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000721 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700722 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000723
724 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000725
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000726 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000727 self.assertEquals(
728 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000729 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000730 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000731 '#--------------------This line is 72 characters long'
732 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000733 expected_description,
734 desc)
735 return returned_description
736 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000737
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000738 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000739 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700740 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000741 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000742 return 1, 2
743 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000744
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000745 git_cl.main(['upload'] + upload_args)
746
747 def test_no_reviewer(self):
748 self._run_reviewer_test(
749 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000750 'desc\n\nBUG=',
751 '# Blah blah comment.\ndesc\n\nBUG=',
752 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000753 [])
754
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000755 def test_keep_similarity(self):
756 self._run_reviewer_test(
757 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000758 'desc\n\nBUG=',
759 '# Blah blah comment.\ndesc\n\nBUG=',
760 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000761 [])
762
iannucci@chromium.org79540052012-10-19 23:15:26 +0000763 def test_keep_find_copies(self):
764 self._run_reviewer_test(
765 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000766 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000767 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000768 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000769 [])
770
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000771 def test_private(self):
772 self._run_reviewer_test(
773 ['--private'],
774 'desc\n\nBUG=',
775 '# Blah blah comment.\ndesc\n\nBUG=\n',
776 'desc\n\nBUG=',
777 [])
778
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000779 def test_reviewers_cmd_line(self):
780 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000781 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000782 self._run_reviewer_test(
783 ['-r' 'foo@example.com'],
784 description,
785 '\n%s\n' % description,
786 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000787 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000788
789 def test_reviewer_tbr_overriden(self):
790 # Reviewer is overriden with TBR
791 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000792 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000793 self._run_reviewer_test(
794 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000795 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000796 description.strip('\n'),
797 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000798 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000799
800 def test_reviewer_multiple(self):
801 # Handles multiple R= or TBR= lines.
802 description = (
bradnelsond975b302016-10-23 12:20:23 -0700803 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
804 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000805 self._run_reviewer_test(
806 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000807 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000808 description,
809 description,
bradnelsond975b302016-10-23 12:20:23 -0700810 ['--reviewers=another@example.com,reviewer@example.com'],
811 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000812
maruel@chromium.orga3353652011-11-30 14:26:57 +0000813 def test_reviewer_send_mail(self):
814 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000815 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000816 self._run_reviewer_test(
817 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000818 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000819 description.strip('\n'),
820 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000821 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000822
823 def test_reviewer_send_mail_no_rev(self):
824 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000825 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700826 self.calls = self._upload_no_rev_calls(None, None) + [
827 ((['DieWithError', 'Must specify reviewers to send email.'],),
828 SystemExitMock())
829 ]
830
831 def RunEditor(desc, _, **kwargs):
832 return desc
833 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
834 self.mock(sys, 'stdout', stdout)
835 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000836 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700837 self.assertEqual(
838 'Using 50% similarity for rename/copy detection. Override with '
839 '--similarity.\n',
840 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000841
tandriif9aefb72016-07-01 09:06:51 -0700842 def test_bug_on_cmd(self):
843 self._run_reviewer_test(
844 ['--bug=500658,proj:123'],
845 'desc\n\nBUG=500658\nBUG=proj:123',
846 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
847 'desc\n\nBUG=500658\nBUG=proj:1234',
848 [])
849
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100850 def _land_rietveld_common(self, debug=False):
851 if debug:
852 # Very useful due to finally clause in git cl land raising exceptions and
853 # shadowing real cause of failure.
854 self.mock(git_cl, '_IS_BEING_TESTED', True)
855 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100856 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100857
858 self.mock(git_cl._GitNumbererState, 'load', classmethod(lambda _, url, ref:
859 self._mocked_call(['_GitNumbererState', url, ref])))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100860 self.mock(RietveldMock, 'update_description', staticmethod(
861 lambda i, d: self._mocked_call(['update_description', i, d])))
862 self.mock(RietveldMock, 'add_comment', staticmethod(
863 lambda i, c: self._mocked_call(['add_comment', i, c])))
864 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100865 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
866 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
867 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
868 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
869 CERR1),
870 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
871 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800872 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100873 ((['git', 'config', 'rietveld.server'],),
874 'https://codereview.chromium.org'),
875 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
876 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
877 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
878 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100879 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
880 ''), # No commits to rebase, according to local view of origin.
881 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
882 'fake_ancestor_sha'),
883 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
884 ((['git', 'rev-parse', '--show-cdup'],), ''),
885 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
886 ((['git', 'diff', '--name-status', '--no-renames', '-r',
887 'fake_ancestor_sha...', '.'],),
888 'M\tfile1.cpp'),
889 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
890 ((['git', 'config', 'branch.feature.rietveldserver'],),
891 'https://codereview.chromium.org'),
892 ((['git', 'config', 'user.email'],), 'user@e.mail'),
893 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
894 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
895 'fake_ancestor_sha', 'feature'],),
896 # This command just prints smth like this:
897 # file1.cpp | 53 ++++++--
898 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
899 ''),
900 ((['git', 'show-ref', '--quiet', '--verify',
901 'refs/heads/git-cl-commit'],),
902 ''), # 0 return code means branch exists.
903 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
904 ((['git', 'show-ref', '--quiet', '--verify',
905 'refs/heads/git-cl-cherry-pick'],),
906 CERR1), # This means git-cl-cherry-pick branch does not exist.
907 ((['git', 'rev-parse', '--show-cdup'],), ''),
908 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
909 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
910 ((['git', 'commit', '-m',
911 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100912 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100913 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
914 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
915 ((['git', 'config', '--get', 'remote.origin.url'],),
916 'https://chromium.googlesource.com/infra/infra'),
917 ]
918
919 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100920 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100921 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100922 ((['git', 'config', 'remote.origin.url'],),
923 'https://chromium.googlesource.com/infra/infra'),
924 ((['_GitNumbererState',
925 'https://chromium.googlesource.com/infra/infra',
926 'refs/heads/master'],),
927 git_cl._GitNumbererState(None, False)),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100928 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
929 ''),
930 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
931 ((['git', 'checkout', '-q', 'feature'],), ''),
932 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
933 ((['git', 'config', 'rietveld.viewvc-url'],),
934 'https://chromium.googlesource.com/infra/infra/+/'),
935 ((['update_description', 123,
936 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
937 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
938 ''),
939 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
940 'fake_sha_rebased (presubmit successful).'],), ''),
941 ]
942 git_cl.main(['land'])
943
944 def test_land_rietveld_gnumbd(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100945 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100946 self.mock(git_cl, 'WaitForRealCommit',
947 lambda *a: self._mocked_call(['WaitForRealCommit'] + list(a)))
948 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100949 ((['git', 'config', 'remote.origin.url'],),
950 'https://chromium.googlesource.com/chromium/src'),
951 ((['_GitNumbererState',
952 'https://chromium.googlesource.com/chromium/src',
953 'refs/heads/master'],),
954 git_cl._GitNumbererState('refs/pending', True)),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100955 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
956 ((['git', 'retry', 'fetch', 'origin',
957 '+refs/pending/heads/master:refs/git-cl/pending/heads/master'],), ''),
958 ((['git', 'checkout', 'refs/git-cl/pending/heads/master'],), ''),
959 ((['git', 'cherry-pick', 'fake_sha_rebased'],), ''),
960
961 ((['git', 'retry', 'push', '--porcelain', 'origin',
962 'HEAD:refs/pending/heads/master'],),''),
963 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased_on_pending'),
964
965 ((['git', 'checkout', '-q', 'feature'],), ''),
966 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
967
968 ((['WaitForRealCommit', 'origin', 'fake_sha_rebased_on_pending',
969 'refs/remotes/origin/master', 'refs/heads/master'],),
970 'fake_sha_gnumbded'),
971
972 ((['git', 'config', 'rietveld.viewvc-url'],),
973 'https://chromium.googlesource.com/infra/infra/+/'),
974 ((['update_description', 123,
975 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
976 'https://chromium.googlesource.com/infra/infra/+/fake_sha_gnumbded'],),
977 ''),
978 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
979 'fake_sha_gnumbded (presubmit successful).'],),
980 ''),
981 ]
982 git_cl.main(['land'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000983
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100984 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100985 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100986
987 # Special mocks to check validity of timestamp.
988 original_git_amend_head = git_cl._git_amend_head
989 def _git_amend_head_mock(msg, tstamp):
990 self._mocked_call(['git_amend_head committer timestamp', tstamp])
991 return original_git_amend_head(msg, tstamp)
992 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
993
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100994 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100995 ((['git', 'config', 'remote.origin.url'],),
996 'https://chromium.googlesource.com/chromium/src'),
997 ((['_GitNumbererState',
998 'https://chromium.googlesource.com/chromium/src',
999 'refs/heads/master'],),
1000 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001001
1002 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1003 'This is parent commit.\n'
1004 '\n'
1005 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1006 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001007 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1008 '1480022355'), # Committer's unix timestamp.
1009 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1010 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001011
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001012 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001013 ((['git', 'commit', '--amend', '-m',
1014 'Issue: 123\n\nR=john@chromium.org\n'
1015 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001016 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001017 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1018 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1019
1020 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1021 ''),
1022 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1023 ((['git', 'checkout', '-q', 'feature'],), ''),
1024 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1025 ((['git', 'config', 'rietveld.viewvc-url'],),
1026 'https://chromium.googlesource.com/infra/infra/+/'),
1027 ((['update_description', 123,
1028 'Issue: 123\n\nR=john@chromium.org\n'
1029 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001030 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001031 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1032 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1033 'Committed: '
1034 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1035 ''),
1036 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1037 'fake_sha_rebased (presubmit successful).'],), ''),
1038 ]
1039 git_cl.main(['land'])
1040
1041 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001042 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001043 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001044 ((['git', 'config', 'remote.origin.url'],),
1045 'https://chromium.googlesource.com/v8/v8'),
1046 ((['_GitNumbererState',
1047 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'],),
1048 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001049
1050 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1051 'This is parent commit with no footer.'),
1052
1053 ((['git', 'checkout', '-q', 'feature'],), ''),
1054 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1055 ]
1056 with self.assertRaises(ValueError) as cm:
1057 git_cl.main(['land'])
1058 self.assertEqual(cm.exception.message,
1059 'Unable to infer commit position from footers')
1060
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001061 def test_GitNumbererState_not_whitelisted_repo(self):
1062 self.calls = [
1063 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1064 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1065 ]
1066 res = git_cl._GitNumbererState.load(
1067 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1068 remote_ref='refs/whatever')
1069 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001070 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001071
1072 def test_GitNumbererState_fail_fetch(self):
1073 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1074 self.calls = [
1075 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1076 '+refs/meta/config:refs/git_cl/meta/config',
1077 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), CERR1),
1078 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1079 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
1080 'refs/pending-prefix'),
1081 ]
1082 res = git_cl._GitNumbererState.load(
1083 remote_url='https://chromium.googlesource.com/chromium/src',
1084 remote_ref='refs/whatever')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001085 self.assertEqual(res.pending_prefix, 'refs/pending-prefix/')
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001086 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001087
1088 def test_GitNumbererState_fail_gnumbd_and_validator(self):
1089 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1090 self.calls = [
1091 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1092 '+refs/meta/config:refs/git_cl/meta/config',
1093 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1094 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1095 'ba d conig'),
1096 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1097 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1098 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],), CERR1),
1099 ]
1100 res = git_cl._GitNumbererState.load(
1101 remote_url='https://chromium.googlesource.com/chromium/src',
1102 remote_ref='refs/whatever')
1103 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001104 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001105
1106 def test_GitNumbererState_valid_configs(self):
1107 class NamedTempFileStab(StringIO.StringIO):
1108 @classmethod
1109 @contextlib.contextmanager
1110 def create(cls, *_, **__):
1111 yield cls()
1112 name = 'tempfile'
1113 self.mock(git_cl.tempfile, 'NamedTemporaryFile', NamedTempFileStab.create)
1114 self.calls = [
1115 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1116 '+refs/meta/config:refs/git_cl/meta/config',
1117 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1118 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1119 '''{
1120 "pending_tag_prefix": "refs/pending-tags",
1121 "pending_ref_prefix": "refs/pending",
1122 "enabled_refglobs": [
1123 "refs/heads/m*"
1124 ]
1125 }
1126 '''),
1127 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1128 '''
1129 [plugin "git-numberer"]
1130 validate-enabled-refglob = refs/else/*
1131 validate-enabled-refglob = refs/heads/*
1132 validate-disabled-refglob = refs/heads/disabled
1133 validate-disabled-refglob = refs/branch-heads/*
1134 '''),
1135 ((['git', 'config', '-f', 'tempfile', '--get-all',
1136 'plugin.git-numberer.validate-enabled-refglob'],),
1137 'refs/else/*\n'
1138 'refs/heads/*\n'),
1139 ((['git', 'config', '-f', 'tempfile', '--get-all',
1140 'plugin.git-numberer.validate-disabled-refglob'],),
1141 'refs/heads/disabled\n'
1142 'refs/branch-heads/*\n'),
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001143 ] * 4 # 4 tests below have exactly same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001144
1145 res = git_cl._GitNumbererState.load(
1146 remote_url='https://chromium.googlesource.com/chromium/src',
1147 remote_ref='refs/heads/master')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001148 self.assertEqual(res.pending_prefix, 'refs/pending/')
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001149 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001150
1151 res = git_cl._GitNumbererState.load(
1152 remote_url='https://chromium.googlesource.com/chromium/src',
1153 remote_ref='refs/heads/test')
1154 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001155 self.assertEqual(res.should_add_git_number, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001156
1157 res = git_cl._GitNumbererState.load(
1158 remote_url='https://chromium.googlesource.com/chromium/src',
1159 remote_ref='refs/heads/disabled')
1160 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001161 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001162
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001163 # Validator is disabled by default, even if it's not explicitely in disabled
1164 # refglobs.
1165 res = git_cl._GitNumbererState.load(
1166 remote_url='https://chromium.googlesource.com/chromium/src',
1167 remote_ref='refs/arbitrary/ref')
1168 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001169 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001170
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001171 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001172 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001173 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001174 if skip_auth_check:
1175 return [((cmd, ), 'true')]
1176
tandrii5d48c322016-08-18 16:19:37 -07001177 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001178 if issue:
1179 calls.extend([
1180 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1181 ])
1182 calls.extend([
1183 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1184 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1185 ((['git', 'config', 'remote.origin.url'],),
1186 'https://chromium.googlesource.com/my/repo'),
1187 ((['git', 'config', 'remote.origin.url'],),
1188 'https://chromium.googlesource.com/my/repo'),
1189 ])
1190 return calls
1191
1192 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001193 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001194 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001195 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001196 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001197 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001198 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001199 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1200 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001201 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001202 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001203 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1204 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001205 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001206 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001207 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001208 ((['get_or_create_merge_base', 'master',
1209 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001210 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001211 # Calls to verify branch point is ancestor
1212 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1213 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1214 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001215 ((['git', 'rev-parse', '--show-cdup'],), ''),
1216 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001217
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001218 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001219 'diff', '--name-status', '--no-renames', '-r',
1220 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001221 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001222 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001223 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001224 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001225 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001226 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001227 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001228 ((['git', 'config', 'user.email'],), 'me@example.com'),
1229 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001230 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1231 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001232 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001233 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001234
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001235 @classmethod
1236 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001237 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001238 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001239 ref_suffix='', title=None, notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001240 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001241 if post_amend_description is None:
1242 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001243 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001244 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001245
tandriia60502f2016-06-20 02:01:53 -07001246 if squash_mode == 'default':
1247 calls.extend([
1248 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1249 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1250 ])
1251 elif squash_mode in ('override_squash', 'override_nosquash'):
1252 calls.extend([
1253 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1254 'true' if squash_mode == 'override_squash' else 'false'),
1255 ])
1256 else:
1257 assert squash_mode in ('squash', 'nosquash')
1258
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001259 # If issue is given, then description is fetched from Gerrit instead.
1260 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001261 calls += [
1262 ((['git', 'log', '--pretty=format:%s\n\n%b',
1263 'fake_ancestor_sha..HEAD'],),
1264 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001265 if squash:
1266 title = 'Initial_upload'
1267 else:
1268 if not title:
1269 calls += [
1270 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1271 (('Title for patchset []: ',), 'User input'),
1272 ]
1273 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001274 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001275 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001276 # DownloadGerritHook(False)
1277 ((False, ),
1278 ''),
1279 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001280 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001281 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001282 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001283 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001284 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001285 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001286 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001287 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001288 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001289 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001290 if not issue:
1291 # Prompting to edit description on first upload.
1292 calls += [
1293 ((['git', 'config', 'core.editor'],), ''),
1294 ((['RunEditor'],), description),
1295 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001296 ref_to_push = 'abcdef0123456789'
1297 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001298 ((['git', 'config', 'branch.master.merge'],),
1299 'refs/heads/master'),
1300 ((['git', 'config', 'branch.master.remote'],),
1301 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001302 ((['get_or_create_merge_base', 'master',
1303 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001304 'origin/master'),
1305 ((['git', 'rev-parse', 'HEAD:'],),
1306 '0123456789abcdef'),
1307 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001308 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001309 ref_to_push),
1310 ]
1311 else:
1312 ref_to_push = 'HEAD'
1313
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001314 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001315 ((['git', 'rev-list',
1316 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001317 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001318
Aaron Gable9b713dd2016-12-14 16:04:21 -08001319 if title:
1320 if ref_suffix:
1321 ref_suffix += ',m=' + title
1322 else:
1323 ref_suffix = '%m=' + title
1324
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001325 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1326 if ref_suffix:
1327 ref_suffix += ',' + notify_suffix
1328 else:
1329 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001330
ukai@chromium.orge8077812012-02-03 03:41:46 +00001331 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001332 ref_suffix += ',' + ','.join('r=%s' % email
1333 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001334 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001335 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001336 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001337 ('remote:\n'
1338 'remote: Processing changes: (\)\n'
1339 'remote: Processing changes: (|)\n'
1340 'remote: Processing changes: (/)\n'
1341 'remote: Processing changes: (-)\n'
1342 'remote: Processing changes: new: 1 (/)\n'
1343 'remote: Processing changes: new: 1, done\n'
1344 'remote:\n'
1345 'remote: New Changes:\n'
1346 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1347 'remote:\n'
1348 'To https://chromium.googlesource.com/yyy/zzz\n'
1349 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001350 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001351 if squash:
1352 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001353 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001354 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001355 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001356 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001357 ((['git', 'config', 'branch.master.gerritsquashhash',
1358 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001359 ]
tandrii88189772016-09-29 04:29:57 -07001360 calls += [
1361 ((['git', 'config', 'rietveld.cc'],), ''),
1362 ((['AddReviewers', 'chromium-review.googlesource.com',
1363 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -07001364 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -07001365 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001366 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001367 return calls
1368
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001369 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001370 self,
1371 upload_args,
1372 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001373 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001374 squash=True,
1375 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001376 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001377 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001378 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001379 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001380 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001381 issue=None,
1382 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001383 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001384 if squash_mode is None:
1385 if '--no-squash' in upload_args:
1386 squash_mode = 'nosquash'
1387 elif '--squash' in upload_args:
1388 squash_mode = 'squash'
1389 else:
1390 squash_mode = 'default'
1391
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001392 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001393 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001394 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001395 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001396 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001397 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1398 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001399 self.mock(git_cl.gclient_utils, 'RunEditor',
1400 lambda *_, **__: self._mocked_call(['RunEditor']))
1401 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001402 self.mock(git_cl.gerrit_util, 'AddReviewers',
1403 lambda h, i, add, is_reviewer: self._mocked_call(
1404 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001405
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001406 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001407 self.calls += self._gerrit_upload_calls(
1408 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001409 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001410 expected_upstream_ref=expected_upstream_ref,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001411 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001412 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001413 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001414 # Uncomment when debugging.
1415 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001416 git_cl.main(['upload'] + upload_args)
1417
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001418 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001419 self._run_gerrit_upload_test(
1420 ['--no-squash'],
1421 'desc\n\nBUG=\n',
1422 [],
1423 squash=False,
1424 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1425
1426 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001427 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001428 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001429 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001430 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001431 [],
tandriia60502f2016-06-20 02:01:53 -07001432 squash=False,
1433 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001434 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001435
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001436 def test_gerrit_no_reviewer(self):
1437 self._run_gerrit_upload_test(
1438 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001439 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001440 [],
1441 squash=False,
1442 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001443
tandriieefe8322016-08-17 10:12:24 -07001444 def test_gerrit_patch_bad_chars(self):
1445 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001446 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001447 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001448 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001449 squash=False,
1450 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001451 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001452 self.assertIn(
1453 'WARNING: Patchset title may only contain alphanumeric chars '
1454 'and spaces. Cleaned up title:\nDont put bad chars\n',
1455 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001456
ukai@chromium.orge8077812012-02-03 03:41:46 +00001457 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001458 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001459 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001460 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001461 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001462 squash=False,
1463 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001464 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001465
1466 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001467 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001468 [],
bradnelsond975b302016-10-23 12:20:23 -07001469 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1470 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001471 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001472 ['reviewer@example.com', 'another@example.com'],
1473 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001474 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001475 ref_suffix='%l=Code-Review+1',
1476 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001477
1478 def test_gerrit_upload_squash_first_is_default(self):
1479 # Mock Gerrit CL description to indicate the first upload.
1480 self.mock(git_cl.Changelist, 'GetDescription',
1481 lambda *_: None)
1482 self._run_gerrit_upload_test(
1483 [],
1484 'desc\nBUG=\n\nChange-Id: 123456789',
1485 [],
1486 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001487
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001488 def test_gerrit_upload_squash_first(self):
1489 # Mock Gerrit CL description to indicate the first upload.
1490 self.mock(git_cl.Changelist, 'GetDescription',
1491 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001492 self._run_gerrit_upload_test(
1493 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001494 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001495 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001496 squash=True,
1497 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001498
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001499 def test_gerrit_upload_squash_reupload(self):
1500 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1501 # Mock Gerrit CL description to indicate re-upload.
1502 self.mock(git_cl.Changelist, 'GetDescription',
1503 lambda *args: description)
1504 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1505 lambda *args: 1)
1506 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1507 lambda *args: {'change_id': '123456789'})
1508 self._run_gerrit_upload_test(
1509 ['--squash'],
1510 description,
1511 [],
1512 squash=True,
1513 expected_upstream_ref='origin/master',
1514 issue=123456)
1515
rmistry@google.com2dd99862015-06-22 12:22:18 +00001516 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001517 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001518 def mock_run_git(*args, **_kwargs):
1519 if args[0] == ['for-each-ref',
1520 '--format=%(refname:short) %(upstream:short)',
1521 'refs/heads']:
1522 # Create a local branch dependency tree that looks like this:
1523 # test1 -> test2 -> test3 -> test4 -> test5
1524 # -> test3.1
1525 # test6 -> test0
1526 branch_deps = [
1527 'test2 test1', # test1 -> test2
1528 'test3 test2', # test2 -> test3
1529 'test3.1 test2', # test2 -> test3.1
1530 'test4 test3', # test3 -> test4
1531 'test5 test4', # test4 -> test5
1532 'test6 test0', # test0 -> test6
1533 'test7', # test7
1534 ]
1535 return '\n'.join(branch_deps)
1536 self.mock(git_cl, 'RunGit', mock_run_git)
1537
1538 class RecordCalls:
1539 times_called = 0
1540 record_calls = RecordCalls()
1541 def mock_CMDupload(*args, **_kwargs):
1542 record_calls.times_called += 1
1543 return 0
1544 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1545
1546 self.calls = [
1547 (('[Press enter to continue or ctrl-C to quit]',), ''),
1548 ]
1549
1550 class MockChangelist():
1551 def __init__(self):
1552 pass
1553 def GetBranch(self):
1554 return 'test1'
1555 def GetIssue(self):
1556 return '123'
1557 def GetPatchset(self):
1558 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001559 def IsGerrit(self):
1560 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001561
1562 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1563 # CMDupload should have been called 5 times because of 5 dependent branches.
1564 self.assertEquals(5, record_calls.times_called)
1565 self.assertEquals(0, ret)
1566
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001567 def test_gerrit_change_id(self):
1568 self.calls = [
1569 ((['git', 'write-tree'], ),
1570 'hashtree'),
1571 ((['git', 'rev-parse', 'HEAD~0'], ),
1572 'branch-parent'),
1573 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1574 'A B <a@b.org> 1456848326 +0100'),
1575 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1576 'C D <c@d.org> 1456858326 +0100'),
1577 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1578 'hashchange'),
1579 ]
1580 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1581 self.assertEqual(change_id, 'Ihashchange')
1582
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001583 def test_desecription_append_footer(self):
1584 for init_desc, footer_line, expected_desc in [
1585 # Use unique desc first lines for easy test failure identification.
1586 ('foo', 'R=one', 'foo\n\nR=one'),
1587 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1588 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1589 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1590 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1591 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1592 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1593 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1594 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1595 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1596 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1597 ]:
1598 desc = git_cl.ChangeDescription(init_desc)
1599 desc.append_footer(footer_line)
1600 self.assertEqual(desc.description, expected_desc)
1601
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001602 def test_update_reviewers(self):
1603 data = [
1604 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001605 ('foo\nR=xx', [], 'foo\nR=xx'),
1606 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001607 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001608 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1609 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1610 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001611 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001612 ('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 +00001613 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001614 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1615 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1616 # Same as the line before, but full of whitespaces.
1617 (
1618 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1619 'foo\nBar\n\nR=c@c\n BUG =',
1620 ),
1621 # Whitespaces aren't interpreted as new lines.
1622 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001623 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001624 expected = [i[2] for i in data]
1625 actual = []
1626 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001627 obj = git_cl.ChangeDescription(orig)
1628 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001629 actual.append(obj.description)
1630 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001631
wittman@chromium.org455dc922015-01-26 20:15:50 +00001632 def test_get_target_ref(self):
1633 # Check remote or remote branch not present.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001634 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001635 self.assertEqual(None, git_cl.GetTargetRef(None,
1636 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001637 'master', False))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001638
wittman@chromium.org455dc922015-01-26 20:15:50 +00001639 # Check default target refs for branches.
1640 self.assertEqual('refs/heads/master',
1641 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001642 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001643 self.assertEqual('refs/heads/master',
1644 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001645 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001646 self.assertEqual('refs/heads/master',
1647 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001648 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001649 self.assertEqual('refs/branch-heads/123',
1650 git_cl.GetTargetRef('origin',
1651 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001652 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001653 self.assertEqual('refs/diff/test',
1654 git_cl.GetTargetRef('origin',
1655 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001656 None, False))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001657 self.assertEqual('refs/heads/chrome/m42',
1658 git_cl.GetTargetRef('origin',
1659 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001660 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001661
1662 # Check target refs for user-specified target branch.
1663 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1664 'refs/remotes/branch-heads/123'):
1665 self.assertEqual('refs/branch-heads/123',
1666 git_cl.GetTargetRef('origin',
1667 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001668 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001669 for branch in ('origin/master', 'remotes/origin/master',
1670 'refs/remotes/origin/master'):
1671 self.assertEqual('refs/heads/master',
1672 git_cl.GetTargetRef('origin',
1673 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001674 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001675 for branch in ('master', 'heads/master', 'refs/heads/master'):
1676 self.assertEqual('refs/heads/master',
1677 git_cl.GetTargetRef('origin',
1678 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001679 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001680
1681 # Check target refs for pending prefix.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001682 self.mock(git_cl._GitNumbererState, 'load',
1683 classmethod(lambda *_: git_cl._GitNumbererState('prefix', False)))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001684 self.assertEqual('prefix/heads/master',
1685 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001686 None, True,
1687 'https://remote.url/some.git'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001688
wychen@chromium.orga872e752015-04-28 23:42:18 +00001689 def test_patch_when_dirty(self):
1690 # Patch when local tree is dirty
1691 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1692 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1693
1694 def test_diff_when_dirty(self):
1695 # Do 'git cl diff' when local tree is dirty
1696 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1697 self.assertNotEqual(git_cl.main(['diff']), 0)
1698
tandriidf09a462016-08-18 16:23:55 -07001699 def _patch_common(self, is_gerrit=False, force_codereview=False,
1700 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001701 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001702 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1703 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001704 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1705 lambda *args: {
1706 'current_revision': '7777777777',
1707 'revisions': {
1708 '1111111111': {
1709 '_number': 1,
1710 'fetch': {'http': {
1711 'url': 'https://chromium.googlesource.com/my/repo',
1712 'ref': 'refs/changes/56/123456/1',
1713 }},
1714 },
1715 '7777777777': {
1716 '_number': 7,
1717 'fetch': {'http': {
1718 'url': 'https://chromium.googlesource.com/my/repo',
1719 'ref': 'refs/changes/56/123456/7',
1720 }},
1721 },
1722 },
1723 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001724 self.mock(git_cl.Changelist, 'GetDescription',
1725 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001726 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1727
tandriidf09a462016-08-18 16:23:55 -07001728 if new_branch:
1729 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1730 else:
1731 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001732 if not force_codereview:
1733 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001734 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001735 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001736 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1737 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001738 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001739 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001740
1741 if is_gerrit:
1742 if not force_codereview:
1743 self.calls += [
1744 ((['git', 'config', 'gerrit.host'],), 'true'),
1745 ]
1746 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001747 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001748 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001749 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001750 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001751 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001752 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001753
tandriidf09a462016-08-18 16:23:55 -07001754 def _common_patch_successful(self, new_branch=False):
1755 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001756 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001757 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001758 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001759 'patch from issue 123456 at patchset 60001 ' +
1760 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001761 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001762 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001763 ((['git', 'config', 'branch.master.rietveldserver',
1764 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001765 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001766 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001767 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001768
1769 def test_patch_successful(self):
1770 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001771 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1772
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001773 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001774 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001775 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1776
wychen@chromium.orga872e752015-04-28 23:42:18 +00001777 def test_patch_conflict(self):
1778 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001779 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001780 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001781
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001782 def test_gerrit_patch_successful(self):
1783 self._patch_common(is_gerrit=True)
1784 self.calls += [
1785 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1786 'refs/changes/56/123456/7'],), ''),
1787 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001788 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001789 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001790 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1791 ((['git', 'config', 'branch.master.merge'],), 'master'),
1792 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1793 ((['git', 'config', 'remote.origin.url'],),
1794 'https://chromium.googlesource.com/my/repo'),
1795 ((['git', 'config', 'branch.master.gerritserver',
1796 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001797 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001798 ]
1799 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1800
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001801 def test_patch_force_codereview(self):
1802 self._patch_common(is_gerrit=True, force_codereview=True)
1803 self.calls += [
1804 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1805 'refs/changes/56/123456/7'],), ''),
1806 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1807 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001808 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001809 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001810 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1811 ((['git', 'config', 'branch.master.merge'],), 'master'),
1812 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1813 ((['git', 'config', 'remote.origin.url'],),
1814 'https://chromium.googlesource.com/my/repo'),
1815 ((['git', 'config', 'branch.master.gerritserver',
1816 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001817 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001818 ]
1819 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1820
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001821 def test_gerrit_patch_url_successful(self):
1822 self._patch_common(is_gerrit=True)
1823 self.calls += [
1824 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1825 'refs/changes/56/123456/1'],), ''),
1826 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001827 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001828 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001829 ((['git', 'config', 'branch.master.gerritserver',
1830 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001831 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001832 ]
1833 self.assertEqual(git_cl.main(
1834 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1835
1836 def test_gerrit_patch_conflict(self):
1837 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001838 self.calls += [
1839 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1840 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001841 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1842 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1843 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001844 ]
1845 with self.assertRaises(SystemExitMock):
1846 git_cl.main(['patch',
1847 'https://chromium-review.googlesource.com/#/c/123456/1'])
1848
tandriic2405f52016-10-10 08:13:15 -07001849 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001850 def notExists(_issue, *_, **kwargs):
1851 self.assertFalse(kwargs['ignore_404'])
1852 raise git_cl.gerrit_util.GerritError(404, '')
1853 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1854
tandriic2405f52016-10-10 08:13:15 -07001855 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001856 self.calls = [
1857 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1858 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1859 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1860 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1861 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1862 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001863 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001864 'or you have no access to it'],), SystemExitMock()),
1865 ]
1866 with self.assertRaises(SystemExitMock):
1867 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1868
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001869 def _checkout_calls(self):
1870 return [
1871 ((['git', 'config', '--local', '--get-regexp',
1872 'branch\\..*\\.rietveldissue'], ),
1873 ('branch.retrying.rietveldissue 1111111111\n'
1874 'branch.some-fix.rietveldissue 2222222222\n')),
1875 ((['git', 'config', '--local', '--get-regexp',
1876 'branch\\..*\\.gerritissue'], ),
1877 ('branch.ger-branch.gerritissue 123456\n'
1878 'branch.gbranch654.gerritissue 654321\n')),
1879 ]
1880
1881 def test_checkout_gerrit(self):
1882 """Tests git cl checkout <issue>."""
1883 self.calls = self._checkout_calls()
1884 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1885 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1886
1887 def test_checkout_rietveld(self):
1888 """Tests git cl checkout <issue>."""
1889 self.calls = self._checkout_calls()
1890 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1891 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1892
1893 def test_checkout_not_found(self):
1894 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001895 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001896 self.calls = self._checkout_calls()
1897 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1898
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001899 def test_checkout_no_branch_issues(self):
1900 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001901 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001902 self.calls = [
1903 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001904 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001905 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001906 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001907 ]
1908 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1909
tandrii@chromium.org28253532016-04-14 13:46:56 +00001910 def _test_gerrit_ensure_authenticated_common(self, auth,
1911 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001912 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1913 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1914 self.mock(git_cl, 'DieWithError',
1915 lambda msg: self._mocked_call(['DieWithError', msg]))
1916 self.mock(git_cl, 'ask_for_data',
1917 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001918 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001919 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001920 cl.branch = 'master'
1921 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001922 cl.lookedup_issue = True
1923 return cl
1924
1925 def test_gerrit_ensure_authenticated_missing(self):
1926 cl = self._test_gerrit_ensure_authenticated_common(auth={
1927 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1928 })
1929 self.calls.append(
1930 ((['DieWithError',
1931 'Credentials for the following hosts are required:\n'
1932 ' chromium-review.googlesource.com\n'
1933 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1934 'You can (re)generate your credentails by visiting '
1935 'https://chromium-review.googlesource.com/new-password'],), ''),)
1936 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1937
1938 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001939 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001940 cl = self._test_gerrit_ensure_authenticated_common(auth={
1941 'chromium.googlesource.com': 'one',
1942 'chromium-review.googlesource.com': 'other',
1943 })
1944 self.calls.append(
1945 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001946 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001947 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1948
1949 def test_gerrit_ensure_authenticated_ok(self):
1950 cl = self._test_gerrit_ensure_authenticated_common(auth={
1951 'chromium.googlesource.com': 'same',
1952 'chromium-review.googlesource.com': 'same',
1953 })
1954 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1955
tandrii@chromium.org28253532016-04-14 13:46:56 +00001956 def test_gerrit_ensure_authenticated_skipped(self):
1957 cl = self._test_gerrit_ensure_authenticated_common(
1958 auth={}, skip_auth_check=True)
1959 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1960
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001961 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001962 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1963 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001964 self.calls = [
1965 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001966 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001967 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1968 ((['git', 'config', 'rietveld.server'],), ''),
1969 ((['git', 'config', 'rietveld.server'],), ''),
1970 ((['git', 'config', 'branch.feature.rietveldserver'],),
1971 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001972 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001973 ]
1974 self.assertEqual(0, git_cl.main(['set-commit']))
1975
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001976 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001977 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001978 lambda h, i, labels, notify=None:
1979 self._mocked_call(['SetReview', h, i, labels, notify]))
1980
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001981 self.calls = [
1982 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001983 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1984 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001985 ((['git', 'config', 'branch.feature.gerritserver'],),
1986 'https://chromium-review.googlesource.com'),
1987 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001988 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001989 ]
tandriid9e5ce52016-07-13 02:32:59 -07001990
1991 def test_cmd_set_commit_gerrit_clear(self):
1992 self._cmd_set_commit_gerrit_common(0)
1993 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1994
1995 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001996 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001997 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1998
tandriid9e5ce52016-07-13 02:32:59 -07001999 def test_cmd_set_commit_gerrit(self):
2000 self._cmd_set_commit_gerrit_common(2)
2001 self.assertEqual(0, git_cl.main(['set-commit']))
2002
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002003 def test_description_display(self):
2004 out = StringIO.StringIO()
2005 self.mock(git_cl.sys, 'stdout', out)
2006
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002007 self.mock(git_cl, 'Changelist', ChangelistMock)
2008 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002009
2010 self.assertEqual(0, git_cl.main(['description', '-d']))
2011 self.assertEqual('foo\n', out.getvalue())
2012
2013 def test_description_rietveld(self):
2014 out = StringIO.StringIO()
2015 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002016 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002017
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002018 self.assertEqual(0, git_cl.main([
2019 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2020 self.assertEqual('foobar\n', out.getvalue())
2021
iannucci3c972b92016-08-17 13:24:10 -07002022 def test_StatusFieldOverrideIssueMissingArgs(self):
2023 out = StringIO.StringIO()
2024 self.mock(git_cl.sys, 'stderr', out)
2025
2026 try:
2027 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2028 except SystemExit as ex:
2029 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002030 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002031
2032 out = StringIO.StringIO()
2033 self.mock(git_cl.sys, 'stderr', out)
2034
2035 try:
2036 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2037 except SystemExit as ex:
2038 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002039 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002040
2041 def test_StatusFieldOverrideIssue(self):
2042 out = StringIO.StringIO()
2043 self.mock(git_cl.sys, 'stdout', out)
2044
2045 def assertIssue(cl_self, *_args):
2046 self.assertEquals(cl_self.issue, 1)
2047 return 'foobar'
2048
2049 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2050 self.calls = [
2051 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2052 ((['git', 'config', 'rietveld.server'],), ''),
2053 ((['git', 'config', 'rietveld.server'],), ''),
2054 ]
iannuccie53c9352016-08-17 14:40:40 -07002055 self.assertEqual(
2056 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2057 0)
iannucci3c972b92016-08-17 13:24:10 -07002058 self.assertEqual(out.getvalue(), 'foobar\n')
2059
iannuccie53c9352016-08-17 14:40:40 -07002060 def test_SetCloseOverrideIssue(self):
2061 def assertIssue(cl_self, *_args):
2062 self.assertEquals(cl_self.issue, 1)
2063 return 'foobar'
2064
2065 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2066 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2067 self.calls = [
2068 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2069 ((['git', 'config', 'rietveld.server'],), ''),
2070 ((['git', 'config', 'rietveld.server'],), ''),
2071 ]
2072 self.assertEqual(
2073 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2074
2075 def test_SetCommitOverrideIssue(self):
2076 def assertIssue(cl_self, *_args):
2077 self.assertEquals(cl_self.issue, 1)
2078 return 'foobar'
2079
2080 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2081 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2082 self.calls = [
2083 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2084 ((['git', 'config', 'rietveld.server'],), ''),
2085 ((['git', 'config', 'rietveld.server'],), ''),
2086 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2087 ((['git', 'config', 'rietveld.server'],), ''),
2088 ((['git', 'config', 'rietveld.server'],), ''),
2089 ]
2090 self.assertEqual(
2091 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2092
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002093 def test_description_gerrit(self):
2094 out = StringIO.StringIO()
2095 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002096 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002097
2098 self.assertEqual(0, git_cl.main([
2099 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2100 self.assertEqual('foobar\n', out.getvalue())
2101
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002102 def test_description_set_raw(self):
2103 out = StringIO.StringIO()
2104 self.mock(git_cl.sys, 'stdout', out)
2105
2106 self.mock(git_cl, 'Changelist', ChangelistMock)
2107 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2108
2109 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2110 self.assertEqual('hihi', ChangelistMock.desc)
2111
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002112 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002113 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002114
2115 def RunEditor(desc, _, **kwargs):
2116 self.assertEquals(
2117 '# Enter a description of the change.\n'
2118 '# This will be displayed on the codereview site.\n'
2119 '# The first line will also be used as the subject of the review.\n'
2120 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002121 '--------------------\n'
2122 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002123 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002124 # Simulate user changing something.
2125 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002126
dsansomee2d6fd92016-09-08 00:10:47 -07002127 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002128 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002129
2130 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2131 self.mock(git_cl.Changelist, 'GetDescription',
2132 lambda *args: current_desc)
2133 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2134 UpdateDescriptionRemote)
2135 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2136
2137 self.calls = [
2138 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002139 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002140 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2141 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002142 ((['git', 'config', 'core.editor'],), 'vi'),
2143 ]
2144 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2145
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002146 def test_description_set_stdin(self):
2147 out = StringIO.StringIO()
2148 self.mock(git_cl.sys, 'stdout', out)
2149
2150 self.mock(git_cl, 'Changelist', ChangelistMock)
2151 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2152
2153 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2154 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2155
kmarshall3bff56b2016-06-06 18:31:47 -07002156 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002157 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2158
kmarshall3bff56b2016-06-06 18:31:47 -07002159 self.calls = \
2160 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2161 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002162 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002163 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2164 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002165 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2166 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2167 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002168 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2169 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2170 ((['git', 'branch', '-D', 'foo'],), '')]
2171
kmarshall3bff56b2016-06-06 18:31:47 -07002172 self.mock(git_cl, 'get_cl_statuses',
2173 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002174 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2175 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2176 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002177
2178 self.assertEqual(0, git_cl.main(['archive', '-f']))
2179
2180 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002181 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002182 self.calls = \
2183 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2184 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002185 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002186 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2187 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002188 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2189
kmarshall9249e012016-08-23 12:02:16 -07002190 self.mock(git_cl, 'get_cl_statuses',
2191 lambda branches, fine_grained, max_processes:
2192 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2193
2194 self.assertEqual(1, git_cl.main(['archive', '-f']))
2195
2196 def test_archive_dry_run(self):
2197 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2198
2199 self.calls = \
2200 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2201 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2202 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2203 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2204 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2205 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2206 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2207 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2208 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002209
2210 self.mock(git_cl, 'get_cl_statuses',
2211 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002212 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2213 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2214 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002215
kmarshall9249e012016-08-23 12:02:16 -07002216 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2217
2218 def test_archive_no_tags(self):
2219 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2220
2221 self.calls = \
2222 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2223 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2224 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2225 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2226 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2227 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2228 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2229 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2230 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2231 ((['git', 'branch', '-D', 'foo'],), '')]
2232
2233 self.mock(git_cl, 'get_cl_statuses',
2234 lambda branches, fine_grained, max_processes:
2235 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2236 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2237 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2238
2239 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002240
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002241 def test_cmd_issue_erase_existing(self):
2242 out = StringIO.StringIO()
2243 self.mock(git_cl.sys, 'stdout', out)
2244 self.calls = [
2245 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002246 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2247 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002248 # Let this command raise exception (retcode=1) - it should be ignored.
2249 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002250 CERR1),
2251 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2252 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002253 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2254 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2255 ''),
2256 ]
2257 self.assertEqual(0, git_cl.main(['issue', '0']))
2258
phajdan.jre328cf92016-08-22 04:12:17 -07002259 def test_cmd_issue_json(self):
2260 out = StringIO.StringIO()
2261 self.mock(git_cl.sys, 'stdout', out)
2262 self.calls = [
2263 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002264 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002265 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2266 ((['git', 'config', 'rietveld.server'],),
2267 'https://codereview.chromium.org'),
2268 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2269 (('write_json', 'output.json',
2270 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2271 ''),
2272 ]
2273 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2274
tandriide281ae2016-10-12 06:02:30 -07002275 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002276 self.mock(git_cl.Changelist, 'GetChange',
2277 lambda _, *a: (
2278 self._mocked_call(['GetChange']+list(a))))
2279 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2280 lambda *_, **__: (
2281 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002282 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2283 lambda _, s: self._mocked_call(['SetCQState', s]))
2284 self.calls = [
2285 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002286 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002287 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2288 ((['git', 'config', 'rietveld.server'],),
2289 'https://codereview.chromium.org'),
2290 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2291 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2292 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2293 ((['get_or_create_merge_base', 'feature', 'feature'],),
2294 'fake_ancestor_sha'),
2295 ((['GetChange', 'fake_ancestor_sha', None], ),
2296 git_cl.presubmit_support.GitChange(
2297 '', '', '', '', '', '', '', '')),
2298 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2299 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002300 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2301 ]
2302 out = StringIO.StringIO()
2303 self.mock(git_cl.sys, 'stdout', out)
2304 self.assertEqual(0, git_cl.main(['try']))
2305 self.assertEqual(
2306 out.getvalue(),
2307 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2308
tandrii8c5a3532016-11-04 07:52:02 -07002309 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2310 self.mock(git_cl.Changelist, 'GetChange',
2311 lambda _, *a: (
2312 self._mocked_call(['GetChange']+list(a))))
2313 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2314 lambda *_, **__: (
2315 self._mocked_call(['DoGetTryMasters'])))
2316 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2317 lambda _, s: self._mocked_call(['SetCQState', s]))
2318
2319 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2320 # Get realistic expectations.
2321 gerrit_change_list_impl._GetGerritHost()
2322 return self._mocked_call(['_GetChangeDetail', opts or []])
2323 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2324 _GetChangeDetail)
2325
2326 self.calls = [
2327 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2328 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2329 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2330 ((['git', 'config', 'branch.feature.gerritserver'],),
2331 'https://chromium-review.googlesource.com'),
2332 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2333 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2334 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2335 ((['get_or_create_merge_base', 'feature', 'feature'],),
2336 'fake_ancestor_sha'),
2337 ((['GetChange', 'fake_ancestor_sha', None], ),
2338 git_cl.presubmit_support.GitChange(
2339 '', '', '', '', '', '', '', '')),
2340 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2341 ((['DoGetTryMasters'], ), None),
2342 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2343 ]
2344 out = StringIO.StringIO()
2345 self.mock(git_cl.sys, 'stdout', out)
2346 self.assertEqual(0, git_cl.main(['try']))
2347 self.assertEqual(
2348 out.getvalue(),
2349 'scheduled CQ Dry Run on '
2350 'https://chromium-review.googlesource.com/123456\n')
2351
2352 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2353 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2354 lambda _: {
2355 'owner_email': 'owner@e.mail',
2356 'private': False,
2357 'closed': False,
2358 'project': 'depot_tools',
2359 'patchsets': [20001],
2360 })
tandriide281ae2016-10-12 06:02:30 -07002361 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2362 self.calls = [
2363 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2364 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2365 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2366 ((['git', 'config', 'rietveld.server'],),
2367 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002368 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002369 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002370 ]
2371
2372 def _buildbucket_retry(*_, **kw):
2373 # self.maxDiff = 10000
2374 body = json.loads(kw['body'])
2375 self.assertEqual(len(body['builds']), 1)
2376 build = body['builds'][0]
2377 params = json.loads(build.pop('parameters_json'))
2378 self.assertEqual(params, {
2379 u'builder_name': u'win',
2380 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2381 u'revision': None}],
2382 u'properties': {
2383 u'category': u'git_cl_try',
2384 u'issue': 123,
2385 u'key': u'val',
2386 u'json': [{u'a': 1}, None],
2387 u'master': u'tryserver.chromium',
2388 u'patch_project': u'depot_tools',
2389 u'patch_storage': u'rietveld',
2390 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002391 u'rietveld': u'https://codereview.chromium.org',
2392 }
2393 })
2394 self.assertEqual(build, {
2395 u'bucket': u'master.tryserver.chromium',
2396 u'client_operation_id': u'uuid4',
2397 u'tags': [u'builder:win',
2398 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002399 u'user_agent:git_cl_try',
2400 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002401 })
2402
2403 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2404
2405 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2406 self.assertEqual(0, git_cl.main([
2407 'try', '-m', 'tryserver.chromium', '-b', 'win',
2408 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2409 self.assertRegexpMatches(
2410 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002411 'Tried jobs on:\nBucket: master.tryserver.chromium')
2412
tandrii8c5a3532016-11-04 07:52:02 -07002413 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2414 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2415 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2416
2417 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2418 # Get realistic expectations.
2419 gerrit_change_list_impl._GetGerritHost()
2420 return self._mocked_call(['_GetChangeDetail', opts or []])
2421 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2422 _GetChangeDetail)
2423
2424 self.calls = [
2425 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2426 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2427 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2428 ((['git', 'config', 'branch.feature.gerritserver'],),
2429 'https://chromium-review.googlesource.com'),
2430 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002431 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2432 {'owner': {'email': 'owner@e.mail'}}),
2433 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2434 'project': 'depot_tools',
2435 'revisions': {
2436 'deadbeaf': {
2437 '_number': 6,
2438 },
2439 'beeeeeef': {
2440 '_number': 7,
2441 'fetch': {'http': {
2442 'url': 'https://chromium.googlesource.com/depot_tools',
2443 'ref': 'refs/changes/56/123456/7'
2444 }},
2445 },
2446 },
2447 }),
2448 ]
2449
2450 def _buildbucket_retry(*_, **kw):
2451 # self.maxDiff = 10000
2452 body = json.loads(kw['body'])
2453 self.assertEqual(len(body['builds']), 1)
2454 build = body['builds'][0]
2455 params = json.loads(build.pop('parameters_json'))
2456 self.assertEqual(params, {
2457 u'builder_name': u'win',
2458 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2459 u'revision': None}],
2460 u'properties': {
2461 u'category': u'git_cl_try',
2462 u'key': u'val',
2463 u'json': [{u'a': 1}, None],
2464 u'master': u'tryserver.chromium',
2465
2466 u'patch_gerrit_url':
2467 u'https://chromium-review.googlesource.com',
2468 u'patch_issue': 123456,
2469 u'patch_project': u'depot_tools',
2470 u'patch_ref': u'refs/changes/56/123456/7',
2471 u'patch_repository_url':
2472 u'https://chromium.googlesource.com/depot_tools',
2473 u'patch_set': 7,
2474 u'patch_storage': u'gerrit',
2475 }
2476 })
2477 self.assertEqual(build, {
2478 u'bucket': u'master.tryserver.chromium',
2479 u'client_operation_id': u'uuid4',
2480 u'tags': [
2481 u'builder:win',
2482 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2483 u'user_agent:git_cl_try',
2484 u'master:tryserver.chromium'],
2485 })
2486
2487 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2488
2489 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2490 self.assertEqual(0, git_cl.main([
2491 'try', '-m', 'tryserver.chromium', '-b', 'win',
2492 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2493 self.assertRegexpMatches(
2494 git_cl.sys.stdout.getvalue(),
2495 'Tried jobs on:\nBucket: master.tryserver.chromium')
2496
borenet6c0efe62016-10-19 08:13:29 -07002497 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002498 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2499 lambda _: {
2500 'owner_email': 'owner@e.mail',
2501 'private': False,
2502 'closed': False,
2503 'project': 'depot_tools',
2504 'patchsets': [20001],
2505 })
borenet6c0efe62016-10-19 08:13:29 -07002506 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2507 self.calls = [
2508 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2509 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2510 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2511 ((['git', 'config', 'rietveld.server'],),
2512 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002513 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002514 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002515 ]
2516
2517 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002518 body = json.loads(kw['body'])
2519 self.assertEqual(len(body['builds']), 1)
2520 build = body['builds'][0]
2521 params = json.loads(build.pop('parameters_json'))
2522 self.assertEqual(params, {
2523 u'builder_name': u'win',
2524 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2525 u'revision': None}],
2526 u'properties': {
2527 u'category': u'git_cl_try',
2528 u'issue': 123,
2529 u'patch_project': u'depot_tools',
2530 u'patch_storage': u'rietveld',
2531 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002532 u'rietveld': u'https://codereview.chromium.org',
2533 }
2534 })
2535 self.assertEqual(build, {
2536 u'bucket': u'test.bucket',
2537 u'client_operation_id': u'uuid4',
2538 u'tags': [u'builder:win',
2539 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2540 u'user_agent:git_cl_try'],
2541 })
2542
2543 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2544
2545 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2546 self.assertEqual(0, git_cl.main([
2547 'try', '-B', 'test.bucket', '-b', 'win']))
2548 self.assertRegexpMatches(
2549 git_cl.sys.stdout.getvalue(),
2550 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002551
qyearsley123a4682016-10-26 09:12:17 -07002552 def test_git_cl_try_bots_on_multiple_masters(self):
2553 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2554 self.calls = [
2555 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2556 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2557 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2558 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002559 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002560 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2561 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2562 ]
2563
2564 def _buildbucket_retry(*_, **kw):
2565 body = json.loads(kw['body'])
2566 self.assertEqual(len(body['builds']), 2)
2567
2568 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2569 self.assertEqual(first_build_params['builder_name'], 'builder1')
2570 self.assertEqual(first_build_params['properties']['master'], 'master1')
2571
2572 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2573 self.assertEqual(first_build_params['builder_name'], 'builder2')
2574 self.assertEqual(first_build_params['properties']['master'], 'master2')
2575
2576 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2577
2578 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2579 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2580
2581 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2582 self.assertEqual(
2583 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2584 self.assertEqual(
2585 git_cl.sys.stdout.getvalue(),
2586 'Tried jobs on:\n'
2587 'Bucket: master.master1\n'
2588 ' builder1: []\n'
2589 'Bucket: master.master2\n'
2590 ' builder2: []\n'
2591 'To see results here, run: git cl try-results\n'
2592 'To see results in browser, run: git cl web\n')
2593
tandrii16e0b4e2016-06-07 10:34:28 -07002594 def _common_GerritCommitMsgHookCheck(self):
2595 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2596 self.mock(git_cl.os.path, 'abspath',
2597 lambda path: self._mocked_call(['abspath', path]))
2598 self.mock(git_cl.os.path, 'exists',
2599 lambda path: self._mocked_call(['exists', path]))
2600 self.mock(git_cl.gclient_utils, 'FileRead',
2601 lambda path: self._mocked_call(['FileRead', path]))
2602 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2603 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2604 self.calls = [
2605 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2606 ((['abspath', '../'],), '/abs/git_repo_root'),
2607 ]
2608 return git_cl.Changelist(codereview='gerrit', issue=123)
2609
2610 def test_GerritCommitMsgHookCheck_custom_hook(self):
2611 cl = self._common_GerritCommitMsgHookCheck()
2612 self.calls += [
2613 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2614 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2615 '#!/bin/sh\necho "custom hook"')
2616 ]
2617 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2618
2619 def test_GerritCommitMsgHookCheck_not_exists(self):
2620 cl = self._common_GerritCommitMsgHookCheck()
2621 self.calls += [
2622 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2623 ]
2624 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2625
2626 def test_GerritCommitMsgHookCheck(self):
2627 cl = self._common_GerritCommitMsgHookCheck()
2628 self.calls += [
2629 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2630 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2631 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2632 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2633 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2634 ''),
2635 ]
2636 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2637
tandriic4344b52016-08-29 06:04:54 -07002638 def test_GerritCmdLand(self):
2639 self.calls += [
2640 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2641 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2642 'deadbeaf'),
2643 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2644 ((['git', 'config', 'branch.feature.gerritserver'],),
2645 'chromium-review.googlesource.com'),
2646 ]
2647 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2648 cl._codereview_impl._GetChangeDetail = lambda _: {
2649 'labels': {},
2650 'current_revision': 'deadbeaf',
2651 }
agable32978d92016-11-01 12:55:02 -07002652 cl._codereview_impl._GetChangeCommit = lambda: {
2653 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002654 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002655 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2656 }
tandriic4344b52016-08-29 06:04:54 -07002657 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002658 out = StringIO.StringIO()
2659 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002660 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002661 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002662 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002663
tandrii221ab252016-10-06 08:12:04 -07002664 BUILDBUCKET_BUILDS_MAP = {
2665 '9000': {
2666 'id': '9000',
2667 'status': 'STARTED',
2668 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2669 'result_details_json': '{"properties": {}}',
2670 'bucket': 'master.x.y',
2671 'created_by': 'user:someone@chromium.org',
2672 'created_ts': '147200002222000',
2673 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2674 },
2675 '8000': {
2676 'id': '8000',
2677 'status': 'COMPLETED',
2678 'result': 'FAILURE',
2679 'failure_reason': 'BUILD_FAILURE',
2680 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2681 'result_details_json': '{"properties": {}}',
2682 'bucket': 'master.x.y',
2683 'created_by': 'user:someone@chromium.org',
2684 'created_ts': '147200001111000',
2685 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2686 },
2687 }
2688
2689 def test_write_try_results_json(self):
2690 expected_output = [
2691 {
2692 'buildbucket_id': '8000',
2693 'bucket': 'master.x.y',
2694 'builder_name': 'my-builder',
2695 'status': 'COMPLETED',
2696 'result': 'FAILURE',
2697 'failure_reason': 'BUILD_FAILURE',
2698 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2699 },
2700 {
2701 'buildbucket_id': '9000',
2702 'bucket': 'master.x.y',
2703 'builder_name': 'my-builder',
2704 'status': 'STARTED',
2705 'result': None,
2706 'failure_reason': None,
2707 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2708 }
2709 ]
2710 self.calls = [(('write_json', 'output.json', expected_output), '')]
2711 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2712
tandrii45b2a582016-10-11 03:14:16 -07002713 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002714 out = StringIO.StringIO()
2715 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002716 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2717 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002718 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2719 self._mocked_call(['get_authenticator_for_host', host]))
2720 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2721 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002722
2723 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2724 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002725 self.calls += [
2726 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2727 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2728 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2729 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2730 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2731 ((['git', 'config', 'branch.feature.rietveldserver'],),
2732 'codereview.example.com'),
2733 ((['get_authenticator_for_host', 'codereview.example.com'],),
2734 AuthenticatorMock()),
2735 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2736
2737 def test_fetch_try_jobs_none_rietveld(self):
2738 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002739 # Simulate that user isn't logged in.
2740 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002741 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002742 self.assertRegexpMatches(sys.stdout.getvalue(),
2743 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002744 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2745
2746 def test_fetch_try_jobs_some_rietveld(self):
2747 self._setup_fetch_try_jobs_rietveld({
2748 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2749 })
2750 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002751 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2752 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2753 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2754
2755 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2756 self._setup_fetch_try_jobs(most_recent_patchset=13)
2757 self.calls += [
2758 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2759 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2760 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002761 # TODO(tandrii): Uncomment the below if we decide to support checking
2762 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002763 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002764 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002765 ((['git', 'config', 'branch.feature.gerritserver'],),
2766 'https://x-review.googlesource.com'),
2767 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2768 AuthenticatorMock()),
2769 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2770
2771 def test_fetch_try_jobs_none_gerrit(self):
2772 self._setup_fetch_try_jobs_gerrit({})
2773 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002774 # TODO(tandrii): Uncomment the below if we decide to support checking
2775 # patchsets for Gerrit.
2776 # self.assertRegexpMatches(
2777 # sys.stdout.getvalue(),
2778 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002779 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2780
2781 def test_fetch_try_jobs_some_gerrit(self):
2782 self._setup_fetch_try_jobs_gerrit({
2783 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2784 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002785 # TODO(tandrii): Uncomment the below if we decide to support checking
2786 # patchsets for Gerrit.
2787 # self.calls.remove(
2788 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002789 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2790
2791 # ... and doesn't result in warning.
2792 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2793 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002794 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2795 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2796
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002797
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002798if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002799 git_cl.logging.basicConfig(
2800 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002801 unittest.main()