blob: 8e43e363cb5aebd0954eecea03ff86fa283e58f8 [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'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000638 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000639 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000640 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
641 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000642 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000643 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000644 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700645 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000646 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000647 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000648 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700649 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000650 ] + cls._git_post_upload_calls()
651
652 @classmethod
653 def _git_post_upload_calls(cls):
654 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000655 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
656 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
657 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000658 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000659 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000660 ]
661
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000662 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000663 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000664 fake_ancestor = 'fake_ancestor'
665 fake_cl = 'fake_cl_for_patch'
666 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000667 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000668 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000669 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000670 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000671 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000672 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000673 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000674 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700675 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000676 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000677 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000678 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000679 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000680 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000681 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000682 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000683 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000684 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000685 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000686 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000687
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000688 @classmethod
689 def _dcommit_calls_1(cls):
690 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000691 ((['git', 'config', 'rietveld.autoupdate'],),
692 ''),
693 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
694 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000695 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000696 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000697 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
698 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
699 None),
700 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000701 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700702 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700703 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000704 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700705 ((['git', 'config', '--bool',
706 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000707 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
708 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700709 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000710 ((['git',
711 'config', 'rietveld.server'],), 'codereview.example.com'),
712 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000713 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000714 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000715 ((['git', 'config', 'branch.working.merge'],),
716 'refs/heads/master'),
717 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000718 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000719 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000720 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000721 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000722 'refs/remotes/origin/master'],),
723 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000724 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000725 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000726 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000727 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000728 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000729 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000730 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000731 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000732 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000733 ]
734
735 @classmethod
736 def _dcommit_calls_normal(cls):
737 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000738 ((['git', 'rev-parse', '--show-cdup'],), ''),
739 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000740 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000741 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000742 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000743 '.'],),
744 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000745 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700746 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000747 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000748 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000749 ((['git', 'config', 'user.email'],), 'author@example.com'),
750 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000751 ]
752
753 @classmethod
754 def _dcommit_calls_bypassed(cls):
755 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000756 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000757 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000758 ]
759
760 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000761 def _dcommit_calls_3(cls):
762 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000763 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -0800764 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
765 'fake_ancestor_sha', 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000766 (' PRESUBMIT.py | 2 +-\n'
767 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000768 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700769 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000770 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
771 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700772 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000773 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000774 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
775 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
776 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000777 'Issue: 12345\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100778 'Review-Url: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000779 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000780 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000781 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000782 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000783 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000784 ((['git', 'checkout', '-q', 'working'],), ''),
785 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000786 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000787
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000788 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700789 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000790 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000791 return [
792 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000793 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000794 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000795 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700796 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000797 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000798 '--git_similarity', similarity or '50'
799 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000800 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000801 ]
802
803 def _run_reviewer_test(
804 self,
805 upload_args,
806 expected_description,
807 returned_description,
808 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000809 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700810 private=False,
811 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000812 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000813 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000814 try:
815 similarity = upload_args[upload_args.index('--similarity')+1]
816 except ValueError:
817 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000818
819 if '--find-copies' in upload_args:
820 find_copies = True
821 elif '--no-find-copies' in upload_args:
822 find_copies = False
823 else:
824 find_copies = None
825
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000826 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700827 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000828
829 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000830
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000831 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000832 self.assertEquals(
833 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000834 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000835 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000836 '#--------------------This line is 72 characters long'
837 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 expected_description,
839 desc)
840 return returned_description
841 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000842
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000843 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000844 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700845 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000846 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000847 return 1, 2
848 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000849
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000850 git_cl.main(['upload'] + upload_args)
851
852 def test_no_reviewer(self):
853 self._run_reviewer_test(
854 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000855 'desc\n\nBUG=',
856 '# Blah blah comment.\ndesc\n\nBUG=',
857 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000858 [])
859
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000860 def test_keep_similarity(self):
861 self._run_reviewer_test(
862 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000863 'desc\n\nBUG=',
864 '# Blah blah comment.\ndesc\n\nBUG=',
865 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000866 [])
867
iannucci@chromium.org79540052012-10-19 23:15:26 +0000868 def test_keep_find_copies(self):
869 self._run_reviewer_test(
870 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000871 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000872 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000873 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000874 [])
875
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000876 def test_private(self):
877 self._run_reviewer_test(
878 ['--private'],
879 'desc\n\nBUG=',
880 '# Blah blah comment.\ndesc\n\nBUG=\n',
881 'desc\n\nBUG=',
882 [])
883
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000884 def test_reviewers_cmd_line(self):
885 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000886 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000887 self._run_reviewer_test(
888 ['-r' 'foo@example.com'],
889 description,
890 '\n%s\n' % description,
891 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000892 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000893
894 def test_reviewer_tbr_overriden(self):
895 # Reviewer is overriden with TBR
896 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000897 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000898 self._run_reviewer_test(
899 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000900 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000901 description.strip('\n'),
902 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000903 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000904
905 def test_reviewer_multiple(self):
906 # Handles multiple R= or TBR= lines.
907 description = (
bradnelsond975b302016-10-23 12:20:23 -0700908 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
909 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000910 self._run_reviewer_test(
911 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000912 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000913 description,
914 description,
bradnelsond975b302016-10-23 12:20:23 -0700915 ['--reviewers=another@example.com,reviewer@example.com'],
916 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000917
maruel@chromium.orga3353652011-11-30 14:26:57 +0000918 def test_reviewer_send_mail(self):
919 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000920 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000921 self._run_reviewer_test(
922 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000923 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000924 description.strip('\n'),
925 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000926 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000927
928 def test_reviewer_send_mail_no_rev(self):
929 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000930 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700931 self.calls = self._upload_no_rev_calls(None, None) + [
932 ((['DieWithError', 'Must specify reviewers to send email.'],),
933 SystemExitMock())
934 ]
935
936 def RunEditor(desc, _, **kwargs):
937 return desc
938 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
939 self.mock(sys, 'stdout', stdout)
940 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000941 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700942 self.assertEqual(
943 'Using 50% similarity for rename/copy detection. Override with '
944 '--similarity.\n',
945 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000946
tandriif9aefb72016-07-01 09:06:51 -0700947 def test_bug_on_cmd(self):
948 self._run_reviewer_test(
949 ['--bug=500658,proj:123'],
950 'desc\n\nBUG=500658\nBUG=proj:123',
951 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
952 'desc\n\nBUG=500658\nBUG=proj:1234',
953 [])
954
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000955 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000956 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000957 self.calls = (
958 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000959 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000960 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000961 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000962 git_cl.main(['dcommit'])
963
964 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000965 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000966 self.calls = (
967 self._dcommit_calls_1() +
968 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000969 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000970 git_cl.main(['dcommit', '--bypass-hooks'])
971
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100972 def _land_rietveld_common(self, debug=False):
973 if debug:
974 # Very useful due to finally clause in git cl land raising exceptions and
975 # shadowing real cause of failure.
976 self.mock(git_cl, '_IS_BEING_TESTED', True)
977 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100978 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100979
980 self.mock(git_cl._GitNumbererState, 'load', classmethod(lambda _, url, ref:
981 self._mocked_call(['_GitNumbererState', url, ref])))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100982 self.mock(RietveldMock, 'update_description', staticmethod(
983 lambda i, d: self._mocked_call(['update_description', i, d])))
984 self.mock(RietveldMock, 'add_comment', staticmethod(
985 lambda i, c: self._mocked_call(['add_comment', i, c])))
986 self.calls = [
987 ((['git', 'config', 'rietveld.autoupdate'],), ''),
988 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
989 ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
990 CERR1),
991 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
992 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
993 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
994 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
995 CERR1),
996 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
997 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
998 ((['git', 'config', 'rietveld.server'],),
999 'https://codereview.chromium.org'),
1000 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1001 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1002 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1003 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1004 ((['git', 'rev-list', '--merges',
1005 '--grep=^SVN changes up to revision [0-9]*$',
1006 'refs/remotes/origin/master^!'],), ''),
1007 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1008 ''), # No commits to rebase, according to local view of origin.
1009 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1010 'fake_ancestor_sha'),
1011 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1012 ((['git', 'rev-parse', '--show-cdup'],), ''),
1013 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1014 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1015 'fake_ancestor_sha...', '.'],),
1016 'M\tfile1.cpp'),
1017 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1018 ((['git', 'config', 'branch.feature.rietveldserver'],),
1019 'https://codereview.chromium.org'),
1020 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1021 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1022 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1023 'fake_ancestor_sha', 'feature'],),
1024 # This command just prints smth like this:
1025 # file1.cpp | 53 ++++++--
1026 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1027 ''),
1028 ((['git', 'show-ref', '--quiet', '--verify',
1029 'refs/heads/git-cl-commit'],),
1030 ''), # 0 return code means branch exists.
1031 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1032 ((['git', 'show-ref', '--quiet', '--verify',
1033 'refs/heads/git-cl-cherry-pick'],),
1034 CERR1), # This means git-cl-cherry-pick branch does not exist.
1035 ((['git', 'rev-parse', '--show-cdup'],), ''),
1036 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1037 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1038 ((['git', 'commit', '-m',
1039 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001040 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001041 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1042 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1043 ((['git', 'config', '--get', 'remote.origin.url'],),
1044 'https://chromium.googlesource.com/infra/infra'),
1045 ]
1046
1047 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001048 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001049 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001050 ((['git', 'config', 'remote.origin.url'],),
1051 'https://chromium.googlesource.com/infra/infra'),
1052 ((['_GitNumbererState',
1053 'https://chromium.googlesource.com/infra/infra',
1054 'refs/heads/master'],),
1055 git_cl._GitNumbererState(None, False)),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001056 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1057 ''),
1058 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1059 ((['git', 'checkout', '-q', 'feature'],), ''),
1060 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1061 ((['git', 'config', 'rietveld.viewvc-url'],),
1062 'https://chromium.googlesource.com/infra/infra/+/'),
1063 ((['update_description', 123,
1064 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1065 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1066 ''),
1067 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1068 'fake_sha_rebased (presubmit successful).'],), ''),
1069 ]
1070 git_cl.main(['land'])
1071
1072 def test_land_rietveld_gnumbd(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001073 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001074 self.mock(git_cl, 'WaitForRealCommit',
1075 lambda *a: self._mocked_call(['WaitForRealCommit'] + list(a)))
1076 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001077 ((['git', 'config', 'remote.origin.url'],),
1078 'https://chromium.googlesource.com/chromium/src'),
1079 ((['_GitNumbererState',
1080 'https://chromium.googlesource.com/chromium/src',
1081 'refs/heads/master'],),
1082 git_cl._GitNumbererState('refs/pending', True)),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001083 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1084 ((['git', 'retry', 'fetch', 'origin',
1085 '+refs/pending/heads/master:refs/git-cl/pending/heads/master'],), ''),
1086 ((['git', 'checkout', 'refs/git-cl/pending/heads/master'],), ''),
1087 ((['git', 'cherry-pick', 'fake_sha_rebased'],), ''),
1088
1089 ((['git', 'retry', 'push', '--porcelain', 'origin',
1090 'HEAD:refs/pending/heads/master'],),''),
1091 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased_on_pending'),
1092
1093 ((['git', 'checkout', '-q', 'feature'],), ''),
1094 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1095
1096 ((['WaitForRealCommit', 'origin', 'fake_sha_rebased_on_pending',
1097 'refs/remotes/origin/master', 'refs/heads/master'],),
1098 'fake_sha_gnumbded'),
1099
1100 ((['git', 'config', 'rietveld.viewvc-url'],),
1101 'https://chromium.googlesource.com/infra/infra/+/'),
1102 ((['update_description', 123,
1103 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1104 'https://chromium.googlesource.com/infra/infra/+/fake_sha_gnumbded'],),
1105 ''),
1106 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1107 'fake_sha_gnumbded (presubmit successful).'],),
1108 ''),
1109 ]
1110 git_cl.main(['land'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001111
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001112 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001113 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001114
1115 # Special mocks to check validity of timestamp.
1116 original_git_amend_head = git_cl._git_amend_head
1117 def _git_amend_head_mock(msg, tstamp):
1118 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1119 return original_git_amend_head(msg, tstamp)
1120 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1121
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001122 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001123 ((['git', 'config', 'remote.origin.url'],),
1124 'https://chromium.googlesource.com/chromium/src'),
1125 ((['_GitNumbererState',
1126 'https://chromium.googlesource.com/chromium/src',
1127 'refs/heads/master'],),
1128 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001129
1130 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1131 'This is parent commit.\n'
1132 '\n'
1133 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1134 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001135 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1136 '1480022355'), # Committer's unix timestamp.
1137 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1138 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001139
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001140 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001141 ((['git', 'commit', '--amend', '-m',
1142 'Issue: 123\n\nR=john@chromium.org\n'
1143 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001144 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001145 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1146 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1147
1148 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1149 ''),
1150 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1151 ((['git', 'checkout', '-q', 'feature'],), ''),
1152 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1153 ((['git', 'config', 'rietveld.viewvc-url'],),
1154 'https://chromium.googlesource.com/infra/infra/+/'),
1155 ((['update_description', 123,
1156 'Issue: 123\n\nR=john@chromium.org\n'
1157 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001158 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001159 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1160 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1161 'Committed: '
1162 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1163 ''),
1164 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1165 'fake_sha_rebased (presubmit successful).'],), ''),
1166 ]
1167 git_cl.main(['land'])
1168
1169 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001170 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001171 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001172 ((['git', 'config', 'remote.origin.url'],),
1173 'https://chromium.googlesource.com/v8/v8'),
1174 ((['_GitNumbererState',
1175 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'],),
1176 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001177
1178 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1179 'This is parent commit with no footer.'),
1180
1181 ((['git', 'checkout', '-q', 'feature'],), ''),
1182 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1183 ]
1184 with self.assertRaises(ValueError) as cm:
1185 git_cl.main(['land'])
1186 self.assertEqual(cm.exception.message,
1187 'Unable to infer commit position from footers')
1188
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001189 def test_GitNumbererState_not_whitelisted_repo(self):
1190 self.calls = [
1191 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1192 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1193 ]
1194 res = git_cl._GitNumbererState.load(
1195 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1196 remote_ref='refs/whatever')
1197 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001198 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001199
1200 def test_GitNumbererState_fail_fetch(self):
1201 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1202 self.calls = [
1203 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1204 '+refs/meta/config:refs/git_cl/meta/config',
1205 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), CERR1),
1206 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1207 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
1208 'refs/pending-prefix'),
1209 ]
1210 res = git_cl._GitNumbererState.load(
1211 remote_url='https://chromium.googlesource.com/chromium/src',
1212 remote_ref='refs/whatever')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001213 self.assertEqual(res.pending_prefix, 'refs/pending-prefix/')
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001214 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001215
1216 def test_GitNumbererState_fail_gnumbd_and_validator(self):
1217 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1218 self.calls = [
1219 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1220 '+refs/meta/config:refs/git_cl/meta/config',
1221 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1222 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1223 'ba d conig'),
1224 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1225 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1226 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],), CERR1),
1227 ]
1228 res = git_cl._GitNumbererState.load(
1229 remote_url='https://chromium.googlesource.com/chromium/src',
1230 remote_ref='refs/whatever')
1231 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001232 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001233
1234 def test_GitNumbererState_valid_configs(self):
1235 class NamedTempFileStab(StringIO.StringIO):
1236 @classmethod
1237 @contextlib.contextmanager
1238 def create(cls, *_, **__):
1239 yield cls()
1240 name = 'tempfile'
1241 self.mock(git_cl.tempfile, 'NamedTemporaryFile', NamedTempFileStab.create)
1242 self.calls = [
1243 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1244 '+refs/meta/config:refs/git_cl/meta/config',
1245 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1246 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1247 '''{
1248 "pending_tag_prefix": "refs/pending-tags",
1249 "pending_ref_prefix": "refs/pending",
1250 "enabled_refglobs": [
1251 "refs/heads/m*"
1252 ]
1253 }
1254 '''),
1255 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1256 '''
1257 [plugin "git-numberer"]
1258 validate-enabled-refglob = refs/else/*
1259 validate-enabled-refglob = refs/heads/*
1260 validate-disabled-refglob = refs/heads/disabled
1261 validate-disabled-refglob = refs/branch-heads/*
1262 '''),
1263 ((['git', 'config', '-f', 'tempfile', '--get-all',
1264 'plugin.git-numberer.validate-enabled-refglob'],),
1265 'refs/else/*\n'
1266 'refs/heads/*\n'),
1267 ((['git', 'config', '-f', 'tempfile', '--get-all',
1268 'plugin.git-numberer.validate-disabled-refglob'],),
1269 'refs/heads/disabled\n'
1270 'refs/branch-heads/*\n'),
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001271 ] * 4 # 4 tests below have exactly same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001272
1273 res = git_cl._GitNumbererState.load(
1274 remote_url='https://chromium.googlesource.com/chromium/src',
1275 remote_ref='refs/heads/master')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001276 self.assertEqual(res.pending_prefix, 'refs/pending/')
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001277 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001278
1279 res = git_cl._GitNumbererState.load(
1280 remote_url='https://chromium.googlesource.com/chromium/src',
1281 remote_ref='refs/heads/test')
1282 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001283 self.assertEqual(res.should_add_git_number, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001284
1285 res = git_cl._GitNumbererState.load(
1286 remote_url='https://chromium.googlesource.com/chromium/src',
1287 remote_ref='refs/heads/disabled')
1288 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001289 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001290
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001291 # Validator is disabled by default, even if it's not explicitely in disabled
1292 # refglobs.
1293 res = git_cl._GitNumbererState.load(
1294 remote_url='https://chromium.googlesource.com/chromium/src',
1295 remote_ref='refs/arbitrary/ref')
1296 self.assertEqual(res.pending_prefix, None)
Andrii Shyshkalov8f15f3e2016-12-14 15:43:49 +01001297 self.assertEqual(res.should_add_git_number, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001298
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001299 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001300 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001301 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001302 if skip_auth_check:
1303 return [((cmd, ), 'true')]
1304
tandrii5d48c322016-08-18 16:19:37 -07001305 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001306 if issue:
1307 calls.extend([
1308 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1309 ])
1310 calls.extend([
1311 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1312 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1313 ((['git', 'config', 'remote.origin.url'],),
1314 'https://chromium.googlesource.com/my/repo'),
1315 ((['git', 'config', 'remote.origin.url'],),
1316 'https://chromium.googlesource.com/my/repo'),
1317 ])
1318 return calls
1319
1320 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001321 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001322 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001323 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001324 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001325 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001326 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001327 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1328 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001329 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001330 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001331 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1332 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001333 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001334 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001335 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001336 ((['get_or_create_merge_base', 'master',
1337 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001338 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001339 # Calls to verify branch point is ancestor
1340 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1341 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1342 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001343 ((['git', 'rev-parse', '--show-cdup'],), ''),
1344 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001345
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001346 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001347 'diff', '--name-status', '--no-renames', '-r',
1348 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001349 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001350 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001351 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001352 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001353 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001354 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001355 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001356 ((['git', 'config', 'user.email'],), 'me@example.com'),
1357 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001358 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1359 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001360 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001361 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001362
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001363 @classmethod
1364 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001365 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001366 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001367 ref_suffix='', title=None, notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001368 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001369 if post_amend_description is None:
1370 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001371 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001372 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001373
tandriia60502f2016-06-20 02:01:53 -07001374 if squash_mode == 'default':
1375 calls.extend([
1376 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1377 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1378 ])
1379 elif squash_mode in ('override_squash', 'override_nosquash'):
1380 calls.extend([
1381 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1382 'true' if squash_mode == 'override_squash' else 'false'),
1383 ])
1384 else:
1385 assert squash_mode in ('squash', 'nosquash')
1386
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001387 # If issue is given, then description is fetched from Gerrit instead.
1388 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001389 calls += [
1390 ((['git', 'log', '--pretty=format:%s\n\n%b',
1391 'fake_ancestor_sha..HEAD'],),
1392 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001393 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001394 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001395 # DownloadGerritHook(False)
1396 ((False, ),
1397 ''),
1398 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001399 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001400 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001401 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001402 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001403 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001404 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001405 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001406 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001407 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001408 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001409 if not issue:
1410 # Prompting to edit description on first upload.
1411 calls += [
1412 ((['git', 'config', 'core.editor'],), ''),
1413 ((['RunEditor'],), description),
1414 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001415 ref_to_push = 'abcdef0123456789'
1416 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001417 ((['git', 'config', 'branch.master.merge'],),
1418 'refs/heads/master'),
1419 ((['git', 'config', 'branch.master.remote'],),
1420 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001421 ((['get_or_create_merge_base', 'master',
1422 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001423 'origin/master'),
1424 ((['git', 'rev-parse', 'HEAD:'],),
1425 '0123456789abcdef'),
1426 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001427 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001428 ref_to_push),
1429 ]
1430 else:
1431 ref_to_push = 'HEAD'
1432
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001433 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001434 ((['git', 'rev-list',
1435 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001436 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001437
Aaron Gable9b713dd2016-12-14 16:04:21 -08001438
1439 if not title:
1440 if issue:
1441 calls += [
1442 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1443 (('Title for patchset []: ',), 'User input'),
1444 ]
1445 title = 'User_input'
1446 else:
1447 title = 'Initial_upload'
1448 if title:
1449 if ref_suffix:
1450 ref_suffix += ',m=' + title
1451 else:
1452 ref_suffix = '%m=' + title
1453
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001454 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1455 if ref_suffix:
1456 ref_suffix += ',' + notify_suffix
1457 else:
1458 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001459
ukai@chromium.orge8077812012-02-03 03:41:46 +00001460 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001461 ref_suffix += ',' + ','.join('r=%s' % email
1462 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001463 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001464 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001465 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001466 ('remote:\n'
1467 'remote: Processing changes: (\)\n'
1468 'remote: Processing changes: (|)\n'
1469 'remote: Processing changes: (/)\n'
1470 'remote: Processing changes: (-)\n'
1471 'remote: Processing changes: new: 1 (/)\n'
1472 'remote: Processing changes: new: 1, done\n'
1473 'remote:\n'
1474 'remote: New Changes:\n'
1475 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1476 'remote:\n'
1477 'To https://chromium.googlesource.com/yyy/zzz\n'
1478 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001479 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001480 if squash:
1481 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001482 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001483 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001484 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001485 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001486 ((['git', 'config', 'branch.master.gerritsquashhash',
1487 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001488 ]
tandrii88189772016-09-29 04:29:57 -07001489 calls += [
1490 ((['git', 'config', 'rietveld.cc'],), ''),
1491 ((['AddReviewers', 'chromium-review.googlesource.com',
1492 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -07001493 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -07001494 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001495 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001496 return calls
1497
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001498 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001499 self,
1500 upload_args,
1501 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001502 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001503 squash=True,
1504 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001505 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001506 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001507 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001508 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001509 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001510 issue=None,
1511 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001512 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001513 if squash_mode is None:
1514 if '--no-squash' in upload_args:
1515 squash_mode = 'nosquash'
1516 elif '--squash' in upload_args:
1517 squash_mode = 'squash'
1518 else:
1519 squash_mode = 'default'
1520
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001521 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001522 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001523 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001524 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001525 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001526 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1527 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001528 self.mock(git_cl.gclient_utils, 'RunEditor',
1529 lambda *_, **__: self._mocked_call(['RunEditor']))
1530 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001531 self.mock(git_cl.gerrit_util, 'AddReviewers',
1532 lambda h, i, add, is_reviewer: self._mocked_call(
1533 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001534
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001535 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001536 self.calls += self._gerrit_upload_calls(
1537 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001538 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001539 expected_upstream_ref=expected_upstream_ref,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001540 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001541 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001542 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001543 # Uncomment when debugging.
1544 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001545 git_cl.main(['upload'] + upload_args)
1546
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001547 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001548 self._run_gerrit_upload_test(
1549 ['--no-squash'],
1550 'desc\n\nBUG=\n',
1551 [],
1552 squash=False,
1553 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1554
1555 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001556 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001557 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001558 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001559 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001560 [],
tandriia60502f2016-06-20 02:01:53 -07001561 squash=False,
1562 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001563 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001564
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001565 def test_gerrit_no_reviewer(self):
1566 self._run_gerrit_upload_test(
1567 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001568 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001569 [],
1570 squash=False,
1571 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001572
tandriieefe8322016-08-17 10:12:24 -07001573 def test_gerrit_patch_bad_chars(self):
1574 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001575 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001576 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001577 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001578 squash=False,
1579 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001580 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001581 self.assertIn(
1582 'WARNING: Patchset title may only contain alphanumeric chars '
1583 'and spaces. Cleaned up title:\nDont put bad chars\n',
1584 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001585
ukai@chromium.orge8077812012-02-03 03:41:46 +00001586 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001587 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001588 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001589 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001590 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001591 squash=False,
1592 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001593 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001594
1595 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001596 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001597 [],
bradnelsond975b302016-10-23 12:20:23 -07001598 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1599 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001600 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001601 ['reviewer@example.com', 'another@example.com'],
1602 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001603 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001604 ref_suffix='%l=Code-Review+1',
1605 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001606
1607 def test_gerrit_upload_squash_first_is_default(self):
1608 # Mock Gerrit CL description to indicate the first upload.
1609 self.mock(git_cl.Changelist, 'GetDescription',
1610 lambda *_: None)
1611 self._run_gerrit_upload_test(
1612 [],
1613 'desc\nBUG=\n\nChange-Id: 123456789',
1614 [],
1615 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001616
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001617 def test_gerrit_upload_squash_first(self):
1618 # Mock Gerrit CL description to indicate the first upload.
1619 self.mock(git_cl.Changelist, 'GetDescription',
1620 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001621 self._run_gerrit_upload_test(
1622 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001623 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001624 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001625 squash=True,
1626 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001627
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001628 def test_gerrit_upload_squash_reupload(self):
1629 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1630 # Mock Gerrit CL description to indicate re-upload.
1631 self.mock(git_cl.Changelist, 'GetDescription',
1632 lambda *args: description)
1633 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1634 lambda *args: 1)
1635 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1636 lambda *args: {'change_id': '123456789'})
1637 self._run_gerrit_upload_test(
1638 ['--squash'],
1639 description,
1640 [],
1641 squash=True,
1642 expected_upstream_ref='origin/master',
1643 issue=123456)
1644
rmistry@google.com2dd99862015-06-22 12:22:18 +00001645 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001646 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001647 def mock_run_git(*args, **_kwargs):
1648 if args[0] == ['for-each-ref',
1649 '--format=%(refname:short) %(upstream:short)',
1650 'refs/heads']:
1651 # Create a local branch dependency tree that looks like this:
1652 # test1 -> test2 -> test3 -> test4 -> test5
1653 # -> test3.1
1654 # test6 -> test0
1655 branch_deps = [
1656 'test2 test1', # test1 -> test2
1657 'test3 test2', # test2 -> test3
1658 'test3.1 test2', # test2 -> test3.1
1659 'test4 test3', # test3 -> test4
1660 'test5 test4', # test4 -> test5
1661 'test6 test0', # test0 -> test6
1662 'test7', # test7
1663 ]
1664 return '\n'.join(branch_deps)
1665 self.mock(git_cl, 'RunGit', mock_run_git)
1666
1667 class RecordCalls:
1668 times_called = 0
1669 record_calls = RecordCalls()
1670 def mock_CMDupload(*args, **_kwargs):
1671 record_calls.times_called += 1
1672 return 0
1673 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1674
1675 self.calls = [
1676 (('[Press enter to continue or ctrl-C to quit]',), ''),
1677 ]
1678
1679 class MockChangelist():
1680 def __init__(self):
1681 pass
1682 def GetBranch(self):
1683 return 'test1'
1684 def GetIssue(self):
1685 return '123'
1686 def GetPatchset(self):
1687 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001688 def IsGerrit(self):
1689 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001690
1691 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1692 # CMDupload should have been called 5 times because of 5 dependent branches.
1693 self.assertEquals(5, record_calls.times_called)
1694 self.assertEquals(0, ret)
1695
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001696 def test_gerrit_change_id(self):
1697 self.calls = [
1698 ((['git', 'write-tree'], ),
1699 'hashtree'),
1700 ((['git', 'rev-parse', 'HEAD~0'], ),
1701 'branch-parent'),
1702 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1703 'A B <a@b.org> 1456848326 +0100'),
1704 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1705 'C D <c@d.org> 1456858326 +0100'),
1706 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1707 'hashchange'),
1708 ]
1709 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1710 self.assertEqual(change_id, 'Ihashchange')
1711
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001712 def test_desecription_append_footer(self):
1713 for init_desc, footer_line, expected_desc in [
1714 # Use unique desc first lines for easy test failure identification.
1715 ('foo', 'R=one', 'foo\n\nR=one'),
1716 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1717 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1718 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1719 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1720 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1721 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1722 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1723 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1724 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1725 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1726 ]:
1727 desc = git_cl.ChangeDescription(init_desc)
1728 desc.append_footer(footer_line)
1729 self.assertEqual(desc.description, expected_desc)
1730
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001731 def test_update_reviewers(self):
1732 data = [
1733 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001734 ('foo\nR=xx', [], 'foo\nR=xx'),
1735 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001736 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001737 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1738 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1739 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001740 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001741 ('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 +00001742 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001743 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1744 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1745 # Same as the line before, but full of whitespaces.
1746 (
1747 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1748 'foo\nBar\n\nR=c@c\n BUG =',
1749 ),
1750 # Whitespaces aren't interpreted as new lines.
1751 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001752 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001753 expected = [i[2] for i in data]
1754 actual = []
1755 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001756 obj = git_cl.ChangeDescription(orig)
1757 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001758 actual.append(obj.description)
1759 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001760
wittman@chromium.org455dc922015-01-26 20:15:50 +00001761 def test_get_target_ref(self):
1762 # Check remote or remote branch not present.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001763 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001764 self.assertEqual(None, git_cl.GetTargetRef(None,
1765 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001766 'master', False))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001767
wittman@chromium.org455dc922015-01-26 20:15:50 +00001768 # Check default target refs for branches.
1769 self.assertEqual('refs/heads/master',
1770 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001771 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001772 self.assertEqual('refs/heads/master',
1773 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001774 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001775 self.assertEqual('refs/heads/master',
1776 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001777 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001778 self.assertEqual('refs/branch-heads/123',
1779 git_cl.GetTargetRef('origin',
1780 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001781 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001782 self.assertEqual('refs/diff/test',
1783 git_cl.GetTargetRef('origin',
1784 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001785 None, False))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001786 self.assertEqual('refs/heads/chrome/m42',
1787 git_cl.GetTargetRef('origin',
1788 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001789 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001790
1791 # Check target refs for user-specified target branch.
1792 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1793 'refs/remotes/branch-heads/123'):
1794 self.assertEqual('refs/branch-heads/123',
1795 git_cl.GetTargetRef('origin',
1796 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001797 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001798 for branch in ('origin/master', 'remotes/origin/master',
1799 'refs/remotes/origin/master'):
1800 self.assertEqual('refs/heads/master',
1801 git_cl.GetTargetRef('origin',
1802 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001803 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001804 for branch in ('master', 'heads/master', 'refs/heads/master'):
1805 self.assertEqual('refs/heads/master',
1806 git_cl.GetTargetRef('origin',
1807 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001808 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001809
1810 # Check target refs for pending prefix.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001811 self.mock(git_cl._GitNumbererState, 'load',
1812 classmethod(lambda *_: git_cl._GitNumbererState('prefix', False)))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001813 self.assertEqual('prefix/heads/master',
1814 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001815 None, True,
1816 'https://remote.url/some.git'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001817
wychen@chromium.orga872e752015-04-28 23:42:18 +00001818 def test_patch_when_dirty(self):
1819 # Patch when local tree is dirty
1820 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1821 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1822
1823 def test_diff_when_dirty(self):
1824 # Do 'git cl diff' when local tree is dirty
1825 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1826 self.assertNotEqual(git_cl.main(['diff']), 0)
1827
tandriidf09a462016-08-18 16:23:55 -07001828 def _patch_common(self, is_gerrit=False, force_codereview=False,
1829 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001830 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001831 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1832 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001833 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1834 lambda *args: {
1835 'current_revision': '7777777777',
1836 'revisions': {
1837 '1111111111': {
1838 '_number': 1,
1839 'fetch': {'http': {
1840 'url': 'https://chromium.googlesource.com/my/repo',
1841 'ref': 'refs/changes/56/123456/1',
1842 }},
1843 },
1844 '7777777777': {
1845 '_number': 7,
1846 'fetch': {'http': {
1847 'url': 'https://chromium.googlesource.com/my/repo',
1848 'ref': 'refs/changes/56/123456/7',
1849 }},
1850 },
1851 },
1852 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001853 self.mock(git_cl.Changelist, 'GetDescription',
1854 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001855 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1856
tandriidf09a462016-08-18 16:23:55 -07001857 if new_branch:
1858 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1859 else:
1860 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001861 if not force_codereview:
1862 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001863 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001864 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001865 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1866 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001867 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001868 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001869
1870 if is_gerrit:
1871 if not force_codereview:
1872 self.calls += [
1873 ((['git', 'config', 'gerrit.host'],), 'true'),
1874 ]
1875 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001876 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001877 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001878 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001879 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001880 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001881 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001882
tandriidf09a462016-08-18 16:23:55 -07001883 def _common_patch_successful(self, new_branch=False):
1884 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001885 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001886 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001887 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001888 'patch from issue 123456 at patchset 60001 ' +
1889 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001890 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001891 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001892 ((['git', 'config', 'branch.master.rietveldserver',
1893 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001894 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001895 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001896 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001897
1898 def test_patch_successful(self):
1899 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001900 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1901
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001902 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001903 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001904 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1905
wychen@chromium.orga872e752015-04-28 23:42:18 +00001906 def test_patch_conflict(self):
1907 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001908 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001909 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001910
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001911 def test_gerrit_patch_successful(self):
1912 self._patch_common(is_gerrit=True)
1913 self.calls += [
1914 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1915 'refs/changes/56/123456/7'],), ''),
1916 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001917 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001918 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001919 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1920 ((['git', 'config', 'branch.master.merge'],), 'master'),
1921 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1922 ((['git', 'config', 'remote.origin.url'],),
1923 'https://chromium.googlesource.com/my/repo'),
1924 ((['git', 'config', 'branch.master.gerritserver',
1925 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001926 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001927 ]
1928 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1929
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001930 def test_patch_force_codereview(self):
1931 self._patch_common(is_gerrit=True, force_codereview=True)
1932 self.calls += [
1933 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1934 'refs/changes/56/123456/7'],), ''),
1935 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1936 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001937 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001938 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001939 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1940 ((['git', 'config', 'branch.master.merge'],), 'master'),
1941 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1942 ((['git', 'config', 'remote.origin.url'],),
1943 'https://chromium.googlesource.com/my/repo'),
1944 ((['git', 'config', 'branch.master.gerritserver',
1945 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001946 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001947 ]
1948 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1949
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001950 def test_gerrit_patch_url_successful(self):
1951 self._patch_common(is_gerrit=True)
1952 self.calls += [
1953 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1954 'refs/changes/56/123456/1'],), ''),
1955 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001956 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001957 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001958 ((['git', 'config', 'branch.master.gerritserver',
1959 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001960 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001961 ]
1962 self.assertEqual(git_cl.main(
1963 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1964
1965 def test_gerrit_patch_conflict(self):
1966 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001967 self.calls += [
1968 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1969 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001970 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1971 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1972 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001973 ]
1974 with self.assertRaises(SystemExitMock):
1975 git_cl.main(['patch',
1976 'https://chromium-review.googlesource.com/#/c/123456/1'])
1977
tandriic2405f52016-10-10 08:13:15 -07001978 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001979 def notExists(_issue, *_, **kwargs):
1980 self.assertFalse(kwargs['ignore_404'])
1981 raise git_cl.gerrit_util.GerritError(404, '')
1982 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1983
tandriic2405f52016-10-10 08:13:15 -07001984 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001985 self.calls = [
1986 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1987 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1988 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1989 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1990 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1991 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001992 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001993 'or you have no access to it'],), SystemExitMock()),
1994 ]
1995 with self.assertRaises(SystemExitMock):
1996 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1997
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001998 def _checkout_calls(self):
1999 return [
2000 ((['git', 'config', '--local', '--get-regexp',
2001 'branch\\..*\\.rietveldissue'], ),
2002 ('branch.retrying.rietveldissue 1111111111\n'
2003 'branch.some-fix.rietveldissue 2222222222\n')),
2004 ((['git', 'config', '--local', '--get-regexp',
2005 'branch\\..*\\.gerritissue'], ),
2006 ('branch.ger-branch.gerritissue 123456\n'
2007 'branch.gbranch654.gerritissue 654321\n')),
2008 ]
2009
2010 def test_checkout_gerrit(self):
2011 """Tests git cl checkout <issue>."""
2012 self.calls = self._checkout_calls()
2013 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2014 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2015
2016 def test_checkout_rietveld(self):
2017 """Tests git cl checkout <issue>."""
2018 self.calls = self._checkout_calls()
2019 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2020 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2021
2022 def test_checkout_not_found(self):
2023 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002024 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002025 self.calls = self._checkout_calls()
2026 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2027
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002028 def test_checkout_no_branch_issues(self):
2029 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002030 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002031 self.calls = [
2032 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002033 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002034 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002035 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002036 ]
2037 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2038
tandrii@chromium.org28253532016-04-14 13:46:56 +00002039 def _test_gerrit_ensure_authenticated_common(self, auth,
2040 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002041 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2042 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2043 self.mock(git_cl, 'DieWithError',
2044 lambda msg: self._mocked_call(['DieWithError', msg]))
2045 self.mock(git_cl, 'ask_for_data',
2046 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002047 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002048 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002049 cl.branch = 'master'
2050 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002051 cl.lookedup_issue = True
2052 return cl
2053
2054 def test_gerrit_ensure_authenticated_missing(self):
2055 cl = self._test_gerrit_ensure_authenticated_common(auth={
2056 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
2057 })
2058 self.calls.append(
2059 ((['DieWithError',
2060 'Credentials for the following hosts are required:\n'
2061 ' chromium-review.googlesource.com\n'
2062 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
2063 'You can (re)generate your credentails by visiting '
2064 'https://chromium-review.googlesource.com/new-password'],), ''),)
2065 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2066
2067 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002068 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002069 cl = self._test_gerrit_ensure_authenticated_common(auth={
2070 'chromium.googlesource.com': 'one',
2071 'chromium-review.googlesource.com': 'other',
2072 })
2073 self.calls.append(
2074 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07002075 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002076 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2077
2078 def test_gerrit_ensure_authenticated_ok(self):
2079 cl = self._test_gerrit_ensure_authenticated_common(auth={
2080 'chromium.googlesource.com': 'same',
2081 'chromium-review.googlesource.com': 'same',
2082 })
2083 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2084
tandrii@chromium.org28253532016-04-14 13:46:56 +00002085 def test_gerrit_ensure_authenticated_skipped(self):
2086 cl = self._test_gerrit_ensure_authenticated_common(
2087 auth={}, skip_auth_check=True)
2088 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2089
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002090 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002091 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2092 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002093 self.calls = [
2094 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002095 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002096 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2097 ((['git', 'config', 'rietveld.server'],), ''),
2098 ((['git', 'config', 'rietveld.server'],), ''),
2099 ((['git', 'config', 'branch.feature.rietveldserver'],),
2100 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002101 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002102 ]
2103 self.assertEqual(0, git_cl.main(['set-commit']))
2104
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002105 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002106 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002107 lambda h, i, labels, notify=None:
2108 self._mocked_call(['SetReview', h, i, labels, notify]))
2109
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002110 self.calls = [
2111 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002112 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2113 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002114 ((['git', 'config', 'branch.feature.gerritserver'],),
2115 'https://chromium-review.googlesource.com'),
2116 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002117 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002118 ]
tandriid9e5ce52016-07-13 02:32:59 -07002119
2120 def test_cmd_set_commit_gerrit_clear(self):
2121 self._cmd_set_commit_gerrit_common(0)
2122 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2123
2124 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002125 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002126 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2127
tandriid9e5ce52016-07-13 02:32:59 -07002128 def test_cmd_set_commit_gerrit(self):
2129 self._cmd_set_commit_gerrit_common(2)
2130 self.assertEqual(0, git_cl.main(['set-commit']))
2131
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002132 def test_description_display(self):
2133 out = StringIO.StringIO()
2134 self.mock(git_cl.sys, 'stdout', out)
2135
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002136 self.mock(git_cl, 'Changelist', ChangelistMock)
2137 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002138
2139 self.assertEqual(0, git_cl.main(['description', '-d']))
2140 self.assertEqual('foo\n', out.getvalue())
2141
2142 def test_description_rietveld(self):
2143 out = StringIO.StringIO()
2144 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002145 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002146
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002147 self.assertEqual(0, git_cl.main([
2148 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2149 self.assertEqual('foobar\n', out.getvalue())
2150
iannucci3c972b92016-08-17 13:24:10 -07002151 def test_StatusFieldOverrideIssueMissingArgs(self):
2152 out = StringIO.StringIO()
2153 self.mock(git_cl.sys, 'stderr', out)
2154
2155 try:
2156 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2157 except SystemExit as ex:
2158 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002159 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002160
2161 out = StringIO.StringIO()
2162 self.mock(git_cl.sys, 'stderr', out)
2163
2164 try:
2165 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2166 except SystemExit as ex:
2167 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002168 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002169
2170 def test_StatusFieldOverrideIssue(self):
2171 out = StringIO.StringIO()
2172 self.mock(git_cl.sys, 'stdout', out)
2173
2174 def assertIssue(cl_self, *_args):
2175 self.assertEquals(cl_self.issue, 1)
2176 return 'foobar'
2177
2178 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2179 self.calls = [
2180 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2181 ((['git', 'config', 'rietveld.server'],), ''),
2182 ((['git', 'config', 'rietveld.server'],), ''),
2183 ]
iannuccie53c9352016-08-17 14:40:40 -07002184 self.assertEqual(
2185 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2186 0)
iannucci3c972b92016-08-17 13:24:10 -07002187 self.assertEqual(out.getvalue(), 'foobar\n')
2188
iannuccie53c9352016-08-17 14:40:40 -07002189 def test_SetCloseOverrideIssue(self):
2190 def assertIssue(cl_self, *_args):
2191 self.assertEquals(cl_self.issue, 1)
2192 return 'foobar'
2193
2194 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2195 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2196 self.calls = [
2197 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2198 ((['git', 'config', 'rietveld.server'],), ''),
2199 ((['git', 'config', 'rietveld.server'],), ''),
2200 ]
2201 self.assertEqual(
2202 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2203
2204 def test_SetCommitOverrideIssue(self):
2205 def assertIssue(cl_self, *_args):
2206 self.assertEquals(cl_self.issue, 1)
2207 return 'foobar'
2208
2209 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2210 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2211 self.calls = [
2212 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2213 ((['git', 'config', 'rietveld.server'],), ''),
2214 ((['git', 'config', 'rietveld.server'],), ''),
2215 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2216 ((['git', 'config', 'rietveld.server'],), ''),
2217 ((['git', 'config', 'rietveld.server'],), ''),
2218 ]
2219 self.assertEqual(
2220 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2221
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002222 def test_description_gerrit(self):
2223 out = StringIO.StringIO()
2224 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002225 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002226
2227 self.assertEqual(0, git_cl.main([
2228 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2229 self.assertEqual('foobar\n', out.getvalue())
2230
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002231 def test_description_set_raw(self):
2232 out = StringIO.StringIO()
2233 self.mock(git_cl.sys, 'stdout', out)
2234
2235 self.mock(git_cl, 'Changelist', ChangelistMock)
2236 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2237
2238 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2239 self.assertEqual('hihi', ChangelistMock.desc)
2240
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002241 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002242 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002243
2244 def RunEditor(desc, _, **kwargs):
2245 self.assertEquals(
2246 '# Enter a description of the change.\n'
2247 '# This will be displayed on the codereview site.\n'
2248 '# The first line will also be used as the subject of the review.\n'
2249 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002250 '--------------------\n'
2251 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002252 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002253 # Simulate user changing something.
2254 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002255
dsansomee2d6fd92016-09-08 00:10:47 -07002256 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002257 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002258
2259 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2260 self.mock(git_cl.Changelist, 'GetDescription',
2261 lambda *args: current_desc)
2262 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2263 UpdateDescriptionRemote)
2264 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2265
2266 self.calls = [
2267 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002268 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002269 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2270 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002271 ((['git', 'config', 'core.editor'],), 'vi'),
2272 ]
2273 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2274
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002275 def test_description_set_stdin(self):
2276 out = StringIO.StringIO()
2277 self.mock(git_cl.sys, 'stdout', out)
2278
2279 self.mock(git_cl, 'Changelist', ChangelistMock)
2280 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2281
2282 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2283 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2284
kmarshall3bff56b2016-06-06 18:31:47 -07002285 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002286 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2287
kmarshall3bff56b2016-06-06 18:31:47 -07002288 self.calls = \
2289 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2290 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002291 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002292 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2293 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002294 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2295 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2296 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002297 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2298 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2299 ((['git', 'branch', '-D', 'foo'],), '')]
2300
kmarshall3bff56b2016-06-06 18:31:47 -07002301 self.mock(git_cl, 'get_cl_statuses',
2302 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002303 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2304 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2305 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002306
2307 self.assertEqual(0, git_cl.main(['archive', '-f']))
2308
2309 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002310 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002311 self.calls = \
2312 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2313 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002314 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002315 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2316 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002317 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2318
kmarshall9249e012016-08-23 12:02:16 -07002319 self.mock(git_cl, 'get_cl_statuses',
2320 lambda branches, fine_grained, max_processes:
2321 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2322
2323 self.assertEqual(1, git_cl.main(['archive', '-f']))
2324
2325 def test_archive_dry_run(self):
2326 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2327
2328 self.calls = \
2329 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2330 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2331 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2332 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2333 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2334 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2335 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2336 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2337 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002338
2339 self.mock(git_cl, 'get_cl_statuses',
2340 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002341 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2342 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2343 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002344
kmarshall9249e012016-08-23 12:02:16 -07002345 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2346
2347 def test_archive_no_tags(self):
2348 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2349
2350 self.calls = \
2351 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2352 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2353 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2354 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2355 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2356 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2357 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2358 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2359 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2360 ((['git', 'branch', '-D', 'foo'],), '')]
2361
2362 self.mock(git_cl, 'get_cl_statuses',
2363 lambda branches, fine_grained, max_processes:
2364 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2365 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2366 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2367
2368 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002369
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002370 def test_cmd_issue_erase_existing(self):
2371 out = StringIO.StringIO()
2372 self.mock(git_cl.sys, 'stdout', out)
2373 self.calls = [
2374 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002375 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2376 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002377 # Let this command raise exception (retcode=1) - it should be ignored.
2378 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002379 CERR1),
2380 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2381 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002382 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2383 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2384 ''),
2385 ]
2386 self.assertEqual(0, git_cl.main(['issue', '0']))
2387
phajdan.jre328cf92016-08-22 04:12:17 -07002388 def test_cmd_issue_json(self):
2389 out = StringIO.StringIO()
2390 self.mock(git_cl.sys, 'stdout', out)
2391 self.calls = [
2392 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002393 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002394 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2395 ((['git', 'config', 'rietveld.server'],),
2396 'https://codereview.chromium.org'),
2397 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2398 (('write_json', 'output.json',
2399 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2400 ''),
2401 ]
2402 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2403
tandriide281ae2016-10-12 06:02:30 -07002404 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002405 self.mock(git_cl.Changelist, 'GetChange',
2406 lambda _, *a: (
2407 self._mocked_call(['GetChange']+list(a))))
2408 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2409 lambda *_, **__: (
2410 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002411 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2412 lambda _, s: self._mocked_call(['SetCQState', s]))
2413 self.calls = [
2414 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002415 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002416 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2417 ((['git', 'config', 'rietveld.server'],),
2418 'https://codereview.chromium.org'),
2419 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2420 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2421 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2422 ((['get_or_create_merge_base', 'feature', 'feature'],),
2423 'fake_ancestor_sha'),
2424 ((['GetChange', 'fake_ancestor_sha', None], ),
2425 git_cl.presubmit_support.GitChange(
2426 '', '', '', '', '', '', '', '')),
2427 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2428 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002429 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2430 ]
2431 out = StringIO.StringIO()
2432 self.mock(git_cl.sys, 'stdout', out)
2433 self.assertEqual(0, git_cl.main(['try']))
2434 self.assertEqual(
2435 out.getvalue(),
2436 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2437
tandrii8c5a3532016-11-04 07:52:02 -07002438 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2439 self.mock(git_cl.Changelist, 'GetChange',
2440 lambda _, *a: (
2441 self._mocked_call(['GetChange']+list(a))))
2442 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2443 lambda *_, **__: (
2444 self._mocked_call(['DoGetTryMasters'])))
2445 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2446 lambda _, s: self._mocked_call(['SetCQState', s]))
2447
2448 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2449 # Get realistic expectations.
2450 gerrit_change_list_impl._GetGerritHost()
2451 return self._mocked_call(['_GetChangeDetail', opts or []])
2452 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2453 _GetChangeDetail)
2454
2455 self.calls = [
2456 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2457 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2458 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2459 ((['git', 'config', 'branch.feature.gerritserver'],),
2460 'https://chromium-review.googlesource.com'),
2461 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2462 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2463 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2464 ((['get_or_create_merge_base', 'feature', 'feature'],),
2465 'fake_ancestor_sha'),
2466 ((['GetChange', 'fake_ancestor_sha', None], ),
2467 git_cl.presubmit_support.GitChange(
2468 '', '', '', '', '', '', '', '')),
2469 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2470 ((['DoGetTryMasters'], ), None),
2471 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2472 ]
2473 out = StringIO.StringIO()
2474 self.mock(git_cl.sys, 'stdout', out)
2475 self.assertEqual(0, git_cl.main(['try']))
2476 self.assertEqual(
2477 out.getvalue(),
2478 'scheduled CQ Dry Run on '
2479 'https://chromium-review.googlesource.com/123456\n')
2480
2481 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2482 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2483 lambda _: {
2484 'owner_email': 'owner@e.mail',
2485 'private': False,
2486 'closed': False,
2487 'project': 'depot_tools',
2488 'patchsets': [20001],
2489 })
tandriide281ae2016-10-12 06:02:30 -07002490 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2491 self.calls = [
2492 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2493 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2494 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2495 ((['git', 'config', 'rietveld.server'],),
2496 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002497 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002498 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002499 ]
2500
2501 def _buildbucket_retry(*_, **kw):
2502 # self.maxDiff = 10000
2503 body = json.loads(kw['body'])
2504 self.assertEqual(len(body['builds']), 1)
2505 build = body['builds'][0]
2506 params = json.loads(build.pop('parameters_json'))
2507 self.assertEqual(params, {
2508 u'builder_name': u'win',
2509 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2510 u'revision': None}],
2511 u'properties': {
2512 u'category': u'git_cl_try',
2513 u'issue': 123,
2514 u'key': u'val',
2515 u'json': [{u'a': 1}, None],
2516 u'master': u'tryserver.chromium',
2517 u'patch_project': u'depot_tools',
2518 u'patch_storage': u'rietveld',
2519 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002520 u'rietveld': u'https://codereview.chromium.org',
2521 }
2522 })
2523 self.assertEqual(build, {
2524 u'bucket': u'master.tryserver.chromium',
2525 u'client_operation_id': u'uuid4',
2526 u'tags': [u'builder:win',
2527 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002528 u'user_agent:git_cl_try',
2529 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002530 })
2531
2532 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2533
2534 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2535 self.assertEqual(0, git_cl.main([
2536 'try', '-m', 'tryserver.chromium', '-b', 'win',
2537 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2538 self.assertRegexpMatches(
2539 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002540 'Tried jobs on:\nBucket: master.tryserver.chromium')
2541
tandrii8c5a3532016-11-04 07:52:02 -07002542 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2543 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2544 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2545
2546 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2547 # Get realistic expectations.
2548 gerrit_change_list_impl._GetGerritHost()
2549 return self._mocked_call(['_GetChangeDetail', opts or []])
2550 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2551 _GetChangeDetail)
2552
2553 self.calls = [
2554 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2555 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2556 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2557 ((['git', 'config', 'branch.feature.gerritserver'],),
2558 'https://chromium-review.googlesource.com'),
2559 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002560 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2561 {'owner': {'email': 'owner@e.mail'}}),
2562 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2563 'project': 'depot_tools',
2564 'revisions': {
2565 'deadbeaf': {
2566 '_number': 6,
2567 },
2568 'beeeeeef': {
2569 '_number': 7,
2570 'fetch': {'http': {
2571 'url': 'https://chromium.googlesource.com/depot_tools',
2572 'ref': 'refs/changes/56/123456/7'
2573 }},
2574 },
2575 },
2576 }),
2577 ]
2578
2579 def _buildbucket_retry(*_, **kw):
2580 # self.maxDiff = 10000
2581 body = json.loads(kw['body'])
2582 self.assertEqual(len(body['builds']), 1)
2583 build = body['builds'][0]
2584 params = json.loads(build.pop('parameters_json'))
2585 self.assertEqual(params, {
2586 u'builder_name': u'win',
2587 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2588 u'revision': None}],
2589 u'properties': {
2590 u'category': u'git_cl_try',
2591 u'key': u'val',
2592 u'json': [{u'a': 1}, None],
2593 u'master': u'tryserver.chromium',
2594
2595 u'patch_gerrit_url':
2596 u'https://chromium-review.googlesource.com',
2597 u'patch_issue': 123456,
2598 u'patch_project': u'depot_tools',
2599 u'patch_ref': u'refs/changes/56/123456/7',
2600 u'patch_repository_url':
2601 u'https://chromium.googlesource.com/depot_tools',
2602 u'patch_set': 7,
2603 u'patch_storage': u'gerrit',
2604 }
2605 })
2606 self.assertEqual(build, {
2607 u'bucket': u'master.tryserver.chromium',
2608 u'client_operation_id': u'uuid4',
2609 u'tags': [
2610 u'builder:win',
2611 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2612 u'user_agent:git_cl_try',
2613 u'master:tryserver.chromium'],
2614 })
2615
2616 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2617
2618 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2619 self.assertEqual(0, git_cl.main([
2620 'try', '-m', 'tryserver.chromium', '-b', 'win',
2621 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2622 self.assertRegexpMatches(
2623 git_cl.sys.stdout.getvalue(),
2624 'Tried jobs on:\nBucket: master.tryserver.chromium')
2625
borenet6c0efe62016-10-19 08:13:29 -07002626 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002627 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2628 lambda _: {
2629 'owner_email': 'owner@e.mail',
2630 'private': False,
2631 'closed': False,
2632 'project': 'depot_tools',
2633 'patchsets': [20001],
2634 })
borenet6c0efe62016-10-19 08:13:29 -07002635 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2636 self.calls = [
2637 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2638 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2639 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2640 ((['git', 'config', 'rietveld.server'],),
2641 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002642 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002643 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002644 ]
2645
2646 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002647 body = json.loads(kw['body'])
2648 self.assertEqual(len(body['builds']), 1)
2649 build = body['builds'][0]
2650 params = json.loads(build.pop('parameters_json'))
2651 self.assertEqual(params, {
2652 u'builder_name': u'win',
2653 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2654 u'revision': None}],
2655 u'properties': {
2656 u'category': u'git_cl_try',
2657 u'issue': 123,
2658 u'patch_project': u'depot_tools',
2659 u'patch_storage': u'rietveld',
2660 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002661 u'rietveld': u'https://codereview.chromium.org',
2662 }
2663 })
2664 self.assertEqual(build, {
2665 u'bucket': u'test.bucket',
2666 u'client_operation_id': u'uuid4',
2667 u'tags': [u'builder:win',
2668 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2669 u'user_agent:git_cl_try'],
2670 })
2671
2672 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2673
2674 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2675 self.assertEqual(0, git_cl.main([
2676 'try', '-B', 'test.bucket', '-b', 'win']))
2677 self.assertRegexpMatches(
2678 git_cl.sys.stdout.getvalue(),
2679 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002680
qyearsley123a4682016-10-26 09:12:17 -07002681 def test_git_cl_try_bots_on_multiple_masters(self):
2682 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2683 self.calls = [
2684 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2685 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2686 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2687 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002688 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002689 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2690 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2691 ]
2692
2693 def _buildbucket_retry(*_, **kw):
2694 body = json.loads(kw['body'])
2695 self.assertEqual(len(body['builds']), 2)
2696
2697 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2698 self.assertEqual(first_build_params['builder_name'], 'builder1')
2699 self.assertEqual(first_build_params['properties']['master'], 'master1')
2700
2701 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2702 self.assertEqual(first_build_params['builder_name'], 'builder2')
2703 self.assertEqual(first_build_params['properties']['master'], 'master2')
2704
2705 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2706
2707 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2708 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2709
2710 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2711 self.assertEqual(
2712 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2713 self.assertEqual(
2714 git_cl.sys.stdout.getvalue(),
2715 'Tried jobs on:\n'
2716 'Bucket: master.master1\n'
2717 ' builder1: []\n'
2718 'Bucket: master.master2\n'
2719 ' builder2: []\n'
2720 'To see results here, run: git cl try-results\n'
2721 'To see results in browser, run: git cl web\n')
2722
tandrii16e0b4e2016-06-07 10:34:28 -07002723 def _common_GerritCommitMsgHookCheck(self):
2724 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2725 self.mock(git_cl.os.path, 'abspath',
2726 lambda path: self._mocked_call(['abspath', path]))
2727 self.mock(git_cl.os.path, 'exists',
2728 lambda path: self._mocked_call(['exists', path]))
2729 self.mock(git_cl.gclient_utils, 'FileRead',
2730 lambda path: self._mocked_call(['FileRead', path]))
2731 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2732 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2733 self.calls = [
2734 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2735 ((['abspath', '../'],), '/abs/git_repo_root'),
2736 ]
2737 return git_cl.Changelist(codereview='gerrit', issue=123)
2738
2739 def test_GerritCommitMsgHookCheck_custom_hook(self):
2740 cl = self._common_GerritCommitMsgHookCheck()
2741 self.calls += [
2742 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2743 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2744 '#!/bin/sh\necho "custom hook"')
2745 ]
2746 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2747
2748 def test_GerritCommitMsgHookCheck_not_exists(self):
2749 cl = self._common_GerritCommitMsgHookCheck()
2750 self.calls += [
2751 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2752 ]
2753 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2754
2755 def test_GerritCommitMsgHookCheck(self):
2756 cl = self._common_GerritCommitMsgHookCheck()
2757 self.calls += [
2758 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2759 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2760 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2761 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2762 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2763 ''),
2764 ]
2765 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2766
tandriic4344b52016-08-29 06:04:54 -07002767 def test_GerritCmdLand(self):
2768 self.calls += [
2769 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2770 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2771 'deadbeaf'),
2772 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2773 ((['git', 'config', 'branch.feature.gerritserver'],),
2774 'chromium-review.googlesource.com'),
2775 ]
2776 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2777 cl._codereview_impl._GetChangeDetail = lambda _: {
2778 'labels': {},
2779 'current_revision': 'deadbeaf',
2780 }
agable32978d92016-11-01 12:55:02 -07002781 cl._codereview_impl._GetChangeCommit = lambda: {
2782 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002783 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002784 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2785 }
tandriic4344b52016-08-29 06:04:54 -07002786 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002787 out = StringIO.StringIO()
2788 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002789 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002790 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002791 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002792
tandrii221ab252016-10-06 08:12:04 -07002793 BUILDBUCKET_BUILDS_MAP = {
2794 '9000': {
2795 'id': '9000',
2796 'status': 'STARTED',
2797 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2798 'result_details_json': '{"properties": {}}',
2799 'bucket': 'master.x.y',
2800 'created_by': 'user:someone@chromium.org',
2801 'created_ts': '147200002222000',
2802 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2803 },
2804 '8000': {
2805 'id': '8000',
2806 'status': 'COMPLETED',
2807 'result': 'FAILURE',
2808 'failure_reason': 'BUILD_FAILURE',
2809 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2810 'result_details_json': '{"properties": {}}',
2811 'bucket': 'master.x.y',
2812 'created_by': 'user:someone@chromium.org',
2813 'created_ts': '147200001111000',
2814 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2815 },
2816 }
2817
2818 def test_write_try_results_json(self):
2819 expected_output = [
2820 {
2821 'buildbucket_id': '8000',
2822 'bucket': 'master.x.y',
2823 'builder_name': 'my-builder',
2824 'status': 'COMPLETED',
2825 'result': 'FAILURE',
2826 'failure_reason': 'BUILD_FAILURE',
2827 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2828 },
2829 {
2830 'buildbucket_id': '9000',
2831 'bucket': 'master.x.y',
2832 'builder_name': 'my-builder',
2833 'status': 'STARTED',
2834 'result': None,
2835 'failure_reason': None,
2836 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2837 }
2838 ]
2839 self.calls = [(('write_json', 'output.json', expected_output), '')]
2840 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2841
tandrii45b2a582016-10-11 03:14:16 -07002842 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002843 out = StringIO.StringIO()
2844 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002845 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2846 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002847 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2848 self._mocked_call(['get_authenticator_for_host', host]))
2849 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2850 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002851
2852 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2853 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002854 self.calls += [
2855 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2856 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2857 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2858 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2859 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2860 ((['git', 'config', 'branch.feature.rietveldserver'],),
2861 'codereview.example.com'),
2862 ((['get_authenticator_for_host', 'codereview.example.com'],),
2863 AuthenticatorMock()),
2864 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2865
2866 def test_fetch_try_jobs_none_rietveld(self):
2867 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002868 # Simulate that user isn't logged in.
2869 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002870 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002871 self.assertRegexpMatches(sys.stdout.getvalue(),
2872 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002873 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2874
2875 def test_fetch_try_jobs_some_rietveld(self):
2876 self._setup_fetch_try_jobs_rietveld({
2877 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2878 })
2879 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002880 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2881 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2882 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2883
2884 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2885 self._setup_fetch_try_jobs(most_recent_patchset=13)
2886 self.calls += [
2887 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2888 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2889 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002890 # TODO(tandrii): Uncomment the below if we decide to support checking
2891 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002892 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002893 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002894 ((['git', 'config', 'branch.feature.gerritserver'],),
2895 'https://x-review.googlesource.com'),
2896 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2897 AuthenticatorMock()),
2898 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2899
2900 def test_fetch_try_jobs_none_gerrit(self):
2901 self._setup_fetch_try_jobs_gerrit({})
2902 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002903 # TODO(tandrii): Uncomment the below if we decide to support checking
2904 # patchsets for Gerrit.
2905 # self.assertRegexpMatches(
2906 # sys.stdout.getvalue(),
2907 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002908 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2909
2910 def test_fetch_try_jobs_some_gerrit(self):
2911 self._setup_fetch_try_jobs_gerrit({
2912 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2913 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002914 # TODO(tandrii): Uncomment the below if we decide to support checking
2915 # patchsets for Gerrit.
2916 # self.calls.remove(
2917 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002918 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2919
2920 # ... and doesn't result in warning.
2921 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2922 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002923 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2924 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2925
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002926
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002927if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002928 git_cl.logging.basicConfig(
2929 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002930 unittest.main()