blob: 68186da5dcac865faf2233674214118aad06939c [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
118 # pylint: disable=R0201
119 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):
145 def __init__(self): # pylint: disable=W0231
146 # 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',
Andrii Shyshkalova5a1eea2016-12-14 14:21:32 +00001367 ref_suffix='', 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
1438 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1439 if ref_suffix:
1440 ref_suffix += ',' + notify_suffix
1441 else:
1442 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001443
ukai@chromium.orge8077812012-02-03 03:41:46 +00001444 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001445 ref_suffix += ',' + ','.join('r=%s' % email
1446 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001447 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001448 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001449 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001450 ('remote:\n'
1451 'remote: Processing changes: (\)\n'
1452 'remote: Processing changes: (|)\n'
1453 'remote: Processing changes: (/)\n'
1454 'remote: Processing changes: (-)\n'
1455 'remote: Processing changes: new: 1 (/)\n'
1456 'remote: Processing changes: new: 1, done\n'
1457 'remote:\n'
1458 'remote: New Changes:\n'
1459 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1460 'remote:\n'
1461 'To https://chromium.googlesource.com/yyy/zzz\n'
1462 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001463 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001464 if squash:
1465 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001466 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001467 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001468 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001469 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001470 ((['git', 'config', 'branch.master.gerritsquashhash',
1471 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001472 ]
tandrii88189772016-09-29 04:29:57 -07001473 calls += [
1474 ((['git', 'config', 'rietveld.cc'],), ''),
1475 ((['AddReviewers', 'chromium-review.googlesource.com',
1476 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -07001477 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -07001478 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001479 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001480 return calls
1481
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001482 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001483 self,
1484 upload_args,
1485 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001486 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001487 squash=True,
1488 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001489 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001490 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001491 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001492 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001493 issue=None,
1494 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001495 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001496 if squash_mode is None:
1497 if '--no-squash' in upload_args:
1498 squash_mode = 'nosquash'
1499 elif '--squash' in upload_args:
1500 squash_mode = 'squash'
1501 else:
1502 squash_mode = 'default'
1503
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001504 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001505 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001506 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001507 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001508 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001509 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1510 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001511 self.mock(git_cl.gclient_utils, 'RunEditor',
1512 lambda *_, **__: self._mocked_call(['RunEditor']))
1513 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001514 self.mock(git_cl.gerrit_util, 'AddReviewers',
1515 lambda h, i, add, is_reviewer: self._mocked_call(
1516 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001517
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001518 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001519 self.calls += self._gerrit_upload_calls(
1520 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001521 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001522 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalova5a1eea2016-12-14 14:21:32 +00001523 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001524 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001525 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001526 # Uncomment when debugging.
1527 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001528 git_cl.main(['upload'] + upload_args)
1529
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001530 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001531 self._run_gerrit_upload_test(
1532 ['--no-squash'],
1533 'desc\n\nBUG=\n',
1534 [],
1535 squash=False,
1536 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1537
1538 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001539 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001540 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001541 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001542 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001543 [],
tandriia60502f2016-06-20 02:01:53 -07001544 squash=False,
1545 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001546 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001547
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001548 def test_gerrit_no_reviewer(self):
1549 self._run_gerrit_upload_test(
1550 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001551 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001552 [],
1553 squash=False,
1554 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001555
tandriieefe8322016-08-17 10:12:24 -07001556 def test_gerrit_patch_bad_chars(self):
1557 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001558 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001559 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001560 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001561 squash=False,
1562 squash_mode='override_nosquash',
Andrii Shyshkalova5a1eea2016-12-14 14:21:32 +00001563 ref_suffix='%m=Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001564 self.assertIn(
1565 'WARNING: Patchset title may only contain alphanumeric chars '
1566 'and spaces. Cleaned up title:\nDont put bad chars\n',
1567 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001568
ukai@chromium.orge8077812012-02-03 03:41:46 +00001569 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001570 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001571 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001572 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001573 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001574 squash=False,
1575 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001576 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001577
1578 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001579 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001580 [],
bradnelsond975b302016-10-23 12:20:23 -07001581 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1582 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001583 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001584 ['reviewer@example.com', 'another@example.com'],
1585 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001586 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001587 ref_suffix='%l=Code-Review+1',
1588 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001589
1590 def test_gerrit_upload_squash_first_is_default(self):
1591 # Mock Gerrit CL description to indicate the first upload.
1592 self.mock(git_cl.Changelist, 'GetDescription',
1593 lambda *_: None)
1594 self._run_gerrit_upload_test(
1595 [],
1596 'desc\nBUG=\n\nChange-Id: 123456789',
1597 [],
1598 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001599
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001600 def test_gerrit_upload_squash_first(self):
1601 # Mock Gerrit CL description to indicate the first upload.
1602 self.mock(git_cl.Changelist, 'GetDescription',
1603 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001604 self._run_gerrit_upload_test(
1605 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001606 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001607 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001608 squash=True,
1609 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001610
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001611 def test_gerrit_upload_squash_reupload(self):
1612 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1613 # Mock Gerrit CL description to indicate re-upload.
1614 self.mock(git_cl.Changelist, 'GetDescription',
1615 lambda *args: description)
1616 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1617 lambda *args: 1)
1618 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1619 lambda *args: {'change_id': '123456789'})
1620 self._run_gerrit_upload_test(
1621 ['--squash'],
1622 description,
1623 [],
1624 squash=True,
1625 expected_upstream_ref='origin/master',
1626 issue=123456)
1627
rmistry@google.com2dd99862015-06-22 12:22:18 +00001628 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001629 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001630 def mock_run_git(*args, **_kwargs):
1631 if args[0] == ['for-each-ref',
1632 '--format=%(refname:short) %(upstream:short)',
1633 'refs/heads']:
1634 # Create a local branch dependency tree that looks like this:
1635 # test1 -> test2 -> test3 -> test4 -> test5
1636 # -> test3.1
1637 # test6 -> test0
1638 branch_deps = [
1639 'test2 test1', # test1 -> test2
1640 'test3 test2', # test2 -> test3
1641 'test3.1 test2', # test2 -> test3.1
1642 'test4 test3', # test3 -> test4
1643 'test5 test4', # test4 -> test5
1644 'test6 test0', # test0 -> test6
1645 'test7', # test7
1646 ]
1647 return '\n'.join(branch_deps)
1648 self.mock(git_cl, 'RunGit', mock_run_git)
1649
1650 class RecordCalls:
1651 times_called = 0
1652 record_calls = RecordCalls()
1653 def mock_CMDupload(*args, **_kwargs):
1654 record_calls.times_called += 1
1655 return 0
1656 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1657
1658 self.calls = [
1659 (('[Press enter to continue or ctrl-C to quit]',), ''),
1660 ]
1661
1662 class MockChangelist():
1663 def __init__(self):
1664 pass
1665 def GetBranch(self):
1666 return 'test1'
1667 def GetIssue(self):
1668 return '123'
1669 def GetPatchset(self):
1670 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001671 def IsGerrit(self):
1672 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001673
1674 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1675 # CMDupload should have been called 5 times because of 5 dependent branches.
1676 self.assertEquals(5, record_calls.times_called)
1677 self.assertEquals(0, ret)
1678
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001679 def test_gerrit_change_id(self):
1680 self.calls = [
1681 ((['git', 'write-tree'], ),
1682 'hashtree'),
1683 ((['git', 'rev-parse', 'HEAD~0'], ),
1684 'branch-parent'),
1685 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1686 'A B <a@b.org> 1456848326 +0100'),
1687 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1688 'C D <c@d.org> 1456858326 +0100'),
1689 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1690 'hashchange'),
1691 ]
1692 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1693 self.assertEqual(change_id, 'Ihashchange')
1694
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001695 def test_desecription_append_footer(self):
1696 for init_desc, footer_line, expected_desc in [
1697 # Use unique desc first lines for easy test failure identification.
1698 ('foo', 'R=one', 'foo\n\nR=one'),
1699 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1700 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1701 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1702 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1703 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1704 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1705 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1706 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1707 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1708 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1709 ]:
1710 desc = git_cl.ChangeDescription(init_desc)
1711 desc.append_footer(footer_line)
1712 self.assertEqual(desc.description, expected_desc)
1713
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001714 def test_update_reviewers(self):
1715 data = [
1716 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001717 ('foo\nR=xx', [], 'foo\nR=xx'),
1718 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001719 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001720 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1721 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1722 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001723 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001724 ('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 +00001725 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001726 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1727 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1728 # Same as the line before, but full of whitespaces.
1729 (
1730 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1731 'foo\nBar\n\nR=c@c\n BUG =',
1732 ),
1733 # Whitespaces aren't interpreted as new lines.
1734 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001735 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001736 expected = [i[2] for i in data]
1737 actual = []
1738 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001739 obj = git_cl.ChangeDescription(orig)
1740 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001741 actual.append(obj.description)
1742 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001743
wittman@chromium.org455dc922015-01-26 20:15:50 +00001744 def test_get_target_ref(self):
1745 # Check remote or remote branch not present.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001746 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001747 self.assertEqual(None, git_cl.GetTargetRef(None,
1748 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001749 'master', False))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001750
wittman@chromium.org455dc922015-01-26 20:15:50 +00001751 # Check default target refs for branches.
1752 self.assertEqual('refs/heads/master',
1753 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001754 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001755 self.assertEqual('refs/heads/master',
1756 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001757 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001758 self.assertEqual('refs/heads/master',
1759 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001760 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001761 self.assertEqual('refs/branch-heads/123',
1762 git_cl.GetTargetRef('origin',
1763 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001764 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001765 self.assertEqual('refs/diff/test',
1766 git_cl.GetTargetRef('origin',
1767 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001768 None, False))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001769 self.assertEqual('refs/heads/chrome/m42',
1770 git_cl.GetTargetRef('origin',
1771 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001772 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001773
1774 # Check target refs for user-specified target branch.
1775 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1776 'refs/remotes/branch-heads/123'):
1777 self.assertEqual('refs/branch-heads/123',
1778 git_cl.GetTargetRef('origin',
1779 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001780 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001781 for branch in ('origin/master', 'remotes/origin/master',
1782 'refs/remotes/origin/master'):
1783 self.assertEqual('refs/heads/master',
1784 git_cl.GetTargetRef('origin',
1785 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001786 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001787 for branch in ('master', 'heads/master', 'refs/heads/master'):
1788 self.assertEqual('refs/heads/master',
1789 git_cl.GetTargetRef('origin',
1790 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001791 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001792
1793 # Check target refs for pending prefix.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001794 self.mock(git_cl._GitNumbererState, 'load',
1795 classmethod(lambda *_: git_cl._GitNumbererState('prefix', False)))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001796 self.assertEqual('prefix/heads/master',
1797 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001798 None, True,
1799 'https://remote.url/some.git'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001800
wychen@chromium.orga872e752015-04-28 23:42:18 +00001801 def test_patch_when_dirty(self):
1802 # Patch when local tree is dirty
1803 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1804 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1805
1806 def test_diff_when_dirty(self):
1807 # Do 'git cl diff' when local tree is dirty
1808 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1809 self.assertNotEqual(git_cl.main(['diff']), 0)
1810
tandriidf09a462016-08-18 16:23:55 -07001811 def _patch_common(self, is_gerrit=False, force_codereview=False,
1812 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001813 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001814 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1815 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001816 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1817 lambda *args: {
1818 'current_revision': '7777777777',
1819 'revisions': {
1820 '1111111111': {
1821 '_number': 1,
1822 'fetch': {'http': {
1823 'url': 'https://chromium.googlesource.com/my/repo',
1824 'ref': 'refs/changes/56/123456/1',
1825 }},
1826 },
1827 '7777777777': {
1828 '_number': 7,
1829 'fetch': {'http': {
1830 'url': 'https://chromium.googlesource.com/my/repo',
1831 'ref': 'refs/changes/56/123456/7',
1832 }},
1833 },
1834 },
1835 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836 self.mock(git_cl.Changelist, 'GetDescription',
1837 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001838 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1839
tandriidf09a462016-08-18 16:23:55 -07001840 if new_branch:
1841 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1842 else:
1843 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001844 if not force_codereview:
1845 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001846 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001847 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001848 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1849 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001850 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001851 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001852
1853 if is_gerrit:
1854 if not force_codereview:
1855 self.calls += [
1856 ((['git', 'config', 'gerrit.host'],), 'true'),
1857 ]
1858 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001859 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001860 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001861 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001862 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001863 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001864 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001865
tandriidf09a462016-08-18 16:23:55 -07001866 def _common_patch_successful(self, new_branch=False):
1867 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001868 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001869 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001870 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001871 'patch from issue 123456 at patchset 60001 ' +
1872 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001873 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001874 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001875 ((['git', 'config', 'branch.master.rietveldserver',
1876 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001877 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001878 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001879 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001880
1881 def test_patch_successful(self):
1882 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001883 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1884
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001885 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001886 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001887 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1888
wychen@chromium.orga872e752015-04-28 23:42:18 +00001889 def test_patch_conflict(self):
1890 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001891 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001892 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001893
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001894 def test_gerrit_patch_successful(self):
1895 self._patch_common(is_gerrit=True)
1896 self.calls += [
1897 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1898 'refs/changes/56/123456/7'],), ''),
1899 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001900 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001901 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001902 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1903 ((['git', 'config', 'branch.master.merge'],), 'master'),
1904 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1905 ((['git', 'config', 'remote.origin.url'],),
1906 'https://chromium.googlesource.com/my/repo'),
1907 ((['git', 'config', 'branch.master.gerritserver',
1908 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001909 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001910 ]
1911 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1912
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001913 def test_patch_force_codereview(self):
1914 self._patch_common(is_gerrit=True, force_codereview=True)
1915 self.calls += [
1916 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1917 'refs/changes/56/123456/7'],), ''),
1918 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1919 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001920 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001921 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001922 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1923 ((['git', 'config', 'branch.master.merge'],), 'master'),
1924 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1925 ((['git', 'config', 'remote.origin.url'],),
1926 'https://chromium.googlesource.com/my/repo'),
1927 ((['git', 'config', 'branch.master.gerritserver',
1928 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001929 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001930 ]
1931 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1932
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001933 def test_gerrit_patch_url_successful(self):
1934 self._patch_common(is_gerrit=True)
1935 self.calls += [
1936 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1937 'refs/changes/56/123456/1'],), ''),
1938 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001939 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001940 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001941 ((['git', 'config', 'branch.master.gerritserver',
1942 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001943 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001944 ]
1945 self.assertEqual(git_cl.main(
1946 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1947
1948 def test_gerrit_patch_conflict(self):
1949 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001950 self.calls += [
1951 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1952 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001953 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1954 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1955 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001956 ]
1957 with self.assertRaises(SystemExitMock):
1958 git_cl.main(['patch',
1959 'https://chromium-review.googlesource.com/#/c/123456/1'])
1960
tandriic2405f52016-10-10 08:13:15 -07001961 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001962 def notExists(_issue, *_, **kwargs):
1963 self.assertFalse(kwargs['ignore_404'])
1964 raise git_cl.gerrit_util.GerritError(404, '')
1965 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1966
tandriic2405f52016-10-10 08:13:15 -07001967 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001968 self.calls = [
1969 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1970 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1971 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1972 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1973 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1974 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001975 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001976 'or you have no access to it'],), SystemExitMock()),
1977 ]
1978 with self.assertRaises(SystemExitMock):
1979 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1980
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001981 def _checkout_calls(self):
1982 return [
1983 ((['git', 'config', '--local', '--get-regexp',
1984 'branch\\..*\\.rietveldissue'], ),
1985 ('branch.retrying.rietveldissue 1111111111\n'
1986 'branch.some-fix.rietveldissue 2222222222\n')),
1987 ((['git', 'config', '--local', '--get-regexp',
1988 'branch\\..*\\.gerritissue'], ),
1989 ('branch.ger-branch.gerritissue 123456\n'
1990 'branch.gbranch654.gerritissue 654321\n')),
1991 ]
1992
1993 def test_checkout_gerrit(self):
1994 """Tests git cl checkout <issue>."""
1995 self.calls = self._checkout_calls()
1996 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1997 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1998
1999 def test_checkout_rietveld(self):
2000 """Tests git cl checkout <issue>."""
2001 self.calls = self._checkout_calls()
2002 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2003 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2004
2005 def test_checkout_not_found(self):
2006 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002007 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002008 self.calls = self._checkout_calls()
2009 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2010
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002011 def test_checkout_no_branch_issues(self):
2012 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002013 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002014 self.calls = [
2015 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002016 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002017 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002018 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002019 ]
2020 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2021
tandrii@chromium.org28253532016-04-14 13:46:56 +00002022 def _test_gerrit_ensure_authenticated_common(self, auth,
2023 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002024 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2025 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2026 self.mock(git_cl, 'DieWithError',
2027 lambda msg: self._mocked_call(['DieWithError', msg]))
2028 self.mock(git_cl, 'ask_for_data',
2029 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002030 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002031 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002032 cl.branch = 'master'
2033 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002034 cl.lookedup_issue = True
2035 return cl
2036
2037 def test_gerrit_ensure_authenticated_missing(self):
2038 cl = self._test_gerrit_ensure_authenticated_common(auth={
2039 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
2040 })
2041 self.calls.append(
2042 ((['DieWithError',
2043 'Credentials for the following hosts are required:\n'
2044 ' chromium-review.googlesource.com\n'
2045 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
2046 'You can (re)generate your credentails by visiting '
2047 'https://chromium-review.googlesource.com/new-password'],), ''),)
2048 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2049
2050 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002051 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002052 cl = self._test_gerrit_ensure_authenticated_common(auth={
2053 'chromium.googlesource.com': 'one',
2054 'chromium-review.googlesource.com': 'other',
2055 })
2056 self.calls.append(
2057 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07002058 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002059 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2060
2061 def test_gerrit_ensure_authenticated_ok(self):
2062 cl = self._test_gerrit_ensure_authenticated_common(auth={
2063 'chromium.googlesource.com': 'same',
2064 'chromium-review.googlesource.com': 'same',
2065 })
2066 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2067
tandrii@chromium.org28253532016-04-14 13:46:56 +00002068 def test_gerrit_ensure_authenticated_skipped(self):
2069 cl = self._test_gerrit_ensure_authenticated_common(
2070 auth={}, skip_auth_check=True)
2071 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2072
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002073 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002074 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2075 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002076 self.calls = [
2077 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002078 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002079 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2080 ((['git', 'config', 'rietveld.server'],), ''),
2081 ((['git', 'config', 'rietveld.server'],), ''),
2082 ((['git', 'config', 'branch.feature.rietveldserver'],),
2083 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002084 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002085 ]
2086 self.assertEqual(0, git_cl.main(['set-commit']))
2087
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002088 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002089 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002090 lambda h, i, labels, notify=None:
2091 self._mocked_call(['SetReview', h, i, labels, notify]))
2092
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'],), CERR1),
2096 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002097 ((['git', 'config', 'branch.feature.gerritserver'],),
2098 'https://chromium-review.googlesource.com'),
2099 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002100 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002101 ]
tandriid9e5ce52016-07-13 02:32:59 -07002102
2103 def test_cmd_set_commit_gerrit_clear(self):
2104 self._cmd_set_commit_gerrit_common(0)
2105 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2106
2107 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002108 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002109 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2110
tandriid9e5ce52016-07-13 02:32:59 -07002111 def test_cmd_set_commit_gerrit(self):
2112 self._cmd_set_commit_gerrit_common(2)
2113 self.assertEqual(0, git_cl.main(['set-commit']))
2114
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002115 def test_description_display(self):
2116 out = StringIO.StringIO()
2117 self.mock(git_cl.sys, 'stdout', out)
2118
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002119 self.mock(git_cl, 'Changelist', ChangelistMock)
2120 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002121
2122 self.assertEqual(0, git_cl.main(['description', '-d']))
2123 self.assertEqual('foo\n', out.getvalue())
2124
2125 def test_description_rietveld(self):
2126 out = StringIO.StringIO()
2127 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002128 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002129
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002130 self.assertEqual(0, git_cl.main([
2131 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2132 self.assertEqual('foobar\n', out.getvalue())
2133
iannucci3c972b92016-08-17 13:24:10 -07002134 def test_StatusFieldOverrideIssueMissingArgs(self):
2135 out = StringIO.StringIO()
2136 self.mock(git_cl.sys, 'stderr', out)
2137
2138 try:
2139 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2140 except SystemExit as ex:
2141 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002142 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002143
2144 out = StringIO.StringIO()
2145 self.mock(git_cl.sys, 'stderr', out)
2146
2147 try:
2148 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2149 except SystemExit as ex:
2150 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002151 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002152
2153 def test_StatusFieldOverrideIssue(self):
2154 out = StringIO.StringIO()
2155 self.mock(git_cl.sys, 'stdout', out)
2156
2157 def assertIssue(cl_self, *_args):
2158 self.assertEquals(cl_self.issue, 1)
2159 return 'foobar'
2160
2161 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2162 self.calls = [
2163 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2164 ((['git', 'config', 'rietveld.server'],), ''),
2165 ((['git', 'config', 'rietveld.server'],), ''),
2166 ]
iannuccie53c9352016-08-17 14:40:40 -07002167 self.assertEqual(
2168 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2169 0)
iannucci3c972b92016-08-17 13:24:10 -07002170 self.assertEqual(out.getvalue(), 'foobar\n')
2171
iannuccie53c9352016-08-17 14:40:40 -07002172 def test_SetCloseOverrideIssue(self):
2173 def assertIssue(cl_self, *_args):
2174 self.assertEquals(cl_self.issue, 1)
2175 return 'foobar'
2176
2177 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2178 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2179 self.calls = [
2180 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2181 ((['git', 'config', 'rietveld.server'],), ''),
2182 ((['git', 'config', 'rietveld.server'],), ''),
2183 ]
2184 self.assertEqual(
2185 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2186
2187 def test_SetCommitOverrideIssue(self):
2188 def assertIssue(cl_self, *_args):
2189 self.assertEquals(cl_self.issue, 1)
2190 return 'foobar'
2191
2192 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2193 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2194 self.calls = [
2195 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2196 ((['git', 'config', 'rietveld.server'],), ''),
2197 ((['git', 'config', 'rietveld.server'],), ''),
2198 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2199 ((['git', 'config', 'rietveld.server'],), ''),
2200 ((['git', 'config', 'rietveld.server'],), ''),
2201 ]
2202 self.assertEqual(
2203 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2204
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002205 def test_description_gerrit(self):
2206 out = StringIO.StringIO()
2207 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002208 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002209
2210 self.assertEqual(0, git_cl.main([
2211 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2212 self.assertEqual('foobar\n', out.getvalue())
2213
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002214 def test_description_set_raw(self):
2215 out = StringIO.StringIO()
2216 self.mock(git_cl.sys, 'stdout', out)
2217
2218 self.mock(git_cl, 'Changelist', ChangelistMock)
2219 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2220
2221 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2222 self.assertEqual('hihi', ChangelistMock.desc)
2223
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002224 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002225 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002226
2227 def RunEditor(desc, _, **kwargs):
2228 self.assertEquals(
2229 '# Enter a description of the change.\n'
2230 '# This will be displayed on the codereview site.\n'
2231 '# The first line will also be used as the subject of the review.\n'
2232 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002233 '--------------------\n'
2234 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002235 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002236 # Simulate user changing something.
2237 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002238
dsansomee2d6fd92016-09-08 00:10:47 -07002239 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002240 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002241
2242 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2243 self.mock(git_cl.Changelist, 'GetDescription',
2244 lambda *args: current_desc)
2245 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2246 UpdateDescriptionRemote)
2247 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2248
2249 self.calls = [
2250 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002251 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002252 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2253 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002254 ((['git', 'config', 'core.editor'],), 'vi'),
2255 ]
2256 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2257
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002258 def test_description_set_stdin(self):
2259 out = StringIO.StringIO()
2260 self.mock(git_cl.sys, 'stdout', out)
2261
2262 self.mock(git_cl, 'Changelist', ChangelistMock)
2263 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2264
2265 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2266 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2267
kmarshall3bff56b2016-06-06 18:31:47 -07002268 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002269 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2270
kmarshall3bff56b2016-06-06 18:31:47 -07002271 self.calls = \
2272 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2273 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002274 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002275 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2276 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002277 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2278 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2279 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002280 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2281 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2282 ((['git', 'branch', '-D', 'foo'],), '')]
2283
kmarshall3bff56b2016-06-06 18:31:47 -07002284 self.mock(git_cl, 'get_cl_statuses',
2285 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002286 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2287 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2288 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002289
2290 self.assertEqual(0, git_cl.main(['archive', '-f']))
2291
2292 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002293 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002294 self.calls = \
2295 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2296 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002297 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002298 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2299 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002300 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2301
kmarshall9249e012016-08-23 12:02:16 -07002302 self.mock(git_cl, 'get_cl_statuses',
2303 lambda branches, fine_grained, max_processes:
2304 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2305
2306 self.assertEqual(1, git_cl.main(['archive', '-f']))
2307
2308 def test_archive_dry_run(self):
2309 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2310
2311 self.calls = \
2312 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2313 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2314 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2315 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2316 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2317 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2318 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2319 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2320 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002321
2322 self.mock(git_cl, 'get_cl_statuses',
2323 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002324 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2325 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2326 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002327
kmarshall9249e012016-08-23 12:02:16 -07002328 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2329
2330 def test_archive_no_tags(self):
2331 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2332
2333 self.calls = \
2334 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2335 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2336 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2337 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2338 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2339 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2340 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2341 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2342 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2343 ((['git', 'branch', '-D', 'foo'],), '')]
2344
2345 self.mock(git_cl, 'get_cl_statuses',
2346 lambda branches, fine_grained, max_processes:
2347 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2348 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2349 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2350
2351 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002352
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002353 def test_cmd_issue_erase_existing(self):
2354 out = StringIO.StringIO()
2355 self.mock(git_cl.sys, 'stdout', out)
2356 self.calls = [
2357 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002358 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2359 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002360 # Let this command raise exception (retcode=1) - it should be ignored.
2361 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002362 CERR1),
2363 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2364 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002365 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2366 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2367 ''),
2368 ]
2369 self.assertEqual(0, git_cl.main(['issue', '0']))
2370
phajdan.jre328cf92016-08-22 04:12:17 -07002371 def test_cmd_issue_json(self):
2372 out = StringIO.StringIO()
2373 self.mock(git_cl.sys, 'stdout', out)
2374 self.calls = [
2375 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002376 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002377 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2378 ((['git', 'config', 'rietveld.server'],),
2379 'https://codereview.chromium.org'),
2380 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2381 (('write_json', 'output.json',
2382 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2383 ''),
2384 ]
2385 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2386
tandriide281ae2016-10-12 06:02:30 -07002387 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002388 self.mock(git_cl.Changelist, 'GetChange',
2389 lambda _, *a: (
2390 self._mocked_call(['GetChange']+list(a))))
2391 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2392 lambda *_, **__: (
2393 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002394 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2395 lambda _, s: self._mocked_call(['SetCQState', s]))
2396 self.calls = [
2397 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002398 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002399 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2400 ((['git', 'config', 'rietveld.server'],),
2401 'https://codereview.chromium.org'),
2402 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2403 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2404 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2405 ((['get_or_create_merge_base', 'feature', 'feature'],),
2406 'fake_ancestor_sha'),
2407 ((['GetChange', 'fake_ancestor_sha', None], ),
2408 git_cl.presubmit_support.GitChange(
2409 '', '', '', '', '', '', '', '')),
2410 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2411 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002412 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2413 ]
2414 out = StringIO.StringIO()
2415 self.mock(git_cl.sys, 'stdout', out)
2416 self.assertEqual(0, git_cl.main(['try']))
2417 self.assertEqual(
2418 out.getvalue(),
2419 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2420
tandrii8c5a3532016-11-04 07:52:02 -07002421 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2422 self.mock(git_cl.Changelist, 'GetChange',
2423 lambda _, *a: (
2424 self._mocked_call(['GetChange']+list(a))))
2425 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2426 lambda *_, **__: (
2427 self._mocked_call(['DoGetTryMasters'])))
2428 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2429 lambda _, s: self._mocked_call(['SetCQState', s]))
2430
2431 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2432 # Get realistic expectations.
2433 gerrit_change_list_impl._GetGerritHost()
2434 return self._mocked_call(['_GetChangeDetail', opts or []])
2435 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2436 _GetChangeDetail)
2437
2438 self.calls = [
2439 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2440 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2441 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2442 ((['git', 'config', 'branch.feature.gerritserver'],),
2443 'https://chromium-review.googlesource.com'),
2444 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2445 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2446 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2447 ((['get_or_create_merge_base', 'feature', 'feature'],),
2448 'fake_ancestor_sha'),
2449 ((['GetChange', 'fake_ancestor_sha', None], ),
2450 git_cl.presubmit_support.GitChange(
2451 '', '', '', '', '', '', '', '')),
2452 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2453 ((['DoGetTryMasters'], ), None),
2454 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2455 ]
2456 out = StringIO.StringIO()
2457 self.mock(git_cl.sys, 'stdout', out)
2458 self.assertEqual(0, git_cl.main(['try']))
2459 self.assertEqual(
2460 out.getvalue(),
2461 'scheduled CQ Dry Run on '
2462 'https://chromium-review.googlesource.com/123456\n')
2463
2464 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2465 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2466 lambda _: {
2467 'owner_email': 'owner@e.mail',
2468 'private': False,
2469 'closed': False,
2470 'project': 'depot_tools',
2471 'patchsets': [20001],
2472 })
tandriide281ae2016-10-12 06:02:30 -07002473 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2474 self.calls = [
2475 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2476 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2477 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2478 ((['git', 'config', 'rietveld.server'],),
2479 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002480 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002481 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002482 ]
2483
2484 def _buildbucket_retry(*_, **kw):
2485 # self.maxDiff = 10000
2486 body = json.loads(kw['body'])
2487 self.assertEqual(len(body['builds']), 1)
2488 build = body['builds'][0]
2489 params = json.loads(build.pop('parameters_json'))
2490 self.assertEqual(params, {
2491 u'builder_name': u'win',
2492 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2493 u'revision': None}],
2494 u'properties': {
2495 u'category': u'git_cl_try',
2496 u'issue': 123,
2497 u'key': u'val',
2498 u'json': [{u'a': 1}, None],
2499 u'master': u'tryserver.chromium',
2500 u'patch_project': u'depot_tools',
2501 u'patch_storage': u'rietveld',
2502 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002503 u'rietveld': u'https://codereview.chromium.org',
2504 }
2505 })
2506 self.assertEqual(build, {
2507 u'bucket': u'master.tryserver.chromium',
2508 u'client_operation_id': u'uuid4',
2509 u'tags': [u'builder:win',
2510 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002511 u'user_agent:git_cl_try',
2512 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002513 })
2514
2515 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2516
2517 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2518 self.assertEqual(0, git_cl.main([
2519 'try', '-m', 'tryserver.chromium', '-b', 'win',
2520 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2521 self.assertRegexpMatches(
2522 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002523 'Tried jobs on:\nBucket: master.tryserver.chromium')
2524
tandrii8c5a3532016-11-04 07:52:02 -07002525 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2526 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2527 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2528
2529 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2530 # Get realistic expectations.
2531 gerrit_change_list_impl._GetGerritHost()
2532 return self._mocked_call(['_GetChangeDetail', opts or []])
2533 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2534 _GetChangeDetail)
2535
2536 self.calls = [
2537 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2538 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2539 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2540 ((['git', 'config', 'branch.feature.gerritserver'],),
2541 'https://chromium-review.googlesource.com'),
2542 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002543 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2544 {'owner': {'email': 'owner@e.mail'}}),
2545 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2546 'project': 'depot_tools',
2547 'revisions': {
2548 'deadbeaf': {
2549 '_number': 6,
2550 },
2551 'beeeeeef': {
2552 '_number': 7,
2553 'fetch': {'http': {
2554 'url': 'https://chromium.googlesource.com/depot_tools',
2555 'ref': 'refs/changes/56/123456/7'
2556 }},
2557 },
2558 },
2559 }),
2560 ]
2561
2562 def _buildbucket_retry(*_, **kw):
2563 # self.maxDiff = 10000
2564 body = json.loads(kw['body'])
2565 self.assertEqual(len(body['builds']), 1)
2566 build = body['builds'][0]
2567 params = json.loads(build.pop('parameters_json'))
2568 self.assertEqual(params, {
2569 u'builder_name': u'win',
2570 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2571 u'revision': None}],
2572 u'properties': {
2573 u'category': u'git_cl_try',
2574 u'key': u'val',
2575 u'json': [{u'a': 1}, None],
2576 u'master': u'tryserver.chromium',
2577
2578 u'patch_gerrit_url':
2579 u'https://chromium-review.googlesource.com',
2580 u'patch_issue': 123456,
2581 u'patch_project': u'depot_tools',
2582 u'patch_ref': u'refs/changes/56/123456/7',
2583 u'patch_repository_url':
2584 u'https://chromium.googlesource.com/depot_tools',
2585 u'patch_set': 7,
2586 u'patch_storage': u'gerrit',
2587 }
2588 })
2589 self.assertEqual(build, {
2590 u'bucket': u'master.tryserver.chromium',
2591 u'client_operation_id': u'uuid4',
2592 u'tags': [
2593 u'builder:win',
2594 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2595 u'user_agent:git_cl_try',
2596 u'master:tryserver.chromium'],
2597 })
2598
2599 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2600
2601 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2602 self.assertEqual(0, git_cl.main([
2603 'try', '-m', 'tryserver.chromium', '-b', 'win',
2604 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2605 self.assertRegexpMatches(
2606 git_cl.sys.stdout.getvalue(),
2607 'Tried jobs on:\nBucket: master.tryserver.chromium')
2608
borenet6c0efe62016-10-19 08:13:29 -07002609 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002610 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2611 lambda _: {
2612 'owner_email': 'owner@e.mail',
2613 'private': False,
2614 'closed': False,
2615 'project': 'depot_tools',
2616 'patchsets': [20001],
2617 })
borenet6c0efe62016-10-19 08:13:29 -07002618 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2619 self.calls = [
2620 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2621 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2622 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2623 ((['git', 'config', 'rietveld.server'],),
2624 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002625 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002626 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002627 ]
2628
2629 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002630 body = json.loads(kw['body'])
2631 self.assertEqual(len(body['builds']), 1)
2632 build = body['builds'][0]
2633 params = json.loads(build.pop('parameters_json'))
2634 self.assertEqual(params, {
2635 u'builder_name': u'win',
2636 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2637 u'revision': None}],
2638 u'properties': {
2639 u'category': u'git_cl_try',
2640 u'issue': 123,
2641 u'patch_project': u'depot_tools',
2642 u'patch_storage': u'rietveld',
2643 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002644 u'rietveld': u'https://codereview.chromium.org',
2645 }
2646 })
2647 self.assertEqual(build, {
2648 u'bucket': u'test.bucket',
2649 u'client_operation_id': u'uuid4',
2650 u'tags': [u'builder:win',
2651 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2652 u'user_agent:git_cl_try'],
2653 })
2654
2655 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2656
2657 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2658 self.assertEqual(0, git_cl.main([
2659 'try', '-B', 'test.bucket', '-b', 'win']))
2660 self.assertRegexpMatches(
2661 git_cl.sys.stdout.getvalue(),
2662 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002663
qyearsley123a4682016-10-26 09:12:17 -07002664 def test_git_cl_try_bots_on_multiple_masters(self):
2665 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2666 self.calls = [
2667 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2668 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2669 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2670 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002671 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002672 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2673 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2674 ]
2675
2676 def _buildbucket_retry(*_, **kw):
2677 body = json.loads(kw['body'])
2678 self.assertEqual(len(body['builds']), 2)
2679
2680 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2681 self.assertEqual(first_build_params['builder_name'], 'builder1')
2682 self.assertEqual(first_build_params['properties']['master'], 'master1')
2683
2684 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2685 self.assertEqual(first_build_params['builder_name'], 'builder2')
2686 self.assertEqual(first_build_params['properties']['master'], 'master2')
2687
2688 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2689
2690 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2691 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2692
2693 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2694 self.assertEqual(
2695 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2696 self.assertEqual(
2697 git_cl.sys.stdout.getvalue(),
2698 'Tried jobs on:\n'
2699 'Bucket: master.master1\n'
2700 ' builder1: []\n'
2701 'Bucket: master.master2\n'
2702 ' builder2: []\n'
2703 'To see results here, run: git cl try-results\n'
2704 'To see results in browser, run: git cl web\n')
2705
tandrii16e0b4e2016-06-07 10:34:28 -07002706 def _common_GerritCommitMsgHookCheck(self):
2707 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2708 self.mock(git_cl.os.path, 'abspath',
2709 lambda path: self._mocked_call(['abspath', path]))
2710 self.mock(git_cl.os.path, 'exists',
2711 lambda path: self._mocked_call(['exists', path]))
2712 self.mock(git_cl.gclient_utils, 'FileRead',
2713 lambda path: self._mocked_call(['FileRead', path]))
2714 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2715 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2716 self.calls = [
2717 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2718 ((['abspath', '../'],), '/abs/git_repo_root'),
2719 ]
2720 return git_cl.Changelist(codereview='gerrit', issue=123)
2721
2722 def test_GerritCommitMsgHookCheck_custom_hook(self):
2723 cl = self._common_GerritCommitMsgHookCheck()
2724 self.calls += [
2725 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2726 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2727 '#!/bin/sh\necho "custom hook"')
2728 ]
2729 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2730
2731 def test_GerritCommitMsgHookCheck_not_exists(self):
2732 cl = self._common_GerritCommitMsgHookCheck()
2733 self.calls += [
2734 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2735 ]
2736 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2737
2738 def test_GerritCommitMsgHookCheck(self):
2739 cl = self._common_GerritCommitMsgHookCheck()
2740 self.calls += [
2741 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2742 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2743 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2744 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2745 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2746 ''),
2747 ]
2748 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2749
tandriic4344b52016-08-29 06:04:54 -07002750 def test_GerritCmdLand(self):
2751 self.calls += [
2752 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2753 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2754 'deadbeaf'),
2755 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2756 ((['git', 'config', 'branch.feature.gerritserver'],),
2757 'chromium-review.googlesource.com'),
2758 ]
2759 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2760 cl._codereview_impl._GetChangeDetail = lambda _: {
2761 'labels': {},
2762 'current_revision': 'deadbeaf',
2763 }
agable32978d92016-11-01 12:55:02 -07002764 cl._codereview_impl._GetChangeCommit = lambda: {
2765 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002766 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002767 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2768 }
tandriic4344b52016-08-29 06:04:54 -07002769 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002770 out = StringIO.StringIO()
2771 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002772 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002773 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002774 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002775
tandrii221ab252016-10-06 08:12:04 -07002776 BUILDBUCKET_BUILDS_MAP = {
2777 '9000': {
2778 'id': '9000',
2779 'status': 'STARTED',
2780 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2781 'result_details_json': '{"properties": {}}',
2782 'bucket': 'master.x.y',
2783 'created_by': 'user:someone@chromium.org',
2784 'created_ts': '147200002222000',
2785 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2786 },
2787 '8000': {
2788 'id': '8000',
2789 'status': 'COMPLETED',
2790 'result': 'FAILURE',
2791 'failure_reason': 'BUILD_FAILURE',
2792 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2793 'result_details_json': '{"properties": {}}',
2794 'bucket': 'master.x.y',
2795 'created_by': 'user:someone@chromium.org',
2796 'created_ts': '147200001111000',
2797 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2798 },
2799 }
2800
2801 def test_write_try_results_json(self):
2802 expected_output = [
2803 {
2804 'buildbucket_id': '8000',
2805 'bucket': 'master.x.y',
2806 'builder_name': 'my-builder',
2807 'status': 'COMPLETED',
2808 'result': 'FAILURE',
2809 'failure_reason': 'BUILD_FAILURE',
2810 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2811 },
2812 {
2813 'buildbucket_id': '9000',
2814 'bucket': 'master.x.y',
2815 'builder_name': 'my-builder',
2816 'status': 'STARTED',
2817 'result': None,
2818 'failure_reason': None,
2819 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2820 }
2821 ]
2822 self.calls = [(('write_json', 'output.json', expected_output), '')]
2823 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2824
tandrii45b2a582016-10-11 03:14:16 -07002825 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002826 out = StringIO.StringIO()
2827 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002828 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2829 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002830 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2831 self._mocked_call(['get_authenticator_for_host', host]))
2832 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2833 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002834
2835 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2836 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002837 self.calls += [
2838 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2839 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2840 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2841 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2842 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2843 ((['git', 'config', 'branch.feature.rietveldserver'],),
2844 'codereview.example.com'),
2845 ((['get_authenticator_for_host', 'codereview.example.com'],),
2846 AuthenticatorMock()),
2847 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2848
2849 def test_fetch_try_jobs_none_rietveld(self):
2850 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002851 # Simulate that user isn't logged in.
2852 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002853 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002854 self.assertRegexpMatches(sys.stdout.getvalue(),
2855 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002856 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2857
2858 def test_fetch_try_jobs_some_rietveld(self):
2859 self._setup_fetch_try_jobs_rietveld({
2860 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2861 })
2862 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002863 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2864 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2865 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2866
2867 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2868 self._setup_fetch_try_jobs(most_recent_patchset=13)
2869 self.calls += [
2870 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2871 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2872 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002873 # TODO(tandrii): Uncomment the below if we decide to support checking
2874 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002875 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002876 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002877 ((['git', 'config', 'branch.feature.gerritserver'],),
2878 'https://x-review.googlesource.com'),
2879 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2880 AuthenticatorMock()),
2881 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2882
2883 def test_fetch_try_jobs_none_gerrit(self):
2884 self._setup_fetch_try_jobs_gerrit({})
2885 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002886 # TODO(tandrii): Uncomment the below if we decide to support checking
2887 # patchsets for Gerrit.
2888 # self.assertRegexpMatches(
2889 # sys.stdout.getvalue(),
2890 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002891 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2892
2893 def test_fetch_try_jobs_some_gerrit(self):
2894 self._setup_fetch_try_jobs_gerrit({
2895 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2896 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002897 # TODO(tandrii): Uncomment the below if we decide to support checking
2898 # patchsets for Gerrit.
2899 # self.calls.remove(
2900 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002901 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2902
2903 # ... and doesn't result in warning.
2904 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2905 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002906 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2907 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2908
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002909
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002910if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002911 git_cl.logging.basicConfig(
2912 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002913 unittest.main()