blob: 6b6fa89d54e1d314f11898a9998f76509781c39f [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'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000752 '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'
1014 'Review URL: https://codereview.chromium.org/123 .'],), ''),
1015 ((['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'
1118 'Review URL: https://codereview.chromium.org/123 .\n'
1119 '\n'
1120 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1121 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1122
1123 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1124 ''),
1125 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1126 ((['git', 'checkout', '-q', 'feature'],), ''),
1127 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1128 ((['git', 'config', 'rietveld.viewvc-url'],),
1129 'https://chromium.googlesource.com/infra/infra/+/'),
1130 ((['update_description', 123,
1131 'Issue: 123\n\nR=john@chromium.org\n'
1132 '\n'
1133 'Review URL: https://codereview.chromium.org/123 .\n'
1134 '\n'
1135 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1136 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1137 'Committed: '
1138 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1139 ''),
1140 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1141 'fake_sha_rebased (presubmit successful).'],), ''),
1142 ]
1143 git_cl.main(['land'])
1144
1145 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001146 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001147 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001148 ((['git', 'config', 'remote.origin.url'],),
1149 'https://chromium.googlesource.com/v8/v8'),
1150 ((['_GitNumbererState',
1151 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'],),
1152 git_cl._GitNumbererState(None, True)),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001153
1154 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1155 'This is parent commit with no footer.'),
1156
1157 ((['git', 'checkout', '-q', 'feature'],), ''),
1158 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1159 ]
1160 with self.assertRaises(ValueError) as cm:
1161 git_cl.main(['land'])
1162 self.assertEqual(cm.exception.message,
1163 'Unable to infer commit position from footers')
1164
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001165 def test_GitNumbererState_not_whitelisted_repo(self):
1166 self.calls = [
1167 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1168 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1169 ]
1170 res = git_cl._GitNumbererState.load(
1171 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1172 remote_ref='refs/whatever')
1173 self.assertEqual(res.pending_prefix, None)
1174 self.assertEqual(res.should_git_number, False)
1175
1176 def test_GitNumbererState_fail_fetch(self):
1177 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1178 self.calls = [
1179 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1180 '+refs/meta/config:refs/git_cl/meta/config',
1181 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), CERR1),
1182 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1183 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
1184 'refs/pending-prefix'),
1185 ]
1186 res = git_cl._GitNumbererState.load(
1187 remote_url='https://chromium.googlesource.com/chromium/src',
1188 remote_ref='refs/whatever')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001189 self.assertEqual(res.pending_prefix, 'refs/pending-prefix/')
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001190 self.assertEqual(res.should_git_number, False)
1191
1192 def test_GitNumbererState_fail_gnumbd_and_validator(self):
1193 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1194 self.calls = [
1195 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1196 '+refs/meta/config:refs/git_cl/meta/config',
1197 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1198 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1199 'ba d conig'),
1200 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1201 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
1202 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],), CERR1),
1203 ]
1204 res = git_cl._GitNumbererState.load(
1205 remote_url='https://chromium.googlesource.com/chromium/src',
1206 remote_ref='refs/whatever')
1207 self.assertEqual(res.pending_prefix, None)
1208 self.assertEqual(res.should_git_number, False)
1209
1210 def test_GitNumbererState_valid_configs(self):
1211 class NamedTempFileStab(StringIO.StringIO):
1212 @classmethod
1213 @contextlib.contextmanager
1214 def create(cls, *_, **__):
1215 yield cls()
1216 name = 'tempfile'
1217 self.mock(git_cl.tempfile, 'NamedTemporaryFile', NamedTempFileStab.create)
1218 self.calls = [
1219 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
1220 '+refs/meta/config:refs/git_cl/meta/config',
1221 '+refs/gnumbd-config/main:refs/git_cl/gnumbd-config/main'],), ''),
1222 ((['git', 'show', 'refs/git_cl/gnumbd-config/main:config.json'],),
1223 '''{
1224 "pending_tag_prefix": "refs/pending-tags",
1225 "pending_ref_prefix": "refs/pending",
1226 "enabled_refglobs": [
1227 "refs/heads/m*"
1228 ]
1229 }
1230 '''),
1231 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1232 '''
1233 [plugin "git-numberer"]
1234 validate-enabled-refglob = refs/else/*
1235 validate-enabled-refglob = refs/heads/*
1236 validate-disabled-refglob = refs/heads/disabled
1237 validate-disabled-refglob = refs/branch-heads/*
1238 '''),
1239 ((['git', 'config', '-f', 'tempfile', '--get-all',
1240 'plugin.git-numberer.validate-enabled-refglob'],),
1241 'refs/else/*\n'
1242 'refs/heads/*\n'),
1243 ((['git', 'config', '-f', 'tempfile', '--get-all',
1244 'plugin.git-numberer.validate-disabled-refglob'],),
1245 'refs/heads/disabled\n'
1246 'refs/branch-heads/*\n'),
1247 ] * 3 # 3 tests below have exactly same IO.
1248
1249 res = git_cl._GitNumbererState.load(
1250 remote_url='https://chromium.googlesource.com/chromium/src',
1251 remote_ref='refs/heads/master')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001252 self.assertEqual(res.pending_prefix, 'refs/pending/')
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001253 self.assertEqual(res.should_git_number, False)
1254
1255 res = git_cl._GitNumbererState.load(
1256 remote_url='https://chromium.googlesource.com/chromium/src',
1257 remote_ref='refs/heads/test')
1258 self.assertEqual(res.pending_prefix, None)
1259 self.assertEqual(res.should_git_number, True)
1260
1261 res = git_cl._GitNumbererState.load(
1262 remote_url='https://chromium.googlesource.com/chromium/src',
1263 remote_ref='refs/heads/disabled')
1264 self.assertEqual(res.pending_prefix, None)
1265 self.assertEqual(res.should_git_number, False)
1266
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001267 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001268 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001269 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001270 if skip_auth_check:
1271 return [((cmd, ), 'true')]
1272
tandrii5d48c322016-08-18 16:19:37 -07001273 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001274 if issue:
1275 calls.extend([
1276 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1277 ])
1278 calls.extend([
1279 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1280 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1281 ((['git', 'config', 'remote.origin.url'],),
1282 'https://chromium.googlesource.com/my/repo'),
1283 ((['git', 'config', 'remote.origin.url'],),
1284 'https://chromium.googlesource.com/my/repo'),
1285 ])
1286 return calls
1287
1288 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001289 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001290 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001291 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001292 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001293 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001294 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001295 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1296 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001297 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001298 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001299 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1300 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001301 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001302 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001303 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001304 ((['get_or_create_merge_base', 'master',
1305 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001306 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001307 # Calls to verify branch point is ancestor
1308 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
1309 cls._git_sanity_checks('fake_ancestor_sha', 'master',
1310 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001311 ((['git', 'rev-parse', '--show-cdup'],), ''),
1312 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001313
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001314 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001315 'diff', '--name-status', '--no-renames', '-r',
1316 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001317 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001318 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001319 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001320 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001321 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001322 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001323 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001324 ((['git', 'config', 'user.email'],), 'me@example.com'),
1325 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001326 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1327 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001328 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001329 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001330
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001331 @classmethod
1332 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001333 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001334 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001335 ref_suffix='', notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001336 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001337 if post_amend_description is None:
1338 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001339 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001340 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001341
tandriia60502f2016-06-20 02:01:53 -07001342 if squash_mode == 'default':
1343 calls.extend([
1344 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1345 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1346 ])
1347 elif squash_mode in ('override_squash', 'override_nosquash'):
1348 calls.extend([
1349 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1350 'true' if squash_mode == 'override_squash' else 'false'),
1351 ])
1352 else:
1353 assert squash_mode in ('squash', 'nosquash')
1354
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001355 # If issue is given, then description is fetched from Gerrit instead.
1356 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001357 calls += [
1358 ((['git', 'log', '--pretty=format:%s\n\n%b',
1359 'fake_ancestor_sha..HEAD'],),
1360 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001361 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001362 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001363 # DownloadGerritHook(False)
1364 ((False, ),
1365 ''),
1366 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001367 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001368 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001369 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001370 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001371 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001372 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001373 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001374 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001375 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001376 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001377 if not issue:
1378 # Prompting to edit description on first upload.
1379 calls += [
1380 ((['git', 'config', 'core.editor'],), ''),
1381 ((['RunEditor'],), description),
1382 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001383 ref_to_push = 'abcdef0123456789'
1384 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001385 ((['git', 'config', 'branch.master.merge'],),
1386 'refs/heads/master'),
1387 ((['git', 'config', 'branch.master.remote'],),
1388 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001389 ((['get_or_create_merge_base', 'master',
1390 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001391 'origin/master'),
1392 ((['git', 'rev-parse', 'HEAD:'],),
1393 '0123456789abcdef'),
1394 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001395 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001396 ref_to_push),
1397 ]
1398 else:
1399 ref_to_push = 'HEAD'
1400
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001401 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001402 ((['git', 'rev-list',
1403 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001404 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001405
1406 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1407 if ref_suffix:
1408 ref_suffix += ',' + notify_suffix
1409 else:
1410 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001411
ukai@chromium.orge8077812012-02-03 03:41:46 +00001412 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001413 ref_suffix += ',' + ','.join('r=%s' % email
1414 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001415 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001416 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001417 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001418 ('remote:\n'
1419 'remote: Processing changes: (\)\n'
1420 'remote: Processing changes: (|)\n'
1421 'remote: Processing changes: (/)\n'
1422 'remote: Processing changes: (-)\n'
1423 'remote: Processing changes: new: 1 (/)\n'
1424 'remote: Processing changes: new: 1, done\n'
1425 'remote:\n'
1426 'remote: New Changes:\n'
1427 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1428 'remote:\n'
1429 'To https://chromium.googlesource.com/yyy/zzz\n'
1430 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001431 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001432 if squash:
1433 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001434 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001435 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001436 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001437 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001438 ((['git', 'config', 'branch.master.gerritsquashhash',
1439 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001440 ]
tandrii88189772016-09-29 04:29:57 -07001441 calls += [
1442 ((['git', 'config', 'rietveld.cc'],), ''),
1443 ((['AddReviewers', 'chromium-review.googlesource.com',
1444 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -07001445 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -07001446 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001447 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001448 return calls
1449
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001450 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001451 self,
1452 upload_args,
1453 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001454 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001455 squash=True,
1456 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001457 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001458 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001459 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001460 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001461 issue=None,
1462 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001463 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001464 if squash_mode is None:
1465 if '--no-squash' in upload_args:
1466 squash_mode = 'nosquash'
1467 elif '--squash' in upload_args:
1468 squash_mode = 'squash'
1469 else:
1470 squash_mode = 'default'
1471
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001472 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001473 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001474 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001475 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001476 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001477 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1478 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001479 self.mock(git_cl.gclient_utils, 'RunEditor',
1480 lambda *_, **__: self._mocked_call(['RunEditor']))
1481 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001482 self.mock(git_cl.gerrit_util, 'AddReviewers',
1483 lambda h, i, add, is_reviewer: self._mocked_call(
1484 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001485
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001486 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001487 self.calls += self._gerrit_upload_calls(
1488 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001489 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001490 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001491 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001492 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001493 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001494 # Uncomment when debugging.
1495 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001496 git_cl.main(['upload'] + upload_args)
1497
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001498 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001499 self._run_gerrit_upload_test(
1500 ['--no-squash'],
1501 'desc\n\nBUG=\n',
1502 [],
1503 squash=False,
1504 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1505
1506 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001507 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001508 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001509 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001510 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001511 [],
tandriia60502f2016-06-20 02:01:53 -07001512 squash=False,
1513 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001514 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001515
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001516 def test_gerrit_no_reviewer(self):
1517 self._run_gerrit_upload_test(
1518 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001519 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001520 [],
1521 squash=False,
1522 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001523
tandriieefe8322016-08-17 10:12:24 -07001524 def test_gerrit_patch_bad_chars(self):
1525 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001526 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001527 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001528 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001529 squash=False,
1530 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001531 ref_suffix='%m=Dont_put_bad_chars')
1532 self.assertIn(
1533 'WARNING: Patchset title may only contain alphanumeric chars '
1534 'and spaces. Cleaned up title:\nDont put bad chars\n',
1535 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001536
ukai@chromium.orge8077812012-02-03 03:41:46 +00001537 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001538 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001539 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001540 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001541 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001542 squash=False,
1543 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001544 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001545
1546 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001547 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001548 [],
bradnelsond975b302016-10-23 12:20:23 -07001549 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1550 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001551 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001552 ['reviewer@example.com', 'another@example.com'],
1553 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001554 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001555 ref_suffix='%l=Code-Review+1',
1556 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001557
1558 def test_gerrit_upload_squash_first_is_default(self):
1559 # Mock Gerrit CL description to indicate the first upload.
1560 self.mock(git_cl.Changelist, 'GetDescription',
1561 lambda *_: None)
1562 self._run_gerrit_upload_test(
1563 [],
1564 'desc\nBUG=\n\nChange-Id: 123456789',
1565 [],
1566 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001567
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001568 def test_gerrit_upload_squash_first(self):
1569 # Mock Gerrit CL description to indicate the first upload.
1570 self.mock(git_cl.Changelist, 'GetDescription',
1571 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001572 self._run_gerrit_upload_test(
1573 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001574 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001575 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001576 squash=True,
1577 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001578
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001579 def test_gerrit_upload_squash_reupload(self):
1580 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1581 # Mock Gerrit CL description to indicate re-upload.
1582 self.mock(git_cl.Changelist, 'GetDescription',
1583 lambda *args: description)
1584 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1585 lambda *args: 1)
1586 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1587 lambda *args: {'change_id': '123456789'})
1588 self._run_gerrit_upload_test(
1589 ['--squash'],
1590 description,
1591 [],
1592 squash=True,
1593 expected_upstream_ref='origin/master',
1594 issue=123456)
1595
rmistry@google.com2dd99862015-06-22 12:22:18 +00001596 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001597 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001598 def mock_run_git(*args, **_kwargs):
1599 if args[0] == ['for-each-ref',
1600 '--format=%(refname:short) %(upstream:short)',
1601 'refs/heads']:
1602 # Create a local branch dependency tree that looks like this:
1603 # test1 -> test2 -> test3 -> test4 -> test5
1604 # -> test3.1
1605 # test6 -> test0
1606 branch_deps = [
1607 'test2 test1', # test1 -> test2
1608 'test3 test2', # test2 -> test3
1609 'test3.1 test2', # test2 -> test3.1
1610 'test4 test3', # test3 -> test4
1611 'test5 test4', # test4 -> test5
1612 'test6 test0', # test0 -> test6
1613 'test7', # test7
1614 ]
1615 return '\n'.join(branch_deps)
1616 self.mock(git_cl, 'RunGit', mock_run_git)
1617
1618 class RecordCalls:
1619 times_called = 0
1620 record_calls = RecordCalls()
1621 def mock_CMDupload(*args, **_kwargs):
1622 record_calls.times_called += 1
1623 return 0
1624 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1625
1626 self.calls = [
1627 (('[Press enter to continue or ctrl-C to quit]',), ''),
1628 ]
1629
1630 class MockChangelist():
1631 def __init__(self):
1632 pass
1633 def GetBranch(self):
1634 return 'test1'
1635 def GetIssue(self):
1636 return '123'
1637 def GetPatchset(self):
1638 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001639 def IsGerrit(self):
1640 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001641
1642 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1643 # CMDupload should have been called 5 times because of 5 dependent branches.
1644 self.assertEquals(5, record_calls.times_called)
1645 self.assertEquals(0, ret)
1646
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001647 def test_gerrit_change_id(self):
1648 self.calls = [
1649 ((['git', 'write-tree'], ),
1650 'hashtree'),
1651 ((['git', 'rev-parse', 'HEAD~0'], ),
1652 'branch-parent'),
1653 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1654 'A B <a@b.org> 1456848326 +0100'),
1655 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1656 'C D <c@d.org> 1456858326 +0100'),
1657 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1658 'hashchange'),
1659 ]
1660 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1661 self.assertEqual(change_id, 'Ihashchange')
1662
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001663 def test_desecription_append_footer(self):
1664 for init_desc, footer_line, expected_desc in [
1665 # Use unique desc first lines for easy test failure identification.
1666 ('foo', 'R=one', 'foo\n\nR=one'),
1667 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1668 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1669 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1670 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1671 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1672 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1673 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1674 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1675 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1676 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1677 ]:
1678 desc = git_cl.ChangeDescription(init_desc)
1679 desc.append_footer(footer_line)
1680 self.assertEqual(desc.description, expected_desc)
1681
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001682 def test_update_reviewers(self):
1683 data = [
1684 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001685 ('foo\nR=xx', [], 'foo\nR=xx'),
1686 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001687 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001688 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1689 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1690 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001691 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001692 ('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 +00001693 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001694 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1695 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1696 # Same as the line before, but full of whitespaces.
1697 (
1698 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1699 'foo\nBar\n\nR=c@c\n BUG =',
1700 ),
1701 # Whitespaces aren't interpreted as new lines.
1702 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001703 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001704 expected = [i[2] for i in data]
1705 actual = []
1706 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001707 obj = git_cl.ChangeDescription(orig)
1708 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001709 actual.append(obj.description)
1710 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001711
wittman@chromium.org455dc922015-01-26 20:15:50 +00001712 def test_get_target_ref(self):
1713 # Check remote or remote branch not present.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001714 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001715 self.assertEqual(None, git_cl.GetTargetRef(None,
1716 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001717 'master', False))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001718
wittman@chromium.org455dc922015-01-26 20:15:50 +00001719 # Check default target refs for branches.
1720 self.assertEqual('refs/heads/master',
1721 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001722 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001723 self.assertEqual('refs/heads/master',
1724 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001725 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001726 self.assertEqual('refs/heads/master',
1727 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001728 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001729 self.assertEqual('refs/branch-heads/123',
1730 git_cl.GetTargetRef('origin',
1731 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001732 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001733 self.assertEqual('refs/diff/test',
1734 git_cl.GetTargetRef('origin',
1735 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001736 None, False))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001737 self.assertEqual('refs/heads/chrome/m42',
1738 git_cl.GetTargetRef('origin',
1739 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001740 None, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001741
1742 # Check target refs for user-specified target branch.
1743 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1744 'refs/remotes/branch-heads/123'):
1745 self.assertEqual('refs/branch-heads/123',
1746 git_cl.GetTargetRef('origin',
1747 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001748 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001749 for branch in ('origin/master', 'remotes/origin/master',
1750 'refs/remotes/origin/master'):
1751 self.assertEqual('refs/heads/master',
1752 git_cl.GetTargetRef('origin',
1753 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001754 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001755 for branch in ('master', 'heads/master', 'refs/heads/master'):
1756 self.assertEqual('refs/heads/master',
1757 git_cl.GetTargetRef('origin',
1758 'refs/remotes/branch-heads/123',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001759 branch, False))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001760
1761 # Check target refs for pending prefix.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001762 self.mock(git_cl._GitNumbererState, 'load',
1763 classmethod(lambda *_: git_cl._GitNumbererState('prefix', False)))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001764 self.assertEqual('prefix/heads/master',
1765 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001766 None, True,
1767 'https://remote.url/some.git'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001768
wychen@chromium.orga872e752015-04-28 23:42:18 +00001769 def test_patch_when_dirty(self):
1770 # Patch when local tree is dirty
1771 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1772 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1773
1774 def test_diff_when_dirty(self):
1775 # Do 'git cl diff' when local tree is dirty
1776 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1777 self.assertNotEqual(git_cl.main(['diff']), 0)
1778
tandriidf09a462016-08-18 16:23:55 -07001779 def _patch_common(self, is_gerrit=False, force_codereview=False,
1780 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001781 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001782 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1783 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001784 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1785 lambda *args: {
1786 'current_revision': '7777777777',
1787 'revisions': {
1788 '1111111111': {
1789 '_number': 1,
1790 'fetch': {'http': {
1791 'url': 'https://chromium.googlesource.com/my/repo',
1792 'ref': 'refs/changes/56/123456/1',
1793 }},
1794 },
1795 '7777777777': {
1796 '_number': 7,
1797 'fetch': {'http': {
1798 'url': 'https://chromium.googlesource.com/my/repo',
1799 'ref': 'refs/changes/56/123456/7',
1800 }},
1801 },
1802 },
1803 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001804 self.mock(git_cl.Changelist, 'GetDescription',
1805 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001806 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1807
tandriidf09a462016-08-18 16:23:55 -07001808 if new_branch:
1809 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1810 else:
1811 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001812 if not force_codereview:
1813 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001814 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001815 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001816 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1817 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001818 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001819 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001820
1821 if is_gerrit:
1822 if not force_codereview:
1823 self.calls += [
1824 ((['git', 'config', 'gerrit.host'],), 'true'),
1825 ]
1826 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001827 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001828 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001829 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001830 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001831 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001832 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001833
tandriidf09a462016-08-18 16:23:55 -07001834 def _common_patch_successful(self, new_branch=False):
1835 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001836 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001837 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001838 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001839 'patch from issue 123456 at patchset 60001 ' +
1840 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001841 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001842 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001843 ((['git', 'config', 'branch.master.rietveldserver',
1844 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001845 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001846 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001847 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001848
1849 def test_patch_successful(self):
1850 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001851 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1852
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001853 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001854 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001855 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1856
wychen@chromium.orga872e752015-04-28 23:42:18 +00001857 def test_patch_conflict(self):
1858 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001859 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001860 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001861
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001862 def test_gerrit_patch_successful(self):
1863 self._patch_common(is_gerrit=True)
1864 self.calls += [
1865 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1866 'refs/changes/56/123456/7'],), ''),
1867 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001868 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001869 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001870 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1871 ((['git', 'config', 'branch.master.merge'],), 'master'),
1872 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1873 ((['git', 'config', 'remote.origin.url'],),
1874 'https://chromium.googlesource.com/my/repo'),
1875 ((['git', 'config', 'branch.master.gerritserver',
1876 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001877 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001878 ]
1879 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1880
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001881 def test_patch_force_codereview(self):
1882 self._patch_common(is_gerrit=True, force_codereview=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'],), ''),
1887 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001888 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001889 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001890 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1891 ((['git', 'config', 'branch.master.merge'],), 'master'),
1892 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1893 ((['git', 'config', 'remote.origin.url'],),
1894 'https://chromium.googlesource.com/my/repo'),
1895 ((['git', 'config', 'branch.master.gerritserver',
1896 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001897 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001898 ]
1899 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1900
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001901 def test_gerrit_patch_url_successful(self):
1902 self._patch_common(is_gerrit=True)
1903 self.calls += [
1904 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1905 'refs/changes/56/123456/1'],), ''),
1906 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001907 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001908 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001909 ((['git', 'config', 'branch.master.gerritserver',
1910 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001911 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001912 ]
1913 self.assertEqual(git_cl.main(
1914 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1915
1916 def test_gerrit_patch_conflict(self):
1917 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001918 self.calls += [
1919 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1920 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001921 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1922 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1923 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001924 ]
1925 with self.assertRaises(SystemExitMock):
1926 git_cl.main(['patch',
1927 'https://chromium-review.googlesource.com/#/c/123456/1'])
1928
tandriic2405f52016-10-10 08:13:15 -07001929 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001930 def notExists(_issue, *_, **kwargs):
1931 self.assertFalse(kwargs['ignore_404'])
1932 raise git_cl.gerrit_util.GerritError(404, '')
1933 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1934
tandriic2405f52016-10-10 08:13:15 -07001935 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001936 self.calls = [
1937 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1938 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1939 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1940 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1941 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1942 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001943 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001944 'or you have no access to it'],), SystemExitMock()),
1945 ]
1946 with self.assertRaises(SystemExitMock):
1947 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1948
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001949 def _checkout_calls(self):
1950 return [
1951 ((['git', 'config', '--local', '--get-regexp',
1952 'branch\\..*\\.rietveldissue'], ),
1953 ('branch.retrying.rietveldissue 1111111111\n'
1954 'branch.some-fix.rietveldissue 2222222222\n')),
1955 ((['git', 'config', '--local', '--get-regexp',
1956 'branch\\..*\\.gerritissue'], ),
1957 ('branch.ger-branch.gerritissue 123456\n'
1958 'branch.gbranch654.gerritissue 654321\n')),
1959 ]
1960
1961 def test_checkout_gerrit(self):
1962 """Tests git cl checkout <issue>."""
1963 self.calls = self._checkout_calls()
1964 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1965 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1966
1967 def test_checkout_rietveld(self):
1968 """Tests git cl checkout <issue>."""
1969 self.calls = self._checkout_calls()
1970 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1971 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1972
1973 def test_checkout_not_found(self):
1974 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001975 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001976 self.calls = self._checkout_calls()
1977 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1978
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001979 def test_checkout_no_branch_issues(self):
1980 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001981 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001982 self.calls = [
1983 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001984 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001985 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001986 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001987 ]
1988 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1989
tandrii@chromium.org28253532016-04-14 13:46:56 +00001990 def _test_gerrit_ensure_authenticated_common(self, auth,
1991 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001992 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1993 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1994 self.mock(git_cl, 'DieWithError',
1995 lambda msg: self._mocked_call(['DieWithError', msg]))
1996 self.mock(git_cl, 'ask_for_data',
1997 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001998 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001999 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002000 cl.branch = 'master'
2001 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002002 cl.lookedup_issue = True
2003 return cl
2004
2005 def test_gerrit_ensure_authenticated_missing(self):
2006 cl = self._test_gerrit_ensure_authenticated_common(auth={
2007 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
2008 })
2009 self.calls.append(
2010 ((['DieWithError',
2011 'Credentials for the following hosts are required:\n'
2012 ' chromium-review.googlesource.com\n'
2013 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
2014 'You can (re)generate your credentails by visiting '
2015 'https://chromium-review.googlesource.com/new-password'],), ''),)
2016 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2017
2018 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002019 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002020 cl = self._test_gerrit_ensure_authenticated_common(auth={
2021 'chromium.googlesource.com': 'one',
2022 'chromium-review.googlesource.com': 'other',
2023 })
2024 self.calls.append(
2025 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07002026 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002027 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2028
2029 def test_gerrit_ensure_authenticated_ok(self):
2030 cl = self._test_gerrit_ensure_authenticated_common(auth={
2031 'chromium.googlesource.com': 'same',
2032 'chromium-review.googlesource.com': 'same',
2033 })
2034 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2035
tandrii@chromium.org28253532016-04-14 13:46:56 +00002036 def test_gerrit_ensure_authenticated_skipped(self):
2037 cl = self._test_gerrit_ensure_authenticated_common(
2038 auth={}, skip_auth_check=True)
2039 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2040
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002041 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002042 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2043 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002044 self.calls = [
2045 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002046 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002047 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2048 ((['git', 'config', 'rietveld.server'],), ''),
2049 ((['git', 'config', 'rietveld.server'],), ''),
2050 ((['git', 'config', 'branch.feature.rietveldserver'],),
2051 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002052 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002053 ]
2054 self.assertEqual(0, git_cl.main(['set-commit']))
2055
tandriid9e5ce52016-07-13 02:32:59 -07002056 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002057 self.mock(git_cl.gerrit_util, 'SetReview',
2058 lambda h, i, labels: self._mocked_call(
2059 ['SetReview', h, i, labels]))
2060 self.calls = [
2061 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002062 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2063 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002064 ((['git', 'config', 'branch.feature.gerritserver'],),
2065 'https://chromium-review.googlesource.com'),
2066 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07002067 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002068 ]
tandriid9e5ce52016-07-13 02:32:59 -07002069
2070 def test_cmd_set_commit_gerrit_clear(self):
2071 self._cmd_set_commit_gerrit_common(0)
2072 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2073
2074 def test_cmd_set_commit_gerrit_dry(self):
2075 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002076 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2077
tandriid9e5ce52016-07-13 02:32:59 -07002078 def test_cmd_set_commit_gerrit(self):
2079 self._cmd_set_commit_gerrit_common(2)
2080 self.assertEqual(0, git_cl.main(['set-commit']))
2081
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002082 def test_description_display(self):
2083 out = StringIO.StringIO()
2084 self.mock(git_cl.sys, 'stdout', out)
2085
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002086 self.mock(git_cl, 'Changelist', ChangelistMock)
2087 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002088
2089 self.assertEqual(0, git_cl.main(['description', '-d']))
2090 self.assertEqual('foo\n', out.getvalue())
2091
2092 def test_description_rietveld(self):
2093 out = StringIO.StringIO()
2094 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002095 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002096
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002097 self.assertEqual(0, git_cl.main([
2098 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2099 self.assertEqual('foobar\n', out.getvalue())
2100
iannucci3c972b92016-08-17 13:24:10 -07002101 def test_StatusFieldOverrideIssueMissingArgs(self):
2102 out = StringIO.StringIO()
2103 self.mock(git_cl.sys, 'stderr', out)
2104
2105 try:
2106 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2107 except SystemExit as ex:
2108 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002109 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002110
2111 out = StringIO.StringIO()
2112 self.mock(git_cl.sys, 'stderr', out)
2113
2114 try:
2115 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2116 except SystemExit as ex:
2117 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002118 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002119
2120 def test_StatusFieldOverrideIssue(self):
2121 out = StringIO.StringIO()
2122 self.mock(git_cl.sys, 'stdout', out)
2123
2124 def assertIssue(cl_self, *_args):
2125 self.assertEquals(cl_self.issue, 1)
2126 return 'foobar'
2127
2128 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2129 self.calls = [
2130 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2131 ((['git', 'config', 'rietveld.server'],), ''),
2132 ((['git', 'config', 'rietveld.server'],), ''),
2133 ]
iannuccie53c9352016-08-17 14:40:40 -07002134 self.assertEqual(
2135 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2136 0)
iannucci3c972b92016-08-17 13:24:10 -07002137 self.assertEqual(out.getvalue(), 'foobar\n')
2138
iannuccie53c9352016-08-17 14:40:40 -07002139 def test_SetCloseOverrideIssue(self):
2140 def assertIssue(cl_self, *_args):
2141 self.assertEquals(cl_self.issue, 1)
2142 return 'foobar'
2143
2144 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2145 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2146 self.calls = [
2147 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2148 ((['git', 'config', 'rietveld.server'],), ''),
2149 ((['git', 'config', 'rietveld.server'],), ''),
2150 ]
2151 self.assertEqual(
2152 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2153
2154 def test_SetCommitOverrideIssue(self):
2155 def assertIssue(cl_self, *_args):
2156 self.assertEquals(cl_self.issue, 1)
2157 return 'foobar'
2158
2159 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2160 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2161 self.calls = [
2162 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2163 ((['git', 'config', 'rietveld.server'],), ''),
2164 ((['git', 'config', 'rietveld.server'],), ''),
2165 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2166 ((['git', 'config', 'rietveld.server'],), ''),
2167 ((['git', 'config', 'rietveld.server'],), ''),
2168 ]
2169 self.assertEqual(
2170 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2171
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002172 def test_description_gerrit(self):
2173 out = StringIO.StringIO()
2174 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002175 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002176
2177 self.assertEqual(0, git_cl.main([
2178 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2179 self.assertEqual('foobar\n', out.getvalue())
2180
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002181 def test_description_set_raw(self):
2182 out = StringIO.StringIO()
2183 self.mock(git_cl.sys, 'stdout', out)
2184
2185 self.mock(git_cl, 'Changelist', ChangelistMock)
2186 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2187
2188 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2189 self.assertEqual('hihi', ChangelistMock.desc)
2190
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002191 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002192 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002193
2194 def RunEditor(desc, _, **kwargs):
2195 self.assertEquals(
2196 '# Enter a description of the change.\n'
2197 '# This will be displayed on the codereview site.\n'
2198 '# The first line will also be used as the subject of the review.\n'
2199 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002200 '--------------------\n'
2201 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002202 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002203 # Simulate user changing something.
2204 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002205
dsansomee2d6fd92016-09-08 00:10:47 -07002206 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002207 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002208
2209 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2210 self.mock(git_cl.Changelist, 'GetDescription',
2211 lambda *args: current_desc)
2212 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2213 UpdateDescriptionRemote)
2214 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2215
2216 self.calls = [
2217 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002218 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002219 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2220 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002221 ((['git', 'config', 'core.editor'],), 'vi'),
2222 ]
2223 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2224
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002225 def test_description_set_stdin(self):
2226 out = StringIO.StringIO()
2227 self.mock(git_cl.sys, 'stdout', out)
2228
2229 self.mock(git_cl, 'Changelist', ChangelistMock)
2230 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2231
2232 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2233 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2234
kmarshall3bff56b2016-06-06 18:31:47 -07002235 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002236 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2237
kmarshall3bff56b2016-06-06 18:31:47 -07002238 self.calls = \
2239 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2240 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002241 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002242 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2243 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002244 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2245 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2246 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002247 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2248 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2249 ((['git', 'branch', '-D', 'foo'],), '')]
2250
kmarshall3bff56b2016-06-06 18:31:47 -07002251 self.mock(git_cl, 'get_cl_statuses',
2252 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002253 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2254 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2255 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002256
2257 self.assertEqual(0, git_cl.main(['archive', '-f']))
2258
2259 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002260 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002261 self.calls = \
2262 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2263 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002264 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002265 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2266 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002267 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2268
kmarshall9249e012016-08-23 12:02:16 -07002269 self.mock(git_cl, 'get_cl_statuses',
2270 lambda branches, fine_grained, max_processes:
2271 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2272
2273 self.assertEqual(1, git_cl.main(['archive', '-f']))
2274
2275 def test_archive_dry_run(self):
2276 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2277
2278 self.calls = \
2279 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2280 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2281 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2282 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2283 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2284 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2285 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2286 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2287 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002288
2289 self.mock(git_cl, 'get_cl_statuses',
2290 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002291 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2292 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2293 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002294
kmarshall9249e012016-08-23 12:02:16 -07002295 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2296
2297 def test_archive_no_tags(self):
2298 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2299
2300 self.calls = \
2301 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2302 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2303 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2304 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2305 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2306 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2307 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2308 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2309 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2310 ((['git', 'branch', '-D', 'foo'],), '')]
2311
2312 self.mock(git_cl, 'get_cl_statuses',
2313 lambda branches, fine_grained, max_processes:
2314 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2315 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2316 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2317
2318 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002319
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002320 def test_cmd_issue_erase_existing(self):
2321 out = StringIO.StringIO()
2322 self.mock(git_cl.sys, 'stdout', out)
2323 self.calls = [
2324 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002325 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2326 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002327 # Let this command raise exception (retcode=1) - it should be ignored.
2328 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002329 CERR1),
2330 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2331 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002332 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2333 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2334 ''),
2335 ]
2336 self.assertEqual(0, git_cl.main(['issue', '0']))
2337
phajdan.jre328cf92016-08-22 04:12:17 -07002338 def test_cmd_issue_json(self):
2339 out = StringIO.StringIO()
2340 self.mock(git_cl.sys, 'stdout', out)
2341 self.calls = [
2342 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002343 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002344 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2345 ((['git', 'config', 'rietveld.server'],),
2346 'https://codereview.chromium.org'),
2347 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2348 (('write_json', 'output.json',
2349 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2350 ''),
2351 ]
2352 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2353
tandriide281ae2016-10-12 06:02:30 -07002354 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002355 self.mock(git_cl.Changelist, 'GetChange',
2356 lambda _, *a: (
2357 self._mocked_call(['GetChange']+list(a))))
2358 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2359 lambda *_, **__: (
2360 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002361 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2362 lambda _, s: self._mocked_call(['SetCQState', s]))
2363 self.calls = [
2364 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002365 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002366 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2367 ((['git', 'config', 'rietveld.server'],),
2368 'https://codereview.chromium.org'),
2369 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2370 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2371 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2372 ((['get_or_create_merge_base', 'feature', 'feature'],),
2373 'fake_ancestor_sha'),
2374 ((['GetChange', 'fake_ancestor_sha', None], ),
2375 git_cl.presubmit_support.GitChange(
2376 '', '', '', '', '', '', '', '')),
2377 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2378 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002379 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2380 ]
2381 out = StringIO.StringIO()
2382 self.mock(git_cl.sys, 'stdout', out)
2383 self.assertEqual(0, git_cl.main(['try']))
2384 self.assertEqual(
2385 out.getvalue(),
2386 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2387
tandrii8c5a3532016-11-04 07:52:02 -07002388 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2389 self.mock(git_cl.Changelist, 'GetChange',
2390 lambda _, *a: (
2391 self._mocked_call(['GetChange']+list(a))))
2392 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2393 lambda *_, **__: (
2394 self._mocked_call(['DoGetTryMasters'])))
2395 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2396 lambda _, s: self._mocked_call(['SetCQState', s]))
2397
2398 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2399 # Get realistic expectations.
2400 gerrit_change_list_impl._GetGerritHost()
2401 return self._mocked_call(['_GetChangeDetail', opts or []])
2402 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2403 _GetChangeDetail)
2404
2405 self.calls = [
2406 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2407 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2408 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2409 ((['git', 'config', 'branch.feature.gerritserver'],),
2410 'https://chromium-review.googlesource.com'),
2411 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2412 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2413 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2414 ((['get_or_create_merge_base', 'feature', 'feature'],),
2415 'fake_ancestor_sha'),
2416 ((['GetChange', 'fake_ancestor_sha', None], ),
2417 git_cl.presubmit_support.GitChange(
2418 '', '', '', '', '', '', '', '')),
2419 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2420 ((['DoGetTryMasters'], ), None),
2421 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2422 ]
2423 out = StringIO.StringIO()
2424 self.mock(git_cl.sys, 'stdout', out)
2425 self.assertEqual(0, git_cl.main(['try']))
2426 self.assertEqual(
2427 out.getvalue(),
2428 'scheduled CQ Dry Run on '
2429 'https://chromium-review.googlesource.com/123456\n')
2430
2431 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2432 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2433 lambda _: {
2434 'owner_email': 'owner@e.mail',
2435 'private': False,
2436 'closed': False,
2437 'project': 'depot_tools',
2438 'patchsets': [20001],
2439 })
tandriide281ae2016-10-12 06:02:30 -07002440 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2441 self.calls = [
2442 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2443 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2444 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2445 ((['git', 'config', 'rietveld.server'],),
2446 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002447 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002448 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002449 ]
2450
2451 def _buildbucket_retry(*_, **kw):
2452 # self.maxDiff = 10000
2453 body = json.loads(kw['body'])
2454 self.assertEqual(len(body['builds']), 1)
2455 build = body['builds'][0]
2456 params = json.loads(build.pop('parameters_json'))
2457 self.assertEqual(params, {
2458 u'builder_name': u'win',
2459 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2460 u'revision': None}],
2461 u'properties': {
2462 u'category': u'git_cl_try',
2463 u'issue': 123,
2464 u'key': u'val',
2465 u'json': [{u'a': 1}, None],
2466 u'master': u'tryserver.chromium',
2467 u'patch_project': u'depot_tools',
2468 u'patch_storage': u'rietveld',
2469 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002470 u'rietveld': u'https://codereview.chromium.org',
2471 }
2472 })
2473 self.assertEqual(build, {
2474 u'bucket': u'master.tryserver.chromium',
2475 u'client_operation_id': u'uuid4',
2476 u'tags': [u'builder:win',
2477 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002478 u'user_agent:git_cl_try',
2479 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002480 })
2481
2482 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2483
2484 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2485 self.assertEqual(0, git_cl.main([
2486 'try', '-m', 'tryserver.chromium', '-b', 'win',
2487 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2488 self.assertRegexpMatches(
2489 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002490 'Tried jobs on:\nBucket: master.tryserver.chromium')
2491
tandrii8c5a3532016-11-04 07:52:02 -07002492 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2493 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2494 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2495
2496 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2497 # Get realistic expectations.
2498 gerrit_change_list_impl._GetGerritHost()
2499 return self._mocked_call(['_GetChangeDetail', opts or []])
2500 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2501 _GetChangeDetail)
2502
2503 self.calls = [
2504 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2505 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2506 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2507 ((['git', 'config', 'branch.feature.gerritserver'],),
2508 'https://chromium-review.googlesource.com'),
2509 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002510 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2511 {'owner': {'email': 'owner@e.mail'}}),
2512 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2513 'project': 'depot_tools',
2514 'revisions': {
2515 'deadbeaf': {
2516 '_number': 6,
2517 },
2518 'beeeeeef': {
2519 '_number': 7,
2520 'fetch': {'http': {
2521 'url': 'https://chromium.googlesource.com/depot_tools',
2522 'ref': 'refs/changes/56/123456/7'
2523 }},
2524 },
2525 },
2526 }),
2527 ]
2528
2529 def _buildbucket_retry(*_, **kw):
2530 # self.maxDiff = 10000
2531 body = json.loads(kw['body'])
2532 self.assertEqual(len(body['builds']), 1)
2533 build = body['builds'][0]
2534 params = json.loads(build.pop('parameters_json'))
2535 self.assertEqual(params, {
2536 u'builder_name': u'win',
2537 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2538 u'revision': None}],
2539 u'properties': {
2540 u'category': u'git_cl_try',
2541 u'key': u'val',
2542 u'json': [{u'a': 1}, None],
2543 u'master': u'tryserver.chromium',
2544
2545 u'patch_gerrit_url':
2546 u'https://chromium-review.googlesource.com',
2547 u'patch_issue': 123456,
2548 u'patch_project': u'depot_tools',
2549 u'patch_ref': u'refs/changes/56/123456/7',
2550 u'patch_repository_url':
2551 u'https://chromium.googlesource.com/depot_tools',
2552 u'patch_set': 7,
2553 u'patch_storage': u'gerrit',
2554 }
2555 })
2556 self.assertEqual(build, {
2557 u'bucket': u'master.tryserver.chromium',
2558 u'client_operation_id': u'uuid4',
2559 u'tags': [
2560 u'builder:win',
2561 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2562 u'user_agent:git_cl_try',
2563 u'master:tryserver.chromium'],
2564 })
2565
2566 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2567
2568 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2569 self.assertEqual(0, git_cl.main([
2570 'try', '-m', 'tryserver.chromium', '-b', 'win',
2571 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2572 self.assertRegexpMatches(
2573 git_cl.sys.stdout.getvalue(),
2574 'Tried jobs on:\nBucket: master.tryserver.chromium')
2575
borenet6c0efe62016-10-19 08:13:29 -07002576 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002577 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2578 lambda _: {
2579 'owner_email': 'owner@e.mail',
2580 'private': False,
2581 'closed': False,
2582 'project': 'depot_tools',
2583 'patchsets': [20001],
2584 })
borenet6c0efe62016-10-19 08:13:29 -07002585 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2586 self.calls = [
2587 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2588 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2589 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2590 ((['git', 'config', 'rietveld.server'],),
2591 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002592 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002593 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002594 ]
2595
2596 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002597 body = json.loads(kw['body'])
2598 self.assertEqual(len(body['builds']), 1)
2599 build = body['builds'][0]
2600 params = json.loads(build.pop('parameters_json'))
2601 self.assertEqual(params, {
2602 u'builder_name': u'win',
2603 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2604 u'revision': None}],
2605 u'properties': {
2606 u'category': u'git_cl_try',
2607 u'issue': 123,
2608 u'patch_project': u'depot_tools',
2609 u'patch_storage': u'rietveld',
2610 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002611 u'rietveld': u'https://codereview.chromium.org',
2612 }
2613 })
2614 self.assertEqual(build, {
2615 u'bucket': u'test.bucket',
2616 u'client_operation_id': u'uuid4',
2617 u'tags': [u'builder:win',
2618 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2619 u'user_agent:git_cl_try'],
2620 })
2621
2622 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2623
2624 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2625 self.assertEqual(0, git_cl.main([
2626 'try', '-B', 'test.bucket', '-b', 'win']))
2627 self.assertRegexpMatches(
2628 git_cl.sys.stdout.getvalue(),
2629 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002630
qyearsley123a4682016-10-26 09:12:17 -07002631 def test_git_cl_try_bots_on_multiple_masters(self):
2632 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2633 self.calls = [
2634 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2635 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2636 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2637 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002638 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002639 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2640 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2641 ]
2642
2643 def _buildbucket_retry(*_, **kw):
2644 body = json.loads(kw['body'])
2645 self.assertEqual(len(body['builds']), 2)
2646
2647 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2648 self.assertEqual(first_build_params['builder_name'], 'builder1')
2649 self.assertEqual(first_build_params['properties']['master'], 'master1')
2650
2651 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2652 self.assertEqual(first_build_params['builder_name'], 'builder2')
2653 self.assertEqual(first_build_params['properties']['master'], 'master2')
2654
2655 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2656
2657 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2658 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2659
2660 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2661 self.assertEqual(
2662 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2663 self.assertEqual(
2664 git_cl.sys.stdout.getvalue(),
2665 'Tried jobs on:\n'
2666 'Bucket: master.master1\n'
2667 ' builder1: []\n'
2668 'Bucket: master.master2\n'
2669 ' builder2: []\n'
2670 'To see results here, run: git cl try-results\n'
2671 'To see results in browser, run: git cl web\n')
2672
tandrii16e0b4e2016-06-07 10:34:28 -07002673 def _common_GerritCommitMsgHookCheck(self):
2674 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2675 self.mock(git_cl.os.path, 'abspath',
2676 lambda path: self._mocked_call(['abspath', path]))
2677 self.mock(git_cl.os.path, 'exists',
2678 lambda path: self._mocked_call(['exists', path]))
2679 self.mock(git_cl.gclient_utils, 'FileRead',
2680 lambda path: self._mocked_call(['FileRead', path]))
2681 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2682 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2683 self.calls = [
2684 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2685 ((['abspath', '../'],), '/abs/git_repo_root'),
2686 ]
2687 return git_cl.Changelist(codereview='gerrit', issue=123)
2688
2689 def test_GerritCommitMsgHookCheck_custom_hook(self):
2690 cl = self._common_GerritCommitMsgHookCheck()
2691 self.calls += [
2692 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2693 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2694 '#!/bin/sh\necho "custom hook"')
2695 ]
2696 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2697
2698 def test_GerritCommitMsgHookCheck_not_exists(self):
2699 cl = self._common_GerritCommitMsgHookCheck()
2700 self.calls += [
2701 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2702 ]
2703 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2704
2705 def test_GerritCommitMsgHookCheck(self):
2706 cl = self._common_GerritCommitMsgHookCheck()
2707 self.calls += [
2708 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2709 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2710 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2711 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2712 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2713 ''),
2714 ]
2715 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2716
tandriic4344b52016-08-29 06:04:54 -07002717 def test_GerritCmdLand(self):
2718 self.calls += [
2719 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2720 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2721 'deadbeaf'),
2722 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2723 ((['git', 'config', 'branch.feature.gerritserver'],),
2724 'chromium-review.googlesource.com'),
2725 ]
2726 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2727 cl._codereview_impl._GetChangeDetail = lambda _: {
2728 'labels': {},
2729 'current_revision': 'deadbeaf',
2730 }
agable32978d92016-11-01 12:55:02 -07002731 cl._codereview_impl._GetChangeCommit = lambda: {
2732 'commit': 'deadbeef',
2733 'web_links': [{'name': 'gerrit',
2734 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2735 }
tandriic4344b52016-08-29 06:04:54 -07002736 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002737 out = StringIO.StringIO()
2738 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002739 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002740 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002741 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002742
tandrii221ab252016-10-06 08:12:04 -07002743 BUILDBUCKET_BUILDS_MAP = {
2744 '9000': {
2745 'id': '9000',
2746 'status': 'STARTED',
2747 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2748 'result_details_json': '{"properties": {}}',
2749 'bucket': 'master.x.y',
2750 'created_by': 'user:someone@chromium.org',
2751 'created_ts': '147200002222000',
2752 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2753 },
2754 '8000': {
2755 'id': '8000',
2756 'status': 'COMPLETED',
2757 'result': 'FAILURE',
2758 'failure_reason': 'BUILD_FAILURE',
2759 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2760 'result_details_json': '{"properties": {}}',
2761 'bucket': 'master.x.y',
2762 'created_by': 'user:someone@chromium.org',
2763 'created_ts': '147200001111000',
2764 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2765 },
2766 }
2767
2768 def test_write_try_results_json(self):
2769 expected_output = [
2770 {
2771 'buildbucket_id': '8000',
2772 'bucket': 'master.x.y',
2773 'builder_name': 'my-builder',
2774 'status': 'COMPLETED',
2775 'result': 'FAILURE',
2776 'failure_reason': 'BUILD_FAILURE',
2777 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2778 },
2779 {
2780 'buildbucket_id': '9000',
2781 'bucket': 'master.x.y',
2782 'builder_name': 'my-builder',
2783 'status': 'STARTED',
2784 'result': None,
2785 'failure_reason': None,
2786 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2787 }
2788 ]
2789 self.calls = [(('write_json', 'output.json', expected_output), '')]
2790 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2791
tandrii45b2a582016-10-11 03:14:16 -07002792 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002793 out = StringIO.StringIO()
2794 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002795 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2796 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002797 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2798 self._mocked_call(['get_authenticator_for_host', host]))
2799 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2800 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002801
2802 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2803 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002804 self.calls += [
2805 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2806 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2807 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2808 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2809 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2810 ((['git', 'config', 'branch.feature.rietveldserver'],),
2811 'codereview.example.com'),
2812 ((['get_authenticator_for_host', 'codereview.example.com'],),
2813 AuthenticatorMock()),
2814 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2815
2816 def test_fetch_try_jobs_none_rietveld(self):
2817 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002818 # Simulate that user isn't logged in.
2819 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002820 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002821 self.assertRegexpMatches(sys.stdout.getvalue(),
2822 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002823 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2824
2825 def test_fetch_try_jobs_some_rietveld(self):
2826 self._setup_fetch_try_jobs_rietveld({
2827 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2828 })
2829 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002830 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2831 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2832 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2833
2834 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2835 self._setup_fetch_try_jobs(most_recent_patchset=13)
2836 self.calls += [
2837 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2838 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2839 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002840 # TODO(tandrii): Uncomment the below if we decide to support checking
2841 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002842 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002843 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002844 ((['git', 'config', 'branch.feature.gerritserver'],),
2845 'https://x-review.googlesource.com'),
2846 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2847 AuthenticatorMock()),
2848 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2849
2850 def test_fetch_try_jobs_none_gerrit(self):
2851 self._setup_fetch_try_jobs_gerrit({})
2852 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002853 # TODO(tandrii): Uncomment the below if we decide to support checking
2854 # patchsets for Gerrit.
2855 # self.assertRegexpMatches(
2856 # sys.stdout.getvalue(),
2857 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002858 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2859
2860 def test_fetch_try_jobs_some_gerrit(self):
2861 self._setup_fetch_try_jobs_gerrit({
2862 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2863 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002864 # TODO(tandrii): Uncomment the below if we decide to support checking
2865 # patchsets for Gerrit.
2866 # self.calls.remove(
2867 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002868 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2869
2870 # ... and doesn't result in warning.
2871 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2872 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002873 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2874 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2875
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002876
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002877if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002878 git_cl.logging.basicConfig(
2879 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002880 unittest.main()