blob: 81540a9d33063d04c3f4e31edb5e53ce20028285 [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
390
391 def test_git_number_cherry_pick(self):
392 actual = self._test_git_number(
393 'Parent\n'
394 '\n'
395 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
396 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
397 dest_ref='refs/heads/branch',
398 child_msg='Child, which is cherry-pick from master\n'
399 '\n'
400 'Cr-Commit-Position: refs/heads/master@{#100}\n'
401 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
402 self.assertEqualByLine(
403 actual,
404 'Child, which is cherry-pick from master\n'
405 '\n'
406 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
407 '\n'
408 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
409 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
410 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
411
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000412
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000413class TestGitCl(TestCase):
414 def setUp(self):
415 super(TestGitCl, self).setUp()
416 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700417 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000418 self.mock(subprocess2, 'call', self._mocked_call)
419 self.mock(subprocess2, 'check_call', self._mocked_call)
420 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700421 self.mock(subprocess2, 'communicate',
422 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000423 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000424 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000425 self.mock(git_common, 'get_or_create_merge_base',
426 lambda *a: (
427 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000428 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000429 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000430 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700431 self.mock(git_cl, 'write_json', lambda path, contents:
432 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000433 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000434 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000435 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700436 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
437 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000438 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000439 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000440 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000441 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
442 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700443 self.mock(git_cl, 'DieWithError',
444 lambda msg: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000445 # It's important to reset settings to not have inter-tests interference.
446 git_cl.settings = None
447
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000448
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000449 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000450 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000451 # Note: has_failed returns True if at least 1 test ran so far, current
452 # included, has failed. That means current test may have actually ran
453 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000454 if not self.has_failed():
455 self.assertEquals([], self.calls)
456 finally:
457 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000458
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000459 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000460 self.assertTrue(
461 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700462 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000463 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000464 expected_args, result = top
465
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000466 # Also logs otherwise it could get caught in a try/finally and be hard to
467 # diagnose.
468 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700469 N = 5
470 prior_calls = '\n '.join(
471 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
472 for i, c in enumerate(self._calls_done[-N:]))
473 following_calls = '\n '.join(
474 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
475 for i, c in enumerate(self.calls[:N]))
476 extended_msg = (
477 'A few prior calls:\n %s\n\n'
478 'This (expected):\n @%d: %r\n'
479 'This (actual):\n @%d: %r\n\n'
480 'A few following expected calls:\n %s' %
481 (prior_calls, len(self._calls_done), expected_args,
482 len(self._calls_done), args, following_calls))
483 git_cl.logging.error(extended_msg)
484
tandrii99a72f22016-08-17 14:33:24 -0700485 self.fail('@%d\n'
486 ' Expected: %r\n'
487 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700488 len(self._calls_done), expected_args, args))
489
490 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700491 if isinstance(result, Exception):
492 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000493 return result
494
tandrii48df5812016-10-17 03:55:37 -0700495 def test_LoadCodereviewSettingsFromFile_gerrit(self):
496 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
497 self.calls = [
498 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
499 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
500 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
501 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
502 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
503 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
504 ((['git', 'config', '--unset-all', 'rietveld.force-https-commit-url'],),
505 CERR1),
506 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
507 CERR1),
508 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
509 ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],),
510 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700511 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
512 CERR1),
513 ((['git', 'config', 'gerrit.host', 'true'],), ''),
514 ]
515 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
516
maruel@chromium.orga3353652011-11-30 14:26:57 +0000517 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000518 def _is_gerrit_calls(cls, gerrit=False):
519 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
520 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
521
522 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000523 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000524 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000525 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000526
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000527 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000528 def _upload_no_rev_calls(cls, similarity, find_copies):
529 return (cls._git_base_calls(similarity, find_copies) +
530 cls._git_upload_no_rev_calls())
531
532 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000533 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000534 if similarity is None:
535 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700536 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700537 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000538 else:
tandrii33a46ff2016-08-23 05:53:40 -0700539 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700540 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000541
542 if find_copies is None:
543 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700544 find_copies_call = ((['git', 'config', '--bool',
545 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000546 else:
tandrii5d48c322016-08-18 16:19:37 -0700547 val = str(find_copies).lower()
548 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000549 'branch.master.git-find-copies', val],), '')
550
551 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000552 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800553 '-l100000', '-C'+similarity,
554 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000555 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000556 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000557 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000558
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000559 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000560 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000561 similarity_call,
562 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
563 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000564 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000565 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700566 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
567 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000568 ((['git', 'config', 'rietveld.server'],),
569 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000570 ((['git', 'config', 'branch.master.merge'],), 'master'),
571 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000572 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000573 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000574 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000575 ((['git', 'rev-parse', '--show-cdup'],), ''),
576 ((['git', 'rev-parse', 'HEAD'],), '12345'),
577 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000578 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000579 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700580 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000581 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000582 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000583 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000584 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000585 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000586 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000587 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000588 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000589 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000590 ]
591
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000592 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000593 def _git_upload_no_rev_calls(cls):
594 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000595 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000596 ]
597
598 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000599 def _git_upload_calls(cls, private):
600 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000601 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000602 private_call = []
603 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000604 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000605 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000606 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000607
maruel@chromium.orga3353652011-11-30 14:26:57 +0000608 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000609 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000610 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000611 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000612 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000613 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000614 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
615 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000616 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000617 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000618 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700619 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000620 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000621 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000622 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700623 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000624 ] + cls._git_post_upload_calls()
625
626 @classmethod
627 def _git_post_upload_calls(cls):
628 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000629 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
630 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
631 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000632 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000633 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000634 ]
635
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000636 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000637 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000638 fake_ancestor = 'fake_ancestor'
639 fake_cl = 'fake_cl_for_patch'
640 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000641 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000642 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000643 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000644 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000645 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000646 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000647 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000648 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700649 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000650 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000651 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000652 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000653 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000654 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000655 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000656 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000657 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000658 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000659 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000660 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000661
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000662 @classmethod
663 def _dcommit_calls_1(cls):
664 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000665 ((['git', 'config', 'rietveld.autoupdate'],),
666 ''),
667 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
668 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000669 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000670 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000671 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
672 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
673 None),
674 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000675 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700676 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700677 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000678 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700679 ((['git', 'config', '--bool',
680 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000681 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
682 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700683 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000684 ((['git',
685 'config', 'rietveld.server'],), 'codereview.example.com'),
686 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000687 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000688 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000689 ((['git', 'config', 'branch.working.merge'],),
690 'refs/heads/master'),
691 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000692 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000693 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000694 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000695 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000696 'refs/remotes/origin/master'],),
697 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000698 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000699 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000700 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000701 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000702 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000703 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000704 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000705 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000706 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000707 ]
708
709 @classmethod
710 def _dcommit_calls_normal(cls):
711 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000712 ((['git', 'rev-parse', '--show-cdup'],), ''),
713 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000714 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000715 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000716 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000717 '.'],),
718 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000719 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700720 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000721 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000722 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000723 ((['git', 'config', 'user.email'],), 'author@example.com'),
724 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000725 ]
726
727 @classmethod
728 def _dcommit_calls_bypassed(cls):
729 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000730 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000731 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000732 ]
733
734 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000735 def _dcommit_calls_3(cls):
736 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000737 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -0800738 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
739 'fake_ancestor_sha', 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000740 (' PRESUBMIT.py | 2 +-\n'
741 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000742 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700743 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000744 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
745 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700746 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000747 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000748 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
749 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
750 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000751 'Issue: 12345\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100752 'Review-Url: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000753 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000754 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000755 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000756 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000757 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000758 ((['git', 'checkout', '-q', 'working'],), ''),
759 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000760 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000761
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000762 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700763 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000764 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000765 return [
766 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000767 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000768 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000769 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700770 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000771 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000772 '--git_similarity', similarity or '50'
773 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000774 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000775 ]
776
777 def _run_reviewer_test(
778 self,
779 upload_args,
780 expected_description,
781 returned_description,
782 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000783 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700784 private=False,
785 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000786 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000787 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000788 try:
789 similarity = upload_args[upload_args.index('--similarity')+1]
790 except ValueError:
791 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000792
793 if '--find-copies' in upload_args:
794 find_copies = True
795 elif '--no-find-copies' in upload_args:
796 find_copies = False
797 else:
798 find_copies = None
799
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000800 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700801 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000802
803 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000804
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000805 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000806 self.assertEquals(
807 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000808 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000809 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000810 '#--------------------This line is 72 characters long'
811 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000812 expected_description,
813 desc)
814 return returned_description
815 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000816
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000817 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000818 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700819 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000820 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000821 return 1, 2
822 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000823
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000824 git_cl.main(['upload'] + upload_args)
825
826 def test_no_reviewer(self):
827 self._run_reviewer_test(
828 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000829 'desc\n\nBUG=',
830 '# Blah blah comment.\ndesc\n\nBUG=',
831 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000832 [])
833
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000834 def test_keep_similarity(self):
835 self._run_reviewer_test(
836 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000837 'desc\n\nBUG=',
838 '# Blah blah comment.\ndesc\n\nBUG=',
839 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000840 [])
841
iannucci@chromium.org79540052012-10-19 23:15:26 +0000842 def test_keep_find_copies(self):
843 self._run_reviewer_test(
844 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000845 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000846 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000847 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000848 [])
849
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000850 def test_private(self):
851 self._run_reviewer_test(
852 ['--private'],
853 'desc\n\nBUG=',
854 '# Blah blah comment.\ndesc\n\nBUG=\n',
855 'desc\n\nBUG=',
856 [])
857
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000858 def test_reviewers_cmd_line(self):
859 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000860 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000861 self._run_reviewer_test(
862 ['-r' 'foo@example.com'],
863 description,
864 '\n%s\n' % description,
865 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000866 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000867
868 def test_reviewer_tbr_overriden(self):
869 # Reviewer is overriden with TBR
870 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000871 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000872 self._run_reviewer_test(
873 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000874 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000875 description.strip('\n'),
876 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000877 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000878
879 def test_reviewer_multiple(self):
880 # Handles multiple R= or TBR= lines.
881 description = (
bradnelsond975b302016-10-23 12:20:23 -0700882 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
883 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000884 self._run_reviewer_test(
885 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000886 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000887 description,
888 description,
bradnelsond975b302016-10-23 12:20:23 -0700889 ['--reviewers=another@example.com,reviewer@example.com'],
890 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000891
maruel@chromium.orga3353652011-11-30 14:26:57 +0000892 def test_reviewer_send_mail(self):
893 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000894 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000895 self._run_reviewer_test(
896 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000897 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000898 description.strip('\n'),
899 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000900 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000901
902 def test_reviewer_send_mail_no_rev(self):
903 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000904 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700905 self.calls = self._upload_no_rev_calls(None, None) + [
906 ((['DieWithError', 'Must specify reviewers to send email.'],),
907 SystemExitMock())
908 ]
909
910 def RunEditor(desc, _, **kwargs):
911 return desc
912 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
913 self.mock(sys, 'stdout', stdout)
914 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000915 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700916 self.assertEqual(
917 'Using 50% similarity for rename/copy detection. Override with '
918 '--similarity.\n',
919 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000920
tandriif9aefb72016-07-01 09:06:51 -0700921 def test_bug_on_cmd(self):
922 self._run_reviewer_test(
923 ['--bug=500658,proj:123'],
924 'desc\n\nBUG=500658\nBUG=proj:123',
925 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
926 'desc\n\nBUG=500658\nBUG=proj:1234',
927 [])
928
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000929 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000930 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000931 self.calls = (
932 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000933 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000934 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000935 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000936 git_cl.main(['dcommit'])
937
938 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000939 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000940 self.calls = (
941 self._dcommit_calls_1() +
942 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000943 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000944 git_cl.main(['dcommit', '--bypass-hooks'])
945
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100946 def _land_rietveld_common(self, debug=False):
947 if debug:
948 # Very useful due to finally clause in git cl land raising exceptions and
949 # shadowing real cause of failure.
950 self.mock(git_cl, '_IS_BEING_TESTED', True)
951 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100952 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100953
954 self.mock(git_cl._GitNumbererState, 'load', classmethod(lambda _, url, ref:
955 self._mocked_call(['_GitNumbererState', url, ref])))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100956 self.mock(RietveldMock, 'update_description', staticmethod(
957 lambda i, d: self._mocked_call(['update_description', i, d])))
958 self.mock(RietveldMock, 'add_comment', staticmethod(
959 lambda i, c: self._mocked_call(['add_comment', i, c])))
960 self.calls = [
961 ((['git', 'config', 'rietveld.autoupdate'],), ''),
962 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
963 ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
964 CERR1),
965 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
966 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
967 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
968 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
969 CERR1),
970 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
971 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
972 ((['git', 'config', 'rietveld.server'],),
973 'https://codereview.chromium.org'),
974 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
975 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
976 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
977 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
978 ((['git', 'rev-list', '--merges',
979 '--grep=^SVN changes up to revision [0-9]*$',
980 'refs/remotes/origin/master^!'],), ''),
981 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
982 ''), # No commits to rebase, according to local view of origin.
983 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
984 'fake_ancestor_sha'),
985 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
986 ((['git', 'rev-parse', '--show-cdup'],), ''),
987 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
988 ((['git', 'diff', '--name-status', '--no-renames', '-r',
989 'fake_ancestor_sha...', '.'],),
990 'M\tfile1.cpp'),
991 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
992 ((['git', 'config', 'branch.feature.rietveldserver'],),
993 'https://codereview.chromium.org'),
994 ((['git', 'config', 'user.email'],), 'user@e.mail'),
995 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
996 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
997 'fake_ancestor_sha', 'feature'],),
998 # This command just prints smth like this:
999 # file1.cpp | 53 ++++++--
1000 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1001 ''),
1002 ((['git', 'show-ref', '--quiet', '--verify',
1003 'refs/heads/git-cl-commit'],),
1004 ''), # 0 return code means branch exists.
1005 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1006 ((['git', 'show-ref', '--quiet', '--verify',
1007 'refs/heads/git-cl-cherry-pick'],),
1008 CERR1), # This means git-cl-cherry-pick branch does not exist.
1009 ((['git', 'rev-parse', '--show-cdup'],), ''),
1010 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1011 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1012 ((['git', 'commit', '-m',
1013 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001014 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001015 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1016 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1017 ((['git', 'config', '--get', 'remote.origin.url'],),
1018 'https://chromium.googlesource.com/infra/infra'),
1019 ]
1020
1021 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001022 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001023 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001024 ((['git', 'config', 'remote.origin.url'],),
1025 'https://chromium.googlesource.com/infra/infra'),
1026 ((['_GitNumbererState',
1027 'https://chromium.googlesource.com/infra/infra',
1028 'refs/heads/master'],),
1029 git_cl._GitNumbererState(None, False)),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001030 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1031 ''),
1032 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1033 ((['git', 'checkout', '-q', 'feature'],), ''),
1034 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1035 ((['git', 'config', 'rietveld.viewvc-url'],),
1036 'https://chromium.googlesource.com/infra/infra/+/'),
1037 ((['update_description', 123,
1038 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1039 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1040 ''),
1041 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1042 'fake_sha_rebased (presubmit successful).'],), ''),
1043 ]
1044 git_cl.main(['land'])
1045
1046 def test_land_rietveld_gnumbd(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001047 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001048 self.mock(git_cl, 'WaitForRealCommit',
1049 lambda *a: self._mocked_call(['WaitForRealCommit'] + list(a)))
1050 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001051 ((['git', 'config', 'remote.origin.url'],),
1052 'https://chromium.googlesource.com/chromium/src'),
1053 ((['_GitNumbererState',
1054 'https://chromium.googlesource.com/chromium/src',
1055 'refs/heads/master'],),
1056 git_cl._GitNumbererState('refs/pending', True)),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001057 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1058 ((['git', 'retry', 'fetch', 'origin',
1059 '+refs/pending/heads/master:refs/git-cl/pending/heads/master'],), ''),
1060 ((['git', 'checkout', 'refs/git-cl/pending/heads/master'],), ''),
1061 ((['git', 'cherry-pick', 'fake_sha_rebased'],), ''),
1062
1063 ((['git', 'retry', 'push', '--porcelain', 'origin',
1064 'HEAD:refs/pending/heads/master'],),''),
1065 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased_on_pending'),
1066
1067 ((['git', 'checkout', '-q', 'feature'],), ''),
1068 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1069
1070 ((['WaitForRealCommit', 'origin', 'fake_sha_rebased_on_pending',
1071 'refs/remotes/origin/master', 'refs/heads/master'],),
1072 'fake_sha_gnumbded'),
1073
1074 ((['git', 'config', 'rietveld.viewvc-url'],),
1075 'https://chromium.googlesource.com/infra/infra/+/'),
1076 ((['update_description', 123,
1077 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1078 'https://chromium.googlesource.com/infra/infra/+/fake_sha_gnumbded'],),
1079 ''),
1080 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1081 'fake_sha_gnumbded (presubmit successful).'],),
1082 ''),
1083 ]
1084 git_cl.main(['land'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001085
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001086 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001087 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001088
1089 # Special mocks to check validity of timestamp.
1090 original_git_amend_head = git_cl._git_amend_head
1091 def _git_amend_head_mock(msg, tstamp):
1092 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1093 return original_git_amend_head(msg, tstamp)
1094 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1095
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001096 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001097 ((['git', 'config', 'remote.origin.url'],),
1098 'https://chromium.googlesource.com/chromium/src'),
1099 ((['_GitNumbererState',
1100 'https://chromium.googlesource.com/chromium/src',
1101 'refs/heads/master'],),
1102 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001103
1104 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1105 'This is parent commit.\n'
1106 '\n'
1107 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1108 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001109 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1110 '1480022355'), # Committer's unix timestamp.
1111 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1112 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001113
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001114 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001115 ((['git', 'commit', '--amend', '-m',
1116 'Issue: 123\n\nR=john@chromium.org\n'
1117 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001118 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001119 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1120 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1121
1122 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1123 ''),
1124 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1125 ((['git', 'checkout', '-q', 'feature'],), ''),
1126 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1127 ((['git', 'config', 'rietveld.viewvc-url'],),
1128 'https://chromium.googlesource.com/infra/infra/+/'),
1129 ((['update_description', 123,
1130 'Issue: 123\n\nR=john@chromium.org\n'
1131 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001132 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001133 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1134 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1135 'Committed: '
1136 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1137 ''),
1138 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1139 'fake_sha_rebased (presubmit successful).'],), ''),
1140 ]
1141 git_cl.main(['land'])
1142
1143 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001144 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001145 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001146 ((['git', 'config', 'remote.origin.url'],),
1147 'https://chromium.googlesource.com/v8/v8'),
1148 ((['_GitNumbererState',
1149 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'],),
1150 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001151
1152 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1153 'This is parent commit with no footer.'),
1154
1155 ((['git', 'checkout', '-q', 'feature'],), ''),
1156 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1157 ]
1158 with self.assertRaises(ValueError) as cm:
1159 git_cl.main(['land'])
1160 self.assertEqual(cm.exception.message,
1161 'Unable to infer commit position from footers')
1162
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001163 def test_GitNumbererState_not_whitelisted_repo(self):
1164 self.calls = [
1165 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1166 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1167 ]
1168 res = git_cl._GitNumbererState.load(
1169 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1170 remote_ref='refs/whatever')
1171 self.assertEqual(res.pending_prefix, None)
1172 self.assertEqual(res.should_git_number, False)
1173
1174 def test_GitNumbererState_fail_fetch(self):
1175 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1176 self.calls = [
1177 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1178 '+refs/meta/config:refs/git_cl/meta/config',
1179 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), CERR1),
1180 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1181 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
1182 'refs/pending-prefix'),
1183 ]
1184 res = git_cl._GitNumbererState.load(
1185 remote_url='https://chromium.googlesource.com/chromium/src',
1186 remote_ref='refs/whatever')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001187 self.assertEqual(res.pending_prefix, 'refs/pending-prefix/')
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001188 self.assertEqual(res.should_git_number, False)
1189
1190 def test_GitNumbererState_fail_gnumbd_and_validator(self):
1191 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1192 self.calls = [
1193 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1194 '+refs/meta/config:refs/git_cl/meta/config',
1195 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1196 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1197 'ba d conig'),
1198 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1199 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1200 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],), CERR1),
1201 ]
1202 res = git_cl._GitNumbererState.load(
1203 remote_url='https://chromium.googlesource.com/chromium/src',
1204 remote_ref='refs/whatever')
1205 self.assertEqual(res.pending_prefix, None)
1206 self.assertEqual(res.should_git_number, False)
1207
1208 def test_GitNumbererState_valid_configs(self):
1209 class NamedTempFileStab(StringIO.StringIO):
1210 @classmethod
1211 @contextlib.contextmanager
1212 def create(cls, *_, **__):
1213 yield cls()
1214 name = 'tempfile'
1215 self.mock(git_cl.tempfile, 'NamedTemporaryFile', NamedTempFileStab.create)
1216 self.calls = [
1217 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1218 '+refs/meta/config:refs/git_cl/meta/config',
1219 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1220 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1221 '''{
1222 "pending_tag_prefix": "refs/pending-tags",
1223 "pending_ref_prefix": "refs/pending",
1224 "enabled_refglobs": [
1225 "refs/heads/m*"
1226 ]
1227 }
1228 '''),
1229 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1230 '''
1231 [plugin "git-numberer"]
1232 validate-enabled-refglob = refs/else/*
1233 validate-enabled-refglob = refs/heads/*
1234 validate-disabled-refglob = refs/heads/disabled
1235 validate-disabled-refglob = refs/branch-heads/*
1236 '''),
1237 ((['git', 'config', '-f', 'tempfile', '--get-all',
1238 'plugin.git-numberer.validate-enabled-refglob'],),
1239 'refs/else/*\n'
1240 'refs/heads/*\n'),
1241 ((['git', 'config', '-f', 'tempfile', '--get-all',
1242 'plugin.git-numberer.validate-disabled-refglob'],),
1243 'refs/heads/disabled\n'
1244 'refs/branch-heads/*\n'),
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001245 ] * 4 # 4 tests below have exactly same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001246
1247 res = git_cl._GitNumbererState.load(
1248 remote_url='https://chromium.googlesource.com/chromium/src',
1249 remote_ref='refs/heads/master')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001250 self.assertEqual(res.pending_prefix, 'refs/pending/')
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001251 self.assertEqual(res.should_git_number, False)
1252
1253 res = git_cl._GitNumbererState.load(
1254 remote_url='https://chromium.googlesource.com/chromium/src',
1255 remote_ref='refs/heads/test')
1256 self.assertEqual(res.pending_prefix, None)
1257 self.assertEqual(res.should_git_number, True)
1258
1259 res = git_cl._GitNumbererState.load(
1260 remote_url='https://chromium.googlesource.com/chromium/src',
1261 remote_ref='refs/heads/disabled')
1262 self.assertEqual(res.pending_prefix, None)
1263 self.assertEqual(res.should_git_number, False)
1264
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001265 # Validator is disabled by default, even if it's not explicitely in disabled
1266 # refglobs.
1267 res = git_cl._GitNumbererState.load(
1268 remote_url='https://chromium.googlesource.com/chromium/src',
1269 remote_ref='refs/arbitrary/ref')
1270 self.assertEqual(res.pending_prefix, None)
1271 self.assertEqual(res.should_git_number, False)
1272
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001273 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001274 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001275 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001276 if skip_auth_check:
1277 return [((cmd, ), 'true')]
1278
tandrii5d48c322016-08-18 16:19:37 -07001279 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001280 if issue:
1281 calls.extend([
1282 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1283 ])
1284 calls.extend([
1285 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1286 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1287 ((['git', 'config', 'remote.origin.url'],),
1288 'https://chromium.googlesource.com/my/repo'),
1289 ((['git', 'config', 'remote.origin.url'],),
1290 'https://chromium.googlesource.com/my/repo'),
1291 ])
1292 return calls
1293
1294 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001295 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001296 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001297 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001298 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001299 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001300 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001301 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1302 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001303 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001304 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001305 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1306 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001307 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001308 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001309 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001310 ((['get_or_create_merge_base', 'master',
1311 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001312 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001313 # Calls to verify branch point is ancestor
1314 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1315 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1316 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001317 ((['git', 'rev-parse', '--show-cdup'],), ''),
1318 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001319
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001320 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001321 'diff', '--name-status', '--no-renames', '-r',
1322 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001323 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001324 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001325 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001326 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001327 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001328 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001329 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001330 ((['git', 'config', 'user.email'],), 'me@example.com'),
1331 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001332 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1333 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001334 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001335 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001336
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001337 @classmethod
1338 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001339 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001340 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable947f2ee2016-12-13 13:46:13 -08001341 ref_suffix='', title=None, notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001342 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001343 if post_amend_description is None:
1344 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001345 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001346 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001347
tandriia60502f2016-06-20 02:01:53 -07001348 if squash_mode == 'default':
1349 calls.extend([
1350 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1351 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1352 ])
1353 elif squash_mode in ('override_squash', 'override_nosquash'):
1354 calls.extend([
1355 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1356 'true' if squash_mode == 'override_squash' else 'false'),
1357 ])
1358 else:
1359 assert squash_mode in ('squash', 'nosquash')
1360
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001361 # If issue is given, then description is fetched from Gerrit instead.
1362 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001363 calls += [
1364 ((['git', 'log', '--pretty=format:%s\n\n%b',
1365 'fake_ancestor_sha..HEAD'],),
1366 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001367 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001368 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001369 # DownloadGerritHook(False)
1370 ((False, ),
1371 ''),
1372 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001373 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001374 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001375 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001376 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001377 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001378 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001379 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001380 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001381 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001382 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001383 if not issue:
1384 # Prompting to edit description on first upload.
1385 calls += [
1386 ((['git', 'config', 'core.editor'],), ''),
1387 ((['RunEditor'],), description),
1388 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001389 ref_to_push = 'abcdef0123456789'
1390 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001391 ((['git', 'config', 'branch.master.merge'],),
1392 'refs/heads/master'),
1393 ((['git', 'config', 'branch.master.remote'],),
1394 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001395 ((['get_or_create_merge_base', 'master',
1396 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001397 'origin/master'),
1398 ((['git', 'rev-parse', 'HEAD:'],),
1399 '0123456789abcdef'),
1400 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001401 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001402 ref_to_push),
1403 ]
1404 else:
1405 ref_to_push = 'HEAD'
1406
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001407 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001408 ((['git', 'rev-list',
1409 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001410 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001411
Aaron Gable947f2ee2016-12-13 13:46:13 -08001412
1413 if not title:
1414 calls += [
1415 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1416 (('Title for patchset []: ',), ''),
1417 ]
1418 else:
1419 if ref_suffix:
1420 ref_suffix += ',m=' + title
1421 else:
1422 ref_suffix = '%m=' + title
1423
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001424 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1425 if ref_suffix:
1426 ref_suffix += ',' + notify_suffix
1427 else:
1428 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001429
ukai@chromium.orge8077812012-02-03 03:41:46 +00001430 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001431 ref_suffix += ',' + ','.join('r=%s' % email
1432 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001433 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001434 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001435 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001436 ('remote:\n'
1437 'remote: Processing changes: (\)\n'
1438 'remote: Processing changes: (|)\n'
1439 'remote: Processing changes: (/)\n'
1440 'remote: Processing changes: (-)\n'
1441 'remote: Processing changes: new: 1 (/)\n'
1442 'remote: Processing changes: new: 1, done\n'
1443 'remote:\n'
1444 'remote: New Changes:\n'
1445 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1446 'remote:\n'
1447 'To https://chromium.googlesource.com/yyy/zzz\n'
1448 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001449 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001450 if squash:
1451 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001452 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001453 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001454 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001455 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001456 ((['git', 'config', 'branch.master.gerritsquashhash',
1457 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001458 ]
tandrii88189772016-09-29 04:29:57 -07001459 calls += [
1460 ((['git', 'config', 'rietveld.cc'],), ''),
1461 ((['AddReviewers', 'chromium-review.googlesource.com',
1462 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -07001463 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -07001464 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001465 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001466 return calls
1467
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001468 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001469 self,
1470 upload_args,
1471 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001472 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001473 squash=True,
1474 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001475 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001476 ref_suffix='',
Aaron Gable947f2ee2016-12-13 13:46:13 -08001477 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001478 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001479 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001480 issue=None,
1481 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001482 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001483 if squash_mode is None:
1484 if '--no-squash' in upload_args:
1485 squash_mode = 'nosquash'
1486 elif '--squash' in upload_args:
1487 squash_mode = 'squash'
1488 else:
1489 squash_mode = 'default'
1490
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001491 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001492 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001493 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001494 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001495 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001496 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1497 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001498 self.mock(git_cl.gclient_utils, 'RunEditor',
1499 lambda *_, **__: self._mocked_call(['RunEditor']))
1500 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001501 self.mock(git_cl.gerrit_util, 'AddReviewers',
1502 lambda h, i, add, is_reviewer: self._mocked_call(
1503 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001504
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001505 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001506 self.calls += self._gerrit_upload_calls(
1507 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001508 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001509 expected_upstream_ref=expected_upstream_ref,
Aaron Gable947f2ee2016-12-13 13:46:13 -08001510 ref_suffix=ref_suffix, title=title, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001511 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001512 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001513 # Uncomment when debugging.
1514 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001515 git_cl.main(['upload'] + upload_args)
1516
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001517 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001518 self._run_gerrit_upload_test(
1519 ['--no-squash'],
1520 'desc\n\nBUG=\n',
1521 [],
1522 squash=False,
1523 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1524
1525 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001526 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001527 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001528 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001529 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001530 [],
tandriia60502f2016-06-20 02:01:53 -07001531 squash=False,
1532 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001533 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001534
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001535 def test_gerrit_no_reviewer(self):
1536 self._run_gerrit_upload_test(
1537 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001538 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001539 [],
1540 squash=False,
1541 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001542
tandriieefe8322016-08-17 10:12:24 -07001543 def test_gerrit_patch_bad_chars(self):
1544 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001545 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001546 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001547 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001548 squash=False,
1549 squash_mode='override_nosquash',
Aaron Gable947f2ee2016-12-13 13:46:13 -08001550 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001551 self.assertIn(
1552 'WARNING: Patchset title may only contain alphanumeric chars '
1553 'and spaces. Cleaned up title:\nDont put bad chars\n',
1554 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001555
ukai@chromium.orge8077812012-02-03 03:41:46 +00001556 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001557 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001558 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001559 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001560 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001561 squash=False,
1562 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001563 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001564
1565 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001566 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001567 [],
bradnelsond975b302016-10-23 12:20:23 -07001568 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1569 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001570 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001571 ['reviewer@example.com', 'another@example.com'],
1572 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001573 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001574 ref_suffix='%l=Code-Review+1',
1575 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001576
1577 def test_gerrit_upload_squash_first_is_default(self):
1578 # Mock Gerrit CL description to indicate the first upload.
1579 self.mock(git_cl.Changelist, 'GetDescription',
1580 lambda *_: None)
1581 self._run_gerrit_upload_test(
1582 [],
1583 'desc\nBUG=\n\nChange-Id: 123456789',
1584 [],
1585 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001586
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001587 def test_gerrit_upload_squash_first(self):
1588 # Mock Gerrit CL description to indicate the first upload.
1589 self.mock(git_cl.Changelist, 'GetDescription',
1590 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001591 self._run_gerrit_upload_test(
1592 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001593 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001594 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001595 squash=True,
1596 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001597
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001598 def test_gerrit_upload_squash_reupload(self):
1599 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1600 # Mock Gerrit CL description to indicate re-upload.
1601 self.mock(git_cl.Changelist, 'GetDescription',
1602 lambda *args: description)
1603 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1604 lambda *args: 1)
1605 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1606 lambda *args: {'change_id': '123456789'})
1607 self._run_gerrit_upload_test(
1608 ['--squash'],
1609 description,
1610 [],
1611 squash=True,
1612 expected_upstream_ref='origin/master',
1613 issue=123456)
1614
rmistry@google.com2dd99862015-06-22 12:22:18 +00001615 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001616 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001617 def mock_run_git(*args, **_kwargs):
1618 if args[0] == ['for-each-ref',
1619 '--format=%(refname:short) %(upstream:short)',
1620 'refs/heads']:
1621 # Create a local branch dependency tree that looks like this:
1622 # test1 -> test2 -> test3 -> test4 -> test5
1623 # -> test3.1
1624 # test6 -> test0
1625 branch_deps = [
1626 'test2 test1', # test1 -> test2
1627 'test3 test2', # test2 -> test3
1628 'test3.1 test2', # test2 -> test3.1
1629 'test4 test3', # test3 -> test4
1630 'test5 test4', # test4 -> test5
1631 'test6 test0', # test0 -> test6
1632 'test7', # test7
1633 ]
1634 return '\n'.join(branch_deps)
1635 self.mock(git_cl, 'RunGit', mock_run_git)
1636
1637 class RecordCalls:
1638 times_called = 0
1639 record_calls = RecordCalls()
1640 def mock_CMDupload(*args, **_kwargs):
1641 record_calls.times_called += 1
1642 return 0
1643 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1644
1645 self.calls = [
1646 (('[Press enter to continue or ctrl-C to quit]',), ''),
1647 ]
1648
1649 class MockChangelist():
1650 def __init__(self):
1651 pass
1652 def GetBranch(self):
1653 return 'test1'
1654 def GetIssue(self):
1655 return '123'
1656 def GetPatchset(self):
1657 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001658 def IsGerrit(self):
1659 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001660
1661 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1662 # CMDupload should have been called 5 times because of 5 dependent branches.
1663 self.assertEquals(5, record_calls.times_called)
1664 self.assertEquals(0, ret)
1665
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001666 def test_gerrit_change_id(self):
1667 self.calls = [
1668 ((['git', 'write-tree'], ),
1669 'hashtree'),
1670 ((['git', 'rev-parse', 'HEAD~0'], ),
1671 'branch-parent'),
1672 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1673 'A B <a@b.org> 1456848326 +0100'),
1674 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1675 'C D <c@d.org> 1456858326 +0100'),
1676 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1677 'hashchange'),
1678 ]
1679 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1680 self.assertEqual(change_id, 'Ihashchange')
1681
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001682 def test_desecription_append_footer(self):
1683 for init_desc, footer_line, expected_desc in [
1684 # Use unique desc first lines for easy test failure identification.
1685 ('foo', 'R=one', 'foo\n\nR=one'),
1686 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1687 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1688 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1689 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1690 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1691 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1692 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1693 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1694 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1695 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1696 ]:
1697 desc = git_cl.ChangeDescription(init_desc)
1698 desc.append_footer(footer_line)
1699 self.assertEqual(desc.description, expected_desc)
1700
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001701 def test_update_reviewers(self):
1702 data = [
1703 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001704 ('foo\nR=xx', [], 'foo\nR=xx'),
1705 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001706 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001707 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1708 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1709 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001710 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001711 ('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 +00001712 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001713 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1714 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1715 # Same as the line before, but full of whitespaces.
1716 (
1717 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1718 'foo\nBar\n\nR=c@c\n BUG =',
1719 ),
1720 # Whitespaces aren't interpreted as new lines.
1721 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001722 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001723 expected = [i[2] for i in data]
1724 actual = []
1725 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001726 obj = git_cl.ChangeDescription(orig)
1727 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001728 actual.append(obj.description)
1729 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001730
wittman@chromium.org455dc922015-01-26 20:15:50 +00001731 def test_get_target_ref(self):
1732 # Check remote or remote branch not present.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001733 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001734 self.assertEqual(None, git_cl.GetTargetRef(None,
1735 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001736 'master', False))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001737
wittman@chromium.org455dc922015-01-26 20:15:50 +00001738 # Check default target refs for branches.
1739 self.assertEqual('refs/heads/master',
1740 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001741 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001742 self.assertEqual('refs/heads/master',
1743 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001744 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001745 self.assertEqual('refs/heads/master',
1746 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001747 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001748 self.assertEqual('refs/branch-heads/123',
1749 git_cl.GetTargetRef('origin',
1750 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001751 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001752 self.assertEqual('refs/diff/test',
1753 git_cl.GetTargetRef('origin',
1754 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001755 None, False))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001756 self.assertEqual('refs/heads/chrome/m42',
1757 git_cl.GetTargetRef('origin',
1758 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001759 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001760
1761 # Check target refs for user-specified target branch.
1762 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1763 'refs/remotes/branch-heads/123'):
1764 self.assertEqual('refs/branch-heads/123',
1765 git_cl.GetTargetRef('origin',
1766 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001767 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001768 for branch in ('origin/master', 'remotes/origin/master',
1769 'refs/remotes/origin/master'):
1770 self.assertEqual('refs/heads/master',
1771 git_cl.GetTargetRef('origin',
1772 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001773 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001774 for branch in ('master', 'heads/master', 'refs/heads/master'):
1775 self.assertEqual('refs/heads/master',
1776 git_cl.GetTargetRef('origin',
1777 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001778 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001779
1780 # Check target refs for pending prefix.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001781 self.mock(git_cl._GitNumbererState, 'load',
1782 classmethod(lambda *_: git_cl._GitNumbererState('prefix', False)))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001783 self.assertEqual('prefix/heads/master',
1784 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001785 None, True,
1786 'https://remote.url/some.git'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001787
wychen@chromium.orga872e752015-04-28 23:42:18 +00001788 def test_patch_when_dirty(self):
1789 # Patch when local tree is dirty
1790 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1791 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1792
1793 def test_diff_when_dirty(self):
1794 # Do 'git cl diff' when local tree is dirty
1795 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1796 self.assertNotEqual(git_cl.main(['diff']), 0)
1797
tandriidf09a462016-08-18 16:23:55 -07001798 def _patch_common(self, is_gerrit=False, force_codereview=False,
1799 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001800 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001801 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1802 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001803 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1804 lambda *args: {
1805 'current_revision': '7777777777',
1806 'revisions': {
1807 '1111111111': {
1808 '_number': 1,
1809 'fetch': {'http': {
1810 'url': 'https://chromium.googlesource.com/my/repo',
1811 'ref': 'refs/changes/56/123456/1',
1812 }},
1813 },
1814 '7777777777': {
1815 '_number': 7,
1816 'fetch': {'http': {
1817 'url': 'https://chromium.googlesource.com/my/repo',
1818 'ref': 'refs/changes/56/123456/7',
1819 }},
1820 },
1821 },
1822 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001823 self.mock(git_cl.Changelist, 'GetDescription',
1824 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001825 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1826
tandriidf09a462016-08-18 16:23:55 -07001827 if new_branch:
1828 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1829 else:
1830 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001831 if not force_codereview:
1832 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001833 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001834 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001835 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1836 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001837 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001838 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001839
1840 if is_gerrit:
1841 if not force_codereview:
1842 self.calls += [
1843 ((['git', 'config', 'gerrit.host'],), 'true'),
1844 ]
1845 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001846 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001847 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001848 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001849 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001850 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001851 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001852
tandriidf09a462016-08-18 16:23:55 -07001853 def _common_patch_successful(self, new_branch=False):
1854 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001855 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001856 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001857 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001858 'patch from issue 123456 at patchset 60001 ' +
1859 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001860 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001861 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001862 ((['git', 'config', 'branch.master.rietveldserver',
1863 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001864 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001865 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001866 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001867
1868 def test_patch_successful(self):
1869 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001870 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1871
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001872 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001873 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001874 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1875
wychen@chromium.orga872e752015-04-28 23:42:18 +00001876 def test_patch_conflict(self):
1877 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001878 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001879 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001880
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001881 def test_gerrit_patch_successful(self):
1882 self._patch_common(is_gerrit=True)
1883 self.calls += [
1884 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1885 'refs/changes/56/123456/7'],), ''),
1886 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001887 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001888 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001889 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1890 ((['git', 'config', 'branch.master.merge'],), 'master'),
1891 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1892 ((['git', 'config', 'remote.origin.url'],),
1893 'https://chromium.googlesource.com/my/repo'),
1894 ((['git', 'config', 'branch.master.gerritserver',
1895 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001896 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001897 ]
1898 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1899
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001900 def test_patch_force_codereview(self):
1901 self._patch_common(is_gerrit=True, force_codereview=True)
1902 self.calls += [
1903 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1904 'refs/changes/56/123456/7'],), ''),
1905 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1906 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001907 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001908 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001909 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1910 ((['git', 'config', 'branch.master.merge'],), 'master'),
1911 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1912 ((['git', 'config', 'remote.origin.url'],),
1913 'https://chromium.googlesource.com/my/repo'),
1914 ((['git', 'config', 'branch.master.gerritserver',
1915 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001916 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001917 ]
1918 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1919
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001920 def test_gerrit_patch_url_successful(self):
1921 self._patch_common(is_gerrit=True)
1922 self.calls += [
1923 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1924 'refs/changes/56/123456/1'],), ''),
1925 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001926 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001927 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001928 ((['git', 'config', 'branch.master.gerritserver',
1929 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001930 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001931 ]
1932 self.assertEqual(git_cl.main(
1933 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1934
1935 def test_gerrit_patch_conflict(self):
1936 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001937 self.calls += [
1938 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1939 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001940 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1941 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1942 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001943 ]
1944 with self.assertRaises(SystemExitMock):
1945 git_cl.main(['patch',
1946 'https://chromium-review.googlesource.com/#/c/123456/1'])
1947
tandriic2405f52016-10-10 08:13:15 -07001948 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001949 def notExists(_issue, *_, **kwargs):
1950 self.assertFalse(kwargs['ignore_404'])
1951 raise git_cl.gerrit_util.GerritError(404, '')
1952 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1953
tandriic2405f52016-10-10 08:13:15 -07001954 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001955 self.calls = [
1956 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1957 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1958 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1959 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1960 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1961 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001962 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001963 'or you have no access to it'],), SystemExitMock()),
1964 ]
1965 with self.assertRaises(SystemExitMock):
1966 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1967
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001968 def _checkout_calls(self):
1969 return [
1970 ((['git', 'config', '--local', '--get-regexp',
1971 'branch\\..*\\.rietveldissue'], ),
1972 ('branch.retrying.rietveldissue 1111111111\n'
1973 'branch.some-fix.rietveldissue 2222222222\n')),
1974 ((['git', 'config', '--local', '--get-regexp',
1975 'branch\\..*\\.gerritissue'], ),
1976 ('branch.ger-branch.gerritissue 123456\n'
1977 'branch.gbranch654.gerritissue 654321\n')),
1978 ]
1979
1980 def test_checkout_gerrit(self):
1981 """Tests git cl checkout <issue>."""
1982 self.calls = self._checkout_calls()
1983 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1984 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1985
1986 def test_checkout_rietveld(self):
1987 """Tests git cl checkout <issue>."""
1988 self.calls = self._checkout_calls()
1989 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1990 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1991
1992 def test_checkout_not_found(self):
1993 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001994 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001995 self.calls = self._checkout_calls()
1996 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1997
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001998 def test_checkout_no_branch_issues(self):
1999 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002000 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002001 self.calls = [
2002 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002003 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002004 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002005 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002006 ]
2007 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2008
tandrii@chromium.org28253532016-04-14 13:46:56 +00002009 def _test_gerrit_ensure_authenticated_common(self, auth,
2010 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002011 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2012 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2013 self.mock(git_cl, 'DieWithError',
2014 lambda msg: self._mocked_call(['DieWithError', msg]))
2015 self.mock(git_cl, 'ask_for_data',
2016 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002017 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002018 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002019 cl.branch = 'master'
2020 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002021 cl.lookedup_issue = True
2022 return cl
2023
2024 def test_gerrit_ensure_authenticated_missing(self):
2025 cl = self._test_gerrit_ensure_authenticated_common(auth={
2026 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
2027 })
2028 self.calls.append(
2029 ((['DieWithError',
2030 'Credentials for the following hosts are required:\n'
2031 ' chromium-review.googlesource.com\n'
2032 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
2033 'You can (re)generate your credentails by visiting '
2034 'https://chromium-review.googlesource.com/new-password'],), ''),)
2035 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2036
2037 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002038 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002039 cl = self._test_gerrit_ensure_authenticated_common(auth={
2040 'chromium.googlesource.com': 'one',
2041 'chromium-review.googlesource.com': 'other',
2042 })
2043 self.calls.append(
2044 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07002045 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002046 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2047
2048 def test_gerrit_ensure_authenticated_ok(self):
2049 cl = self._test_gerrit_ensure_authenticated_common(auth={
2050 'chromium.googlesource.com': 'same',
2051 'chromium-review.googlesource.com': 'same',
2052 })
2053 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2054
tandrii@chromium.org28253532016-04-14 13:46:56 +00002055 def test_gerrit_ensure_authenticated_skipped(self):
2056 cl = self._test_gerrit_ensure_authenticated_common(
2057 auth={}, skip_auth_check=True)
2058 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2059
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002060 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002061 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2062 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002063 self.calls = [
2064 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002065 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002066 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2067 ((['git', 'config', 'rietveld.server'],), ''),
2068 ((['git', 'config', 'rietveld.server'],), ''),
2069 ((['git', 'config', 'branch.feature.rietveldserver'],),
2070 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002071 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002072 ]
2073 self.assertEqual(0, git_cl.main(['set-commit']))
2074
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002075 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002076 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002077 lambda h, i, labels, notify=None:
2078 self._mocked_call(['SetReview', h, i, labels, notify]))
2079
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002080 self.calls = [
2081 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002082 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2083 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002084 ((['git', 'config', 'branch.feature.gerritserver'],),
2085 'https://chromium-review.googlesource.com'),
2086 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002087 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002088 ]
tandriid9e5ce52016-07-13 02:32:59 -07002089
2090 def test_cmd_set_commit_gerrit_clear(self):
2091 self._cmd_set_commit_gerrit_common(0)
2092 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2093
2094 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002095 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002096 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2097
tandriid9e5ce52016-07-13 02:32:59 -07002098 def test_cmd_set_commit_gerrit(self):
2099 self._cmd_set_commit_gerrit_common(2)
2100 self.assertEqual(0, git_cl.main(['set-commit']))
2101
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002102 def test_description_display(self):
2103 out = StringIO.StringIO()
2104 self.mock(git_cl.sys, 'stdout', out)
2105
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002106 self.mock(git_cl, 'Changelist', ChangelistMock)
2107 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002108
2109 self.assertEqual(0, git_cl.main(['description', '-d']))
2110 self.assertEqual('foo\n', out.getvalue())
2111
2112 def test_description_rietveld(self):
2113 out = StringIO.StringIO()
2114 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002115 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002116
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002117 self.assertEqual(0, git_cl.main([
2118 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2119 self.assertEqual('foobar\n', out.getvalue())
2120
iannucci3c972b92016-08-17 13:24:10 -07002121 def test_StatusFieldOverrideIssueMissingArgs(self):
2122 out = StringIO.StringIO()
2123 self.mock(git_cl.sys, 'stderr', out)
2124
2125 try:
2126 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2127 except SystemExit as ex:
2128 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002129 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002130
2131 out = StringIO.StringIO()
2132 self.mock(git_cl.sys, 'stderr', out)
2133
2134 try:
2135 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2136 except SystemExit as ex:
2137 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002138 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002139
2140 def test_StatusFieldOverrideIssue(self):
2141 out = StringIO.StringIO()
2142 self.mock(git_cl.sys, 'stdout', out)
2143
2144 def assertIssue(cl_self, *_args):
2145 self.assertEquals(cl_self.issue, 1)
2146 return 'foobar'
2147
2148 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2149 self.calls = [
2150 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2151 ((['git', 'config', 'rietveld.server'],), ''),
2152 ((['git', 'config', 'rietveld.server'],), ''),
2153 ]
iannuccie53c9352016-08-17 14:40:40 -07002154 self.assertEqual(
2155 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2156 0)
iannucci3c972b92016-08-17 13:24:10 -07002157 self.assertEqual(out.getvalue(), 'foobar\n')
2158
iannuccie53c9352016-08-17 14:40:40 -07002159 def test_SetCloseOverrideIssue(self):
2160 def assertIssue(cl_self, *_args):
2161 self.assertEquals(cl_self.issue, 1)
2162 return 'foobar'
2163
2164 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2165 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2166 self.calls = [
2167 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2168 ((['git', 'config', 'rietveld.server'],), ''),
2169 ((['git', 'config', 'rietveld.server'],), ''),
2170 ]
2171 self.assertEqual(
2172 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2173
2174 def test_SetCommitOverrideIssue(self):
2175 def assertIssue(cl_self, *_args):
2176 self.assertEquals(cl_self.issue, 1)
2177 return 'foobar'
2178
2179 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2180 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2181 self.calls = [
2182 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2183 ((['git', 'config', 'rietveld.server'],), ''),
2184 ((['git', 'config', 'rietveld.server'],), ''),
2185 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2186 ((['git', 'config', 'rietveld.server'],), ''),
2187 ((['git', 'config', 'rietveld.server'],), ''),
2188 ]
2189 self.assertEqual(
2190 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2191
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002192 def test_description_gerrit(self):
2193 out = StringIO.StringIO()
2194 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002195 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002196
2197 self.assertEqual(0, git_cl.main([
2198 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2199 self.assertEqual('foobar\n', out.getvalue())
2200
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002201 def test_description_set_raw(self):
2202 out = StringIO.StringIO()
2203 self.mock(git_cl.sys, 'stdout', out)
2204
2205 self.mock(git_cl, 'Changelist', ChangelistMock)
2206 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2207
2208 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2209 self.assertEqual('hihi', ChangelistMock.desc)
2210
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002211 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002212 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002213
2214 def RunEditor(desc, _, **kwargs):
2215 self.assertEquals(
2216 '# Enter a description of the change.\n'
2217 '# This will be displayed on the codereview site.\n'
2218 '# The first line will also be used as the subject of the review.\n'
2219 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002220 '--------------------\n'
2221 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002222 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002223 # Simulate user changing something.
2224 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002225
dsansomee2d6fd92016-09-08 00:10:47 -07002226 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002227 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002228
2229 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2230 self.mock(git_cl.Changelist, 'GetDescription',
2231 lambda *args: current_desc)
2232 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2233 UpdateDescriptionRemote)
2234 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2235
2236 self.calls = [
2237 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002238 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002239 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2240 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002241 ((['git', 'config', 'core.editor'],), 'vi'),
2242 ]
2243 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2244
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002245 def test_description_set_stdin(self):
2246 out = StringIO.StringIO()
2247 self.mock(git_cl.sys, 'stdout', out)
2248
2249 self.mock(git_cl, 'Changelist', ChangelistMock)
2250 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2251
2252 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2253 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2254
kmarshall3bff56b2016-06-06 18:31:47 -07002255 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002256 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2257
kmarshall3bff56b2016-06-06 18:31:47 -07002258 self.calls = \
2259 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2260 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002261 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002262 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2263 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002264 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2265 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2266 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002267 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2268 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2269 ((['git', 'branch', '-D', 'foo'],), '')]
2270
kmarshall3bff56b2016-06-06 18:31:47 -07002271 self.mock(git_cl, 'get_cl_statuses',
2272 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002273 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2274 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2275 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002276
2277 self.assertEqual(0, git_cl.main(['archive', '-f']))
2278
2279 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002280 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002281 self.calls = \
2282 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2283 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002284 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002285 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2286 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002287 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2288
kmarshall9249e012016-08-23 12:02:16 -07002289 self.mock(git_cl, 'get_cl_statuses',
2290 lambda branches, fine_grained, max_processes:
2291 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2292
2293 self.assertEqual(1, git_cl.main(['archive', '-f']))
2294
2295 def test_archive_dry_run(self):
2296 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2297
2298 self.calls = \
2299 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2300 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2301 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2302 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2303 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2304 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2305 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2306 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2307 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002308
2309 self.mock(git_cl, 'get_cl_statuses',
2310 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002311 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2312 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2313 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002314
kmarshall9249e012016-08-23 12:02:16 -07002315 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2316
2317 def test_archive_no_tags(self):
2318 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2319
2320 self.calls = \
2321 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2322 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2323 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2324 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2325 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2326 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2327 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2328 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2329 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2330 ((['git', 'branch', '-D', 'foo'],), '')]
2331
2332 self.mock(git_cl, 'get_cl_statuses',
2333 lambda branches, fine_grained, max_processes:
2334 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2335 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2336 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2337
2338 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002339
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002340 def test_cmd_issue_erase_existing(self):
2341 out = StringIO.StringIO()
2342 self.mock(git_cl.sys, 'stdout', out)
2343 self.calls = [
2344 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002345 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2346 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002347 # Let this command raise exception (retcode=1) - it should be ignored.
2348 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002349 CERR1),
2350 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2351 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002352 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2353 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2354 ''),
2355 ]
2356 self.assertEqual(0, git_cl.main(['issue', '0']))
2357
phajdan.jre328cf92016-08-22 04:12:17 -07002358 def test_cmd_issue_json(self):
2359 out = StringIO.StringIO()
2360 self.mock(git_cl.sys, 'stdout', out)
2361 self.calls = [
2362 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002363 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002364 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2365 ((['git', 'config', 'rietveld.server'],),
2366 'https://codereview.chromium.org'),
2367 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2368 (('write_json', 'output.json',
2369 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2370 ''),
2371 ]
2372 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2373
tandriide281ae2016-10-12 06:02:30 -07002374 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002375 self.mock(git_cl.Changelist, 'GetChange',
2376 lambda _, *a: (
2377 self._mocked_call(['GetChange']+list(a))))
2378 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2379 lambda *_, **__: (
2380 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002381 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2382 lambda _, s: self._mocked_call(['SetCQState', s]))
2383 self.calls = [
2384 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002385 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002386 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2387 ((['git', 'config', 'rietveld.server'],),
2388 'https://codereview.chromium.org'),
2389 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2390 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2391 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2392 ((['get_or_create_merge_base', 'feature', 'feature'],),
2393 'fake_ancestor_sha'),
2394 ((['GetChange', 'fake_ancestor_sha', None], ),
2395 git_cl.presubmit_support.GitChange(
2396 '', '', '', '', '', '', '', '')),
2397 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2398 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002399 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2400 ]
2401 out = StringIO.StringIO()
2402 self.mock(git_cl.sys, 'stdout', out)
2403 self.assertEqual(0, git_cl.main(['try']))
2404 self.assertEqual(
2405 out.getvalue(),
2406 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2407
tandrii8c5a3532016-11-04 07:52:02 -07002408 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2409 self.mock(git_cl.Changelist, 'GetChange',
2410 lambda _, *a: (
2411 self._mocked_call(['GetChange']+list(a))))
2412 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2413 lambda *_, **__: (
2414 self._mocked_call(['DoGetTryMasters'])))
2415 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2416 lambda _, s: self._mocked_call(['SetCQState', s]))
2417
2418 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2419 # Get realistic expectations.
2420 gerrit_change_list_impl._GetGerritHost()
2421 return self._mocked_call(['_GetChangeDetail', opts or []])
2422 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2423 _GetChangeDetail)
2424
2425 self.calls = [
2426 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2427 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2428 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2429 ((['git', 'config', 'branch.feature.gerritserver'],),
2430 'https://chromium-review.googlesource.com'),
2431 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2432 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2433 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2434 ((['get_or_create_merge_base', 'feature', 'feature'],),
2435 'fake_ancestor_sha'),
2436 ((['GetChange', 'fake_ancestor_sha', None], ),
2437 git_cl.presubmit_support.GitChange(
2438 '', '', '', '', '', '', '', '')),
2439 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2440 ((['DoGetTryMasters'], ), None),
2441 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2442 ]
2443 out = StringIO.StringIO()
2444 self.mock(git_cl.sys, 'stdout', out)
2445 self.assertEqual(0, git_cl.main(['try']))
2446 self.assertEqual(
2447 out.getvalue(),
2448 'scheduled CQ Dry Run on '
2449 'https://chromium-review.googlesource.com/123456\n')
2450
2451 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2452 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2453 lambda _: {
2454 'owner_email': 'owner@e.mail',
2455 'private': False,
2456 'closed': False,
2457 'project': 'depot_tools',
2458 'patchsets': [20001],
2459 })
tandriide281ae2016-10-12 06:02:30 -07002460 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2461 self.calls = [
2462 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2463 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2464 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2465 ((['git', 'config', 'rietveld.server'],),
2466 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002467 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002468 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002469 ]
2470
2471 def _buildbucket_retry(*_, **kw):
2472 # self.maxDiff = 10000
2473 body = json.loads(kw['body'])
2474 self.assertEqual(len(body['builds']), 1)
2475 build = body['builds'][0]
2476 params = json.loads(build.pop('parameters_json'))
2477 self.assertEqual(params, {
2478 u'builder_name': u'win',
2479 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2480 u'revision': None}],
2481 u'properties': {
2482 u'category': u'git_cl_try',
2483 u'issue': 123,
2484 u'key': u'val',
2485 u'json': [{u'a': 1}, None],
2486 u'master': u'tryserver.chromium',
2487 u'patch_project': u'depot_tools',
2488 u'patch_storage': u'rietveld',
2489 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002490 u'rietveld': u'https://codereview.chromium.org',
2491 }
2492 })
2493 self.assertEqual(build, {
2494 u'bucket': u'master.tryserver.chromium',
2495 u'client_operation_id': u'uuid4',
2496 u'tags': [u'builder:win',
2497 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002498 u'user_agent:git_cl_try',
2499 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002500 })
2501
2502 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2503
2504 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2505 self.assertEqual(0, git_cl.main([
2506 'try', '-m', 'tryserver.chromium', '-b', 'win',
2507 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2508 self.assertRegexpMatches(
2509 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002510 'Tried jobs on:\nBucket: master.tryserver.chromium')
2511
tandrii8c5a3532016-11-04 07:52:02 -07002512 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2513 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2514 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2515
2516 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2517 # Get realistic expectations.
2518 gerrit_change_list_impl._GetGerritHost()
2519 return self._mocked_call(['_GetChangeDetail', opts or []])
2520 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2521 _GetChangeDetail)
2522
2523 self.calls = [
2524 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2525 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2526 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2527 ((['git', 'config', 'branch.feature.gerritserver'],),
2528 'https://chromium-review.googlesource.com'),
2529 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002530 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2531 {'owner': {'email': 'owner@e.mail'}}),
2532 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2533 'project': 'depot_tools',
2534 'revisions': {
2535 'deadbeaf': {
2536 '_number': 6,
2537 },
2538 'beeeeeef': {
2539 '_number': 7,
2540 'fetch': {'http': {
2541 'url': 'https://chromium.googlesource.com/depot_tools',
2542 'ref': 'refs/changes/56/123456/7'
2543 }},
2544 },
2545 },
2546 }),
2547 ]
2548
2549 def _buildbucket_retry(*_, **kw):
2550 # self.maxDiff = 10000
2551 body = json.loads(kw['body'])
2552 self.assertEqual(len(body['builds']), 1)
2553 build = body['builds'][0]
2554 params = json.loads(build.pop('parameters_json'))
2555 self.assertEqual(params, {
2556 u'builder_name': u'win',
2557 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2558 u'revision': None}],
2559 u'properties': {
2560 u'category': u'git_cl_try',
2561 u'key': u'val',
2562 u'json': [{u'a': 1}, None],
2563 u'master': u'tryserver.chromium',
2564
2565 u'patch_gerrit_url':
2566 u'https://chromium-review.googlesource.com',
2567 u'patch_issue': 123456,
2568 u'patch_project': u'depot_tools',
2569 u'patch_ref': u'refs/changes/56/123456/7',
2570 u'patch_repository_url':
2571 u'https://chromium.googlesource.com/depot_tools',
2572 u'patch_set': 7,
2573 u'patch_storage': u'gerrit',
2574 }
2575 })
2576 self.assertEqual(build, {
2577 u'bucket': u'master.tryserver.chromium',
2578 u'client_operation_id': u'uuid4',
2579 u'tags': [
2580 u'builder:win',
2581 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2582 u'user_agent:git_cl_try',
2583 u'master:tryserver.chromium'],
2584 })
2585
2586 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2587
2588 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2589 self.assertEqual(0, git_cl.main([
2590 'try', '-m', 'tryserver.chromium', '-b', 'win',
2591 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2592 self.assertRegexpMatches(
2593 git_cl.sys.stdout.getvalue(),
2594 'Tried jobs on:\nBucket: master.tryserver.chromium')
2595
borenet6c0efe62016-10-19 08:13:29 -07002596 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002597 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2598 lambda _: {
2599 'owner_email': 'owner@e.mail',
2600 'private': False,
2601 'closed': False,
2602 'project': 'depot_tools',
2603 'patchsets': [20001],
2604 })
borenet6c0efe62016-10-19 08:13:29 -07002605 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2606 self.calls = [
2607 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2608 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2609 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2610 ((['git', 'config', 'rietveld.server'],),
2611 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002612 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002613 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002614 ]
2615
2616 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002617 body = json.loads(kw['body'])
2618 self.assertEqual(len(body['builds']), 1)
2619 build = body['builds'][0]
2620 params = json.loads(build.pop('parameters_json'))
2621 self.assertEqual(params, {
2622 u'builder_name': u'win',
2623 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2624 u'revision': None}],
2625 u'properties': {
2626 u'category': u'git_cl_try',
2627 u'issue': 123,
2628 u'patch_project': u'depot_tools',
2629 u'patch_storage': u'rietveld',
2630 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002631 u'rietveld': u'https://codereview.chromium.org',
2632 }
2633 })
2634 self.assertEqual(build, {
2635 u'bucket': u'test.bucket',
2636 u'client_operation_id': u'uuid4',
2637 u'tags': [u'builder:win',
2638 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2639 u'user_agent:git_cl_try'],
2640 })
2641
2642 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2643
2644 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2645 self.assertEqual(0, git_cl.main([
2646 'try', '-B', 'test.bucket', '-b', 'win']))
2647 self.assertRegexpMatches(
2648 git_cl.sys.stdout.getvalue(),
2649 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002650
qyearsley123a4682016-10-26 09:12:17 -07002651 def test_git_cl_try_bots_on_multiple_masters(self):
2652 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2653 self.calls = [
2654 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2655 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2656 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2657 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002658 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002659 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2660 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2661 ]
2662
2663 def _buildbucket_retry(*_, **kw):
2664 body = json.loads(kw['body'])
2665 self.assertEqual(len(body['builds']), 2)
2666
2667 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2668 self.assertEqual(first_build_params['builder_name'], 'builder1')
2669 self.assertEqual(first_build_params['properties']['master'], 'master1')
2670
2671 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2672 self.assertEqual(first_build_params['builder_name'], 'builder2')
2673 self.assertEqual(first_build_params['properties']['master'], 'master2')
2674
2675 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2676
2677 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2678 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2679
2680 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2681 self.assertEqual(
2682 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2683 self.assertEqual(
2684 git_cl.sys.stdout.getvalue(),
2685 'Tried jobs on:\n'
2686 'Bucket: master.master1\n'
2687 ' builder1: []\n'
2688 'Bucket: master.master2\n'
2689 ' builder2: []\n'
2690 'To see results here, run: git cl try-results\n'
2691 'To see results in browser, run: git cl web\n')
2692
tandrii16e0b4e2016-06-07 10:34:28 -07002693 def _common_GerritCommitMsgHookCheck(self):
2694 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2695 self.mock(git_cl.os.path, 'abspath',
2696 lambda path: self._mocked_call(['abspath', path]))
2697 self.mock(git_cl.os.path, 'exists',
2698 lambda path: self._mocked_call(['exists', path]))
2699 self.mock(git_cl.gclient_utils, 'FileRead',
2700 lambda path: self._mocked_call(['FileRead', path]))
2701 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2702 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2703 self.calls = [
2704 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2705 ((['abspath', '../'],), '/abs/git_repo_root'),
2706 ]
2707 return git_cl.Changelist(codereview='gerrit', issue=123)
2708
2709 def test_GerritCommitMsgHookCheck_custom_hook(self):
2710 cl = self._common_GerritCommitMsgHookCheck()
2711 self.calls += [
2712 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2713 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2714 '#!/bin/sh\necho "custom hook"')
2715 ]
2716 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2717
2718 def test_GerritCommitMsgHookCheck_not_exists(self):
2719 cl = self._common_GerritCommitMsgHookCheck()
2720 self.calls += [
2721 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2722 ]
2723 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2724
2725 def test_GerritCommitMsgHookCheck(self):
2726 cl = self._common_GerritCommitMsgHookCheck()
2727 self.calls += [
2728 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2729 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2730 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2731 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2732 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2733 ''),
2734 ]
2735 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2736
tandriic4344b52016-08-29 06:04:54 -07002737 def test_GerritCmdLand(self):
2738 self.calls += [
2739 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2740 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2741 'deadbeaf'),
2742 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2743 ((['git', 'config', 'branch.feature.gerritserver'],),
2744 'chromium-review.googlesource.com'),
2745 ]
2746 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2747 cl._codereview_impl._GetChangeDetail = lambda _: {
2748 'labels': {},
2749 'current_revision': 'deadbeaf',
2750 }
agable32978d92016-11-01 12:55:02 -07002751 cl._codereview_impl._GetChangeCommit = lambda: {
2752 'commit': 'deadbeef',
2753 'web_links': [{'name': 'gerrit',
2754 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2755 }
tandriic4344b52016-08-29 06:04:54 -07002756 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002757 out = StringIO.StringIO()
2758 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002759 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002760 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002761 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002762
tandrii221ab252016-10-06 08:12:04 -07002763 BUILDBUCKET_BUILDS_MAP = {
2764 '9000': {
2765 'id': '9000',
2766 'status': 'STARTED',
2767 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2768 'result_details_json': '{"properties": {}}',
2769 'bucket': 'master.x.y',
2770 'created_by': 'user:someone@chromium.org',
2771 'created_ts': '147200002222000',
2772 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2773 },
2774 '8000': {
2775 'id': '8000',
2776 'status': 'COMPLETED',
2777 'result': 'FAILURE',
2778 'failure_reason': 'BUILD_FAILURE',
2779 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2780 'result_details_json': '{"properties": {}}',
2781 'bucket': 'master.x.y',
2782 'created_by': 'user:someone@chromium.org',
2783 'created_ts': '147200001111000',
2784 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2785 },
2786 }
2787
2788 def test_write_try_results_json(self):
2789 expected_output = [
2790 {
2791 'buildbucket_id': '8000',
2792 'bucket': 'master.x.y',
2793 'builder_name': 'my-builder',
2794 'status': 'COMPLETED',
2795 'result': 'FAILURE',
2796 'failure_reason': 'BUILD_FAILURE',
2797 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2798 },
2799 {
2800 'buildbucket_id': '9000',
2801 'bucket': 'master.x.y',
2802 'builder_name': 'my-builder',
2803 'status': 'STARTED',
2804 'result': None,
2805 'failure_reason': None,
2806 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2807 }
2808 ]
2809 self.calls = [(('write_json', 'output.json', expected_output), '')]
2810 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2811
tandrii45b2a582016-10-11 03:14:16 -07002812 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002813 out = StringIO.StringIO()
2814 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002815 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2816 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002817 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2818 self._mocked_call(['get_authenticator_for_host', host]))
2819 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2820 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002821
2822 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2823 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002824 self.calls += [
2825 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2826 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2827 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2828 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2829 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2830 ((['git', 'config', 'branch.feature.rietveldserver'],),
2831 'codereview.example.com'),
2832 ((['get_authenticator_for_host', 'codereview.example.com'],),
2833 AuthenticatorMock()),
2834 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2835
2836 def test_fetch_try_jobs_none_rietveld(self):
2837 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002838 # Simulate that user isn't logged in.
2839 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002840 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002841 self.assertRegexpMatches(sys.stdout.getvalue(),
2842 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002843 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2844
2845 def test_fetch_try_jobs_some_rietveld(self):
2846 self._setup_fetch_try_jobs_rietveld({
2847 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2848 })
2849 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002850 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2851 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2852 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2853
2854 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2855 self._setup_fetch_try_jobs(most_recent_patchset=13)
2856 self.calls += [
2857 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2858 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2859 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002860 # TODO(tandrii): Uncomment the below if we decide to support checking
2861 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002862 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002863 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002864 ((['git', 'config', 'branch.feature.gerritserver'],),
2865 'https://x-review.googlesource.com'),
2866 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2867 AuthenticatorMock()),
2868 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2869
2870 def test_fetch_try_jobs_none_gerrit(self):
2871 self._setup_fetch_try_jobs_gerrit({})
2872 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002873 # TODO(tandrii): Uncomment the below if we decide to support checking
2874 # patchsets for Gerrit.
2875 # self.assertRegexpMatches(
2876 # sys.stdout.getvalue(),
2877 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002878 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2879
2880 def test_fetch_try_jobs_some_gerrit(self):
2881 self._setup_fetch_try_jobs_gerrit({
2882 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2883 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002884 # TODO(tandrii): Uncomment the below if we decide to support checking
2885 # patchsets for Gerrit.
2886 # self.calls.remove(
2887 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002888 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2889
2890 # ... and doesn't result in warning.
2891 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2892 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002893 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2894 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2895
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002896
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002897if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002898 git_cl.logging.basicConfig(
2899 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002900 unittest.main()