blob: bf0f002b743c98006f48d756df8bbe0ad044f4cf [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
tandriide281ae2016-10-12 06:02:30 -07008import json
maruel@chromium.orgddd59412011-11-30 14:20:38 +00009import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000010import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000011import sys
12import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000013import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014
15sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
16
17from testing_support.auto_stub import TestCase
18
19import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000020import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000021import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000022import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000023
tandrii5d48c322016-08-18 16:19:37 -070024def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
25 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
26
27
28CERR1 = callError(1)
29
30
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000031class ChangelistMock(object):
32 # A class variable so we can access it when we don't have access to the
33 # instance that's being set.
34 desc = ""
35 def __init__(self, **kwargs):
36 pass
37 def GetIssue(self):
38 return 1
39 def GetDescription(self):
40 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070041 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000042 ChangelistMock.desc = desc
43
tandrii5d48c322016-08-18 16:19:37 -070044
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000045class PresubmitMock(object):
46 def __init__(self, *args, **kwargs):
47 self.reviewers = []
48 @staticmethod
49 def should_continue():
50 return True
51
52
53class RietveldMock(object):
54 def __init__(self, *args, **kwargs):
55 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000056
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000057 @staticmethod
58 def get_description(issue):
59 return 'Issue: %d' % issue
60
maruel@chromium.org78936cb2013-04-11 00:17:52 +000061 @staticmethod
62 def get_issue_properties(_issue, _messages):
63 return {
64 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
65 'messages': [
66 {
67 'approval': True,
68 'sender': 'john@chromium.org',
69 },
70 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010071 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000072 }
73
iannuccie53c9352016-08-17 14:40:40 -070074 @staticmethod
75 def close_issue(_issue):
76 return 'Closed'
77
skobes6468b902016-10-24 08:45:10 -070078 @staticmethod
79 def get_patch(issue, patchset):
80 return 'patch set from issue %s patchset %s' % (issue, patchset)
81
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010082 @staticmethod
83 def update_description(_issue, _description):
84 return 'Updated'
85
86 @staticmethod
87 def add_comment(_issue, _comment):
88 return 'Commented'
89
90
91
skobes6468b902016-10-24 08:45:10 -070092
93class GitCheckoutMock(object):
94 def __init__(self, *args, **kwargs):
95 pass
96
97 @staticmethod
98 def reset():
99 GitCheckoutMock.conflict = False
100
101 def apply_patch(self, p):
102 if GitCheckoutMock.conflict:
103 raise Exception('failed')
104
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000105
106class WatchlistsMock(object):
107 def __init__(self, _):
108 pass
109 @staticmethod
110 def GetWatchersForPaths(_):
111 return ['joe@example.com']
112
113
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000114class CodereviewSettingsFileMock(object):
115 def __init__(self):
116 pass
117 # pylint: disable=R0201
118 def read(self):
119 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000120 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000121
122
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000123class AuthenticatorMock(object):
124 def __init__(self, *_args):
125 pass
126 def has_cached_credentials(self):
127 return True
tandrii221ab252016-10-06 08:12:04 -0700128 def authorize(self, http):
129 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000130
131
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000132def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
133 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
134
135 Usage:
136 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
137 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
138
139 OR
140 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
141 CookiesAuthenticatorMockFactory(cookie='cookie'))
142 """
143 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
144 def __init__(self): # pylint: disable=W0231
145 # Intentionally not calling super() because it reads actual cookie files.
146 pass
147 @classmethod
148 def get_gitcookies_path(cls):
149 return '~/.gitcookies'
150 @classmethod
151 def get_netrc_path(cls):
152 return '~/.netrc'
153 def get_auth_header(self, host):
154 if same_cookie:
155 return same_cookie
156 return (hosts_with_creds or {}).get(host)
157 return CookiesAuthenticatorMock
158
kmarshall9249e012016-08-23 12:02:16 -0700159class MockChangelistWithBranchAndIssue():
160 def __init__(self, branch, issue):
161 self.branch = branch
162 self.issue = issue
163 def GetBranch(self):
164 return self.branch
165 def GetIssue(self):
166 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000167
tandriic2405f52016-10-10 08:13:15 -0700168
169class SystemExitMock(Exception):
170 pass
171
172
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000173class TestGitClBasic(unittest.TestCase):
174 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
175 parsed = urlparse.urlparse(url)
176 result = func(parsed)
177 if fail:
178 self.assertIsNone(result)
179 return None
180 self.assertIsNotNone(result)
181 self.assertEqual(result.issue, issue)
182 self.assertEqual(result.patchset, patchset)
183 self.assertEqual(result.hostname, hostname)
184 return result
185
186 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700187 def test(url, issue=None, patchset=None, hostname=None, fail=None):
188 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000189 git_cl._RietveldChangelistImpl.ParseIssueURL,
190 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000191
192 test('http://codereview.chromium.org/123',
193 123, None, 'codereview.chromium.org')
194 test('https://codereview.chromium.org/123',
195 123, None, 'codereview.chromium.org')
196 test('https://codereview.chromium.org/123/',
197 123, None, 'codereview.chromium.org')
198 test('https://codereview.chromium.org/123/whatever',
199 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700200 test('https://codereview.chromium.org/123/#ps20001',
201 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000202 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700203 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000204 # This looks like bad Gerrit, but is actually valid Rietveld.
205 test('https://chrome-review.source.com/123/4/',
206 123, None, 'chrome-review.source.com')
207
208 test('https://codereview.chromium.org/deadbeaf', fail=True)
209 test('https://codereview.chromium.org/api/123', fail=True)
210 test('bad://codereview.chromium.org/123', fail=True)
211 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
212
213 def test_ParseIssueURL_gerrit(self):
214 def test(url, issue=None, patchset=None, hostname=None, fail=None):
215 self._test_ParseIssueUrl(
216 git_cl._GerritChangelistImpl.ParseIssueURL,
217 url, issue, patchset, hostname, fail)
218
219 test('http://chrome-review.source.com/c/123',
220 123, None, 'chrome-review.source.com')
221 test('https://chrome-review.source.com/c/123/',
222 123, None, 'chrome-review.source.com')
223 test('https://chrome-review.source.com/c/123/4',
224 123, 4, 'chrome-review.source.com')
225 test('https://chrome-review.source.com/#/c/123/4',
226 123, 4, 'chrome-review.source.com')
227 test('https://chrome-review.source.com/c/123/4',
228 123, 4, 'chrome-review.source.com')
229 test('https://chrome-review.source.com/123',
230 123, None, 'chrome-review.source.com')
231 test('https://chrome-review.source.com/123/4',
232 123, 4, 'chrome-review.source.com')
233
234 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
235 test('https://chrome-review.source.com/c/abc/', fail=True)
236 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
237
238 def test_ParseIssueNumberArgument(self):
239 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
240 result = git_cl.ParseIssueNumberArgument(arg)
241 self.assertIsNotNone(result)
242 if fail:
243 self.assertFalse(result.valid)
244 else:
245 self.assertEqual(result.issue, issue)
246 self.assertEqual(result.patchset, patchset)
247 self.assertEqual(result.hostname, hostname)
248
249 test('123', 123)
250 test('', fail=True)
251 test('abc', fail=True)
252 test('123/1', fail=True)
253 test('123a', fail=True)
254 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
255 # Rietveld.
256 test('https://codereview.source.com/123',
257 123, None, 'codereview.source.com')
258 test('https://codereview.source.com/www123', fail=True)
259 # Gerrrit.
260 test('https://chrome-review.source.com/c/123/4',
261 123, 4, 'chrome-review.source.com')
262 test('https://chrome-review.source.com/bad/123/4', fail=True)
263
tandriif9aefb72016-07-01 09:06:51 -0700264 def test_get_bug_line_values(self):
265 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
266 self.assertEqual(f('', ''), [])
267 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
268 self.assertEqual(f('v8', '456'), ['v8:456'])
269 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
270 # Not nice, but not worth carying.
271 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
272 ['v8:456', 'chromium:123', 'v8:123'])
273
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000274
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000275class TestGitCl(TestCase):
276 def setUp(self):
277 super(TestGitCl, self).setUp()
278 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700279 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000280 self.mock(subprocess2, 'call', self._mocked_call)
281 self.mock(subprocess2, 'check_call', self._mocked_call)
282 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700283 self.mock(subprocess2, 'communicate',
284 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000285 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000286 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000287 self.mock(git_common, 'get_or_create_merge_base',
288 lambda *a: (
289 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000290 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000291 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000292 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700293 self.mock(git_cl, 'write_json', lambda path, contents:
294 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000295 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000296 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000297 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700298 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
299 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000300 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000301 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000302 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000303 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
304 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700305 self.mock(git_cl, 'DieWithError',
306 lambda msg: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000307 # It's important to reset settings to not have inter-tests interference.
308 git_cl.settings = None
309
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000310
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000311 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000312 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000313 # Note: has_failed returns True if at least 1 test ran so far, current
314 # included, has failed. That means current test may have actually ran
315 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000316 if not self.has_failed():
317 self.assertEquals([], self.calls)
318 finally:
319 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000320
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000321 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000322 self.assertTrue(
323 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700324 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000325 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000326 expected_args, result = top
327
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000328 # Also logs otherwise it could get caught in a try/finally and be hard to
329 # diagnose.
330 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700331 N = 5
332 prior_calls = '\n '.join(
333 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
334 for i, c in enumerate(self._calls_done[-N:]))
335 following_calls = '\n '.join(
336 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
337 for i, c in enumerate(self.calls[:N]))
338 extended_msg = (
339 'A few prior calls:\n %s\n\n'
340 'This (expected):\n @%d: %r\n'
341 'This (actual):\n @%d: %r\n\n'
342 'A few following expected calls:\n %s' %
343 (prior_calls, len(self._calls_done), expected_args,
344 len(self._calls_done), args, following_calls))
345 git_cl.logging.error(extended_msg)
346
tandrii99a72f22016-08-17 14:33:24 -0700347 self.fail('@%d\n'
348 ' Expected: %r\n'
349 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700350 len(self._calls_done), expected_args, args))
351
352 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700353 if isinstance(result, Exception):
354 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000355 return result
356
tandrii48df5812016-10-17 03:55:37 -0700357 def test_LoadCodereviewSettingsFromFile_gerrit(self):
358 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
359 self.calls = [
360 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
361 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
362 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
363 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
364 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
365 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
366 ((['git', 'config', '--unset-all', 'rietveld.force-https-commit-url'],),
367 CERR1),
368 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
369 CERR1),
370 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
371 ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],),
372 CERR1),
373 ((['git', 'config', '--unset-all', 'rietveld.git-number-footer'],),
374 CERR1),
375 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
376 CERR1),
377 ((['git', 'config', 'gerrit.host', 'true'],), ''),
378 ]
379 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
380
maruel@chromium.orga3353652011-11-30 14:26:57 +0000381 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000382 def _is_gerrit_calls(cls, gerrit=False):
383 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
384 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
385
386 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000387 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000388 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000389 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000390
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000391 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000392 def _upload_no_rev_calls(cls, similarity, find_copies):
393 return (cls._git_base_calls(similarity, find_copies) +
394 cls._git_upload_no_rev_calls())
395
396 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000397 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000398 if similarity is None:
399 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700400 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700401 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000402 else:
tandrii33a46ff2016-08-23 05:53:40 -0700403 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700404 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000405
406 if find_copies is None:
407 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700408 find_copies_call = ((['git', 'config', '--bool',
409 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000410 else:
tandrii5d48c322016-08-18 16:19:37 -0700411 val = str(find_copies).lower()
412 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000413 'branch.master.git-find-copies', val],), '')
414
415 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000416 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800417 '-l100000', '-C'+similarity,
418 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000419 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000420 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000421 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000422
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000423 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000424 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000425 similarity_call,
426 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
427 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000428 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000429 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700430 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
431 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000432 ((['git', 'config', 'rietveld.server'],),
433 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000434 ((['git', 'config', 'branch.master.merge'],), 'master'),
435 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000436 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000437 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000438 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000439 ((['git', 'rev-parse', '--show-cdup'],), ''),
440 ((['git', 'rev-parse', 'HEAD'],), '12345'),
441 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000442 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000443 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700444 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000445 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000446 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000447 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000448 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000449 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000450 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000451 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000452 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000453 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000454 ]
455
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000456 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000457 def _git_upload_no_rev_calls(cls):
458 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000459 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000460 ]
461
462 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000463 def _git_upload_calls(cls, private):
464 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000465 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000466 private_call = []
467 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000468 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000469 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000470 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000471
maruel@chromium.orga3353652011-11-30 14:26:57 +0000472 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000473 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000474 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000475 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000476 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000477 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000478 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
479 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000480 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000481 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000482 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700483 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000484 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000485 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000486 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700487 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000488 ] + cls._git_post_upload_calls()
489
490 @classmethod
491 def _git_post_upload_calls(cls):
492 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000493 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
494 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
495 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000496 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000497 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000498 ]
499
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000500 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000501 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000502 fake_ancestor = 'fake_ancestor'
503 fake_cl = 'fake_cl_for_patch'
504 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000505 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000506 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000507 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000508 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000509 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000510 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000511 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000512 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700513 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000514 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000515 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000516 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000517 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000518 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000519 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000520 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000521 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000522 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000523 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000524 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000525
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000526 @classmethod
527 def _dcommit_calls_1(cls):
528 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000529 ((['git', 'config', 'rietveld.autoupdate'],),
530 ''),
531 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
532 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000533 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000534 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000535 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
536 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
537 None),
538 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000539 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700540 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700541 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000542 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700543 ((['git', 'config', '--bool',
544 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000545 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
546 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700547 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000548 ((['git',
549 'config', 'rietveld.server'],), 'codereview.example.com'),
550 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000551 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000552 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000553 ((['git', 'config', 'branch.working.merge'],),
554 'refs/heads/master'),
555 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000556 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000557 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000558 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000559 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000560 'refs/remotes/origin/master'],),
561 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000562 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000563 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000564 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000565 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000566 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000567 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000568 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000569 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000570 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000571 ]
572
573 @classmethod
574 def _dcommit_calls_normal(cls):
575 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000576 ((['git', 'rev-parse', '--show-cdup'],), ''),
577 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000578 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000579 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000580 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000581 '.'],),
582 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000583 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700584 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000585 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000586 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000587 ((['git', 'config', 'user.email'],), 'author@example.com'),
588 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000589 ]
590
591 @classmethod
592 def _dcommit_calls_bypassed(cls):
593 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000594 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000595 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000596 ]
597
598 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000599 def _dcommit_calls_3(cls):
600 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000601 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -0800602 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
603 'fake_ancestor_sha', 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000604 (' PRESUBMIT.py | 2 +-\n'
605 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000606 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700607 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000608 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
609 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700610 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000611 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000612 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
613 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
614 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000615 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000616 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000617 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000618 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000619 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000620 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000621 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000622 ((['git', 'checkout', '-q', 'working'],), ''),
623 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000624 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000625
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000626 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700627 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000628 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000629 return [
630 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000631 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000632 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000633 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700634 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000635 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000636 '--git_similarity', similarity or '50'
637 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000638 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000639 ]
640
641 def _run_reviewer_test(
642 self,
643 upload_args,
644 expected_description,
645 returned_description,
646 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000647 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700648 private=False,
649 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000650 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000651 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000652 try:
653 similarity = upload_args[upload_args.index('--similarity')+1]
654 except ValueError:
655 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000656
657 if '--find-copies' in upload_args:
658 find_copies = True
659 elif '--no-find-copies' in upload_args:
660 find_copies = False
661 else:
662 find_copies = None
663
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000664 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700665 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000666
667 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000668
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000669 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000670 self.assertEquals(
671 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000672 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000673 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000674 '#--------------------This line is 72 characters long'
675 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000676 expected_description,
677 desc)
678 return returned_description
679 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000680
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000681 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000682 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700683 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000684 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000685 return 1, 2
686 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000687
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000688 git_cl.main(['upload'] + upload_args)
689
690 def test_no_reviewer(self):
691 self._run_reviewer_test(
692 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000693 'desc\n\nBUG=',
694 '# Blah blah comment.\ndesc\n\nBUG=',
695 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000696 [])
697
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000698 def test_keep_similarity(self):
699 self._run_reviewer_test(
700 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000701 'desc\n\nBUG=',
702 '# Blah blah comment.\ndesc\n\nBUG=',
703 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000704 [])
705
iannucci@chromium.org79540052012-10-19 23:15:26 +0000706 def test_keep_find_copies(self):
707 self._run_reviewer_test(
708 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000709 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000710 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000711 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000712 [])
713
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000714 def test_private(self):
715 self._run_reviewer_test(
716 ['--private'],
717 'desc\n\nBUG=',
718 '# Blah blah comment.\ndesc\n\nBUG=\n',
719 'desc\n\nBUG=',
720 [])
721
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000722 def test_reviewers_cmd_line(self):
723 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000724 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000725 self._run_reviewer_test(
726 ['-r' 'foo@example.com'],
727 description,
728 '\n%s\n' % description,
729 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000730 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000731
732 def test_reviewer_tbr_overriden(self):
733 # Reviewer is overriden with TBR
734 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000735 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000736 self._run_reviewer_test(
737 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000738 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000739 description.strip('\n'),
740 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000741 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000742
743 def test_reviewer_multiple(self):
744 # Handles multiple R= or TBR= lines.
745 description = (
bradnelsond975b302016-10-23 12:20:23 -0700746 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
747 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000748 self._run_reviewer_test(
749 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000750 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000751 description,
752 description,
bradnelsond975b302016-10-23 12:20:23 -0700753 ['--reviewers=another@example.com,reviewer@example.com'],
754 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000755
maruel@chromium.orga3353652011-11-30 14:26:57 +0000756 def test_reviewer_send_mail(self):
757 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000758 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000759 self._run_reviewer_test(
760 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000761 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000762 description.strip('\n'),
763 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000764 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000765
766 def test_reviewer_send_mail_no_rev(self):
767 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000768 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700769 self.calls = self._upload_no_rev_calls(None, None) + [
770 ((['DieWithError', 'Must specify reviewers to send email.'],),
771 SystemExitMock())
772 ]
773
774 def RunEditor(desc, _, **kwargs):
775 return desc
776 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
777 self.mock(sys, 'stdout', stdout)
778 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000779 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700780 self.assertEqual(
781 'Using 50% similarity for rename/copy detection. Override with '
782 '--similarity.\n',
783 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000784
tandriif9aefb72016-07-01 09:06:51 -0700785 def test_bug_on_cmd(self):
786 self._run_reviewer_test(
787 ['--bug=500658,proj:123'],
788 'desc\n\nBUG=500658\nBUG=proj:123',
789 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
790 'desc\n\nBUG=500658\nBUG=proj:1234',
791 [])
792
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000793 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000794 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000795 self.calls = (
796 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000797 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000798 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000799 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000800 git_cl.main(['dcommit'])
801
802 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000803 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000804 self.calls = (
805 self._dcommit_calls_1() +
806 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000807 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000808 git_cl.main(['dcommit', '--bypass-hooks'])
809
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100810 def _land_rietveld_common(self, debug_stdout=False):
811 if not debug_stdout:
812 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
813 self.mock(RietveldMock, 'update_description', staticmethod(
814 lambda i, d: self._mocked_call(['update_description', i, d])))
815 self.mock(RietveldMock, 'add_comment', staticmethod(
816 lambda i, c: self._mocked_call(['add_comment', i, c])))
817 self.calls = [
818 ((['git', 'config', 'rietveld.autoupdate'],), ''),
819 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
820 ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
821 CERR1),
822 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
823 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
824 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
825 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
826 CERR1),
827 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
828 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
829 ((['git', 'config', 'rietveld.server'],),
830 'https://codereview.chromium.org'),
831 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
832 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
833 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
834 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
835 ((['git', 'rev-list', '--merges',
836 '--grep=^SVN changes up to revision [0-9]*$',
837 'refs/remotes/origin/master^!'],), ''),
838 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
839 ''), # No commits to rebase, according to local view of origin.
840 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
841 'fake_ancestor_sha'),
842 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
843 ((['git', 'rev-parse', '--show-cdup'],), ''),
844 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
845 ((['git', 'diff', '--name-status', '--no-renames', '-r',
846 'fake_ancestor_sha...', '.'],),
847 'M\tfile1.cpp'),
848 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
849 ((['git', 'config', 'branch.feature.rietveldserver'],),
850 'https://codereview.chromium.org'),
851 ((['git', 'config', 'user.email'],), 'user@e.mail'),
852 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
853 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
854 'fake_ancestor_sha', 'feature'],),
855 # This command just prints smth like this:
856 # file1.cpp | 53 ++++++--
857 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
858 ''),
859 ((['git', 'show-ref', '--quiet', '--verify',
860 'refs/heads/git-cl-commit'],),
861 ''), # 0 return code means branch exists.
862 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
863 ((['git', 'show-ref', '--quiet', '--verify',
864 'refs/heads/git-cl-cherry-pick'],),
865 CERR1), # This means git-cl-cherry-pick branch does not exist.
866 ((['git', 'rev-parse', '--show-cdup'],), ''),
867 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
868 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
869 ((['git', 'commit', '-m',
870 'Issue: 123\n\nR=john@chromium.org\n\n'
871 'Review URL: https://codereview.chromium.org/123 .'],), ''),
872 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
873 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
874 ((['git', 'config', '--get', 'remote.origin.url'],),
875 'https://chromium.googlesource.com/infra/infra'),
876 ]
877
878 def test_land_rietveld(self):
879 self._land_rietveld_common()
880 self.calls += [
881 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
882 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
883 ''),
884 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
885 ((['git', 'checkout', '-q', 'feature'],), ''),
886 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
887 ((['git', 'config', 'rietveld.viewvc-url'],),
888 'https://chromium.googlesource.com/infra/infra/+/'),
889 ((['update_description', 123,
890 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
891 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
892 ''),
893 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
894 'fake_sha_rebased (presubmit successful).'],), ''),
895 ]
896 git_cl.main(['land'])
897
898 def test_land_rietveld_gnumbd(self):
899 self._land_rietveld_common()
900 self.mock(git_cl, 'WaitForRealCommit',
901 lambda *a: self._mocked_call(['WaitForRealCommit'] + list(a)))
902 self.calls += [
903 ((['git', 'config', 'rietveld.pending-ref-prefix'],), 'refs/pending/'),
904 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
905 ((['git', 'retry', 'fetch', 'origin',
906 '+refs/pending/heads/master:refs/git-cl/pending/heads/master'],), ''),
907 ((['git', 'checkout', 'refs/git-cl/pending/heads/master'],), ''),
908 ((['git', 'cherry-pick', 'fake_sha_rebased'],), ''),
909
910 ((['git', 'retry', 'push', '--porcelain', 'origin',
911 'HEAD:refs/pending/heads/master'],),''),
912 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased_on_pending'),
913
914 ((['git', 'checkout', '-q', 'feature'],), ''),
915 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
916
917 ((['WaitForRealCommit', 'origin', 'fake_sha_rebased_on_pending',
918 'refs/remotes/origin/master', 'refs/heads/master'],),
919 'fake_sha_gnumbded'),
920
921 ((['git', 'config', 'rietveld.viewvc-url'],),
922 'https://chromium.googlesource.com/infra/infra/+/'),
923 ((['update_description', 123,
924 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
925 'https://chromium.googlesource.com/infra/infra/+/fake_sha_gnumbded'],),
926 ''),
927 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
928 'fake_sha_gnumbded (presubmit successful).'],),
929 ''),
930 ]
931 git_cl.main(['land'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000932
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000933 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000934 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000935 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000936 if skip_auth_check:
937 return [((cmd, ), 'true')]
938
tandrii5d48c322016-08-18 16:19:37 -0700939 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000940 if issue:
941 calls.extend([
942 ((['git', 'config', 'branch.master.gerritserver'],), ''),
943 ])
944 calls.extend([
945 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
946 ((['git', 'config', 'branch.master.remote'],), 'origin'),
947 ((['git', 'config', 'remote.origin.url'],),
948 'https://chromium.googlesource.com/my/repo'),
949 ((['git', 'config', 'remote.origin.url'],),
950 'https://chromium.googlesource.com/my/repo'),
951 ])
952 return calls
953
954 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000955 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000956 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000957 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700958 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -0700959 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000960 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700961 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
962 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000963 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000964 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700965 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
966 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -0700967 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000968 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000969 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000970 ((['get_or_create_merge_base', 'master',
971 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000972 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000973 # Calls to verify branch point is ancestor
974 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
975 cls._git_sanity_checks('fake_ancestor_sha', 'master',
976 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000977 ((['git', 'rev-parse', '--show-cdup'],), ''),
978 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000979
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000980 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000981 'diff', '--name-status', '--no-renames', '-r',
982 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000983 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700984 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000985 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000986 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000987 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000988 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000989 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000990 ((['git', 'config', 'user.email'],), 'me@example.com'),
991 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -0800992 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
993 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000994 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000995 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000996
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000997 @classmethod
998 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700999 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001000 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001001 ref_suffix='', notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001002 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001003 if post_amend_description is None:
1004 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001005 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001006 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001007
tandriia60502f2016-06-20 02:01:53 -07001008 if squash_mode == 'default':
1009 calls.extend([
1010 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1011 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1012 ])
1013 elif squash_mode in ('override_squash', 'override_nosquash'):
1014 calls.extend([
1015 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1016 'true' if squash_mode == 'override_squash' else 'false'),
1017 ])
1018 else:
1019 assert squash_mode in ('squash', 'nosquash')
1020
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001021 # If issue is given, then description is fetched from Gerrit instead.
1022 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001023 calls += [
1024 ((['git', 'log', '--pretty=format:%s\n\n%b',
1025 'fake_ancestor_sha..HEAD'],),
1026 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001027 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001028 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001029 # DownloadGerritHook(False)
1030 ((False, ),
1031 ''),
1032 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001033 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001034 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001035 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001036 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001037 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001038 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001039 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001040 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001041 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001042 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001043 if not issue:
1044 # Prompting to edit description on first upload.
1045 calls += [
1046 ((['git', 'config', 'core.editor'],), ''),
1047 ((['RunEditor'],), description),
1048 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001049 ref_to_push = 'abcdef0123456789'
1050 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001051 ((['git', 'config', 'branch.master.merge'],),
1052 'refs/heads/master'),
1053 ((['git', 'config', 'branch.master.remote'],),
1054 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001055 ((['get_or_create_merge_base', 'master',
1056 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001057 'origin/master'),
1058 ((['git', 'rev-parse', 'HEAD:'],),
1059 '0123456789abcdef'),
1060 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001061 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001062 ref_to_push),
1063 ]
1064 else:
1065 ref_to_push = 'HEAD'
1066
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001067 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001068 ((['git', 'rev-list',
1069 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001070 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001071
1072 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1073 if ref_suffix:
1074 ref_suffix += ',' + notify_suffix
1075 else:
1076 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001077
ukai@chromium.orge8077812012-02-03 03:41:46 +00001078 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001079 ref_suffix += ',' + ','.join('r=%s' % email
1080 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001081 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001082 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001083 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001084 ('remote:\n'
1085 'remote: Processing changes: (\)\n'
1086 'remote: Processing changes: (|)\n'
1087 'remote: Processing changes: (/)\n'
1088 'remote: Processing changes: (-)\n'
1089 'remote: Processing changes: new: 1 (/)\n'
1090 'remote: Processing changes: new: 1, done\n'
1091 'remote:\n'
1092 'remote: New Changes:\n'
1093 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1094 'remote:\n'
1095 'To https://chromium.googlesource.com/yyy/zzz\n'
1096 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001097 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001098 if squash:
1099 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001100 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001101 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001102 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001103 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001104 ((['git', 'config', 'branch.master.gerritsquashhash',
1105 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001106 ]
tandrii88189772016-09-29 04:29:57 -07001107 calls += [
1108 ((['git', 'config', 'rietveld.cc'],), ''),
1109 ((['AddReviewers', 'chromium-review.googlesource.com',
1110 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -07001111 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -07001112 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001113 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001114 return calls
1115
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001116 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001117 self,
1118 upload_args,
1119 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001120 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001121 squash=True,
1122 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001123 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001124 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001125 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001126 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001127 issue=None,
1128 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001129 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001130 if squash_mode is None:
1131 if '--no-squash' in upload_args:
1132 squash_mode = 'nosquash'
1133 elif '--squash' in upload_args:
1134 squash_mode = 'squash'
1135 else:
1136 squash_mode = 'default'
1137
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001138 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001139 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001140 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001141 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001142 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001143 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1144 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001145 self.mock(git_cl.gclient_utils, 'RunEditor',
1146 lambda *_, **__: self._mocked_call(['RunEditor']))
1147 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001148 self.mock(git_cl.gerrit_util, 'AddReviewers',
1149 lambda h, i, add, is_reviewer: self._mocked_call(
1150 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001151
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001152 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001153 self.calls += self._gerrit_upload_calls(
1154 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001155 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001156 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001157 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001158 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001159 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001160 # Uncomment when debugging.
1161 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001162 git_cl.main(['upload'] + upload_args)
1163
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001164 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001165 self._run_gerrit_upload_test(
1166 ['--no-squash'],
1167 'desc\n\nBUG=\n',
1168 [],
1169 squash=False,
1170 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1171
1172 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001173 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001174 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001175 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001176 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001177 [],
tandriia60502f2016-06-20 02:01:53 -07001178 squash=False,
1179 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001180 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001181
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001182 def test_gerrit_no_reviewer(self):
1183 self._run_gerrit_upload_test(
1184 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001185 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001186 [],
1187 squash=False,
1188 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001189
tandriieefe8322016-08-17 10:12:24 -07001190 def test_gerrit_patch_bad_chars(self):
1191 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001192 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001193 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001194 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001195 squash=False,
1196 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001197 ref_suffix='%m=Dont_put_bad_chars')
1198 self.assertIn(
1199 'WARNING: Patchset title may only contain alphanumeric chars '
1200 'and spaces. Cleaned up title:\nDont put bad chars\n',
1201 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001202
ukai@chromium.orge8077812012-02-03 03:41:46 +00001203 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001204 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001205 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001206 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001207 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001208 squash=False,
1209 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001210 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001211
1212 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001213 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001214 [],
bradnelsond975b302016-10-23 12:20:23 -07001215 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1216 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001217 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001218 ['reviewer@example.com', 'another@example.com'],
1219 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001220 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001221 ref_suffix='%l=Code-Review+1',
1222 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001223
1224 def test_gerrit_upload_squash_first_is_default(self):
1225 # Mock Gerrit CL description to indicate the first upload.
1226 self.mock(git_cl.Changelist, 'GetDescription',
1227 lambda *_: None)
1228 self._run_gerrit_upload_test(
1229 [],
1230 'desc\nBUG=\n\nChange-Id: 123456789',
1231 [],
1232 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001233
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001234 def test_gerrit_upload_squash_first(self):
1235 # Mock Gerrit CL description to indicate the first upload.
1236 self.mock(git_cl.Changelist, 'GetDescription',
1237 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001238 self._run_gerrit_upload_test(
1239 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001240 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001241 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001242 squash=True,
1243 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001244
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001245 def test_gerrit_upload_squash_reupload(self):
1246 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1247 # Mock Gerrit CL description to indicate re-upload.
1248 self.mock(git_cl.Changelist, 'GetDescription',
1249 lambda *args: description)
1250 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1251 lambda *args: 1)
1252 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1253 lambda *args: {'change_id': '123456789'})
1254 self._run_gerrit_upload_test(
1255 ['--squash'],
1256 description,
1257 [],
1258 squash=True,
1259 expected_upstream_ref='origin/master',
1260 issue=123456)
1261
rmistry@google.com2dd99862015-06-22 12:22:18 +00001262 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001263 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001264 def mock_run_git(*args, **_kwargs):
1265 if args[0] == ['for-each-ref',
1266 '--format=%(refname:short) %(upstream:short)',
1267 'refs/heads']:
1268 # Create a local branch dependency tree that looks like this:
1269 # test1 -> test2 -> test3 -> test4 -> test5
1270 # -> test3.1
1271 # test6 -> test0
1272 branch_deps = [
1273 'test2 test1', # test1 -> test2
1274 'test3 test2', # test2 -> test3
1275 'test3.1 test2', # test2 -> test3.1
1276 'test4 test3', # test3 -> test4
1277 'test5 test4', # test4 -> test5
1278 'test6 test0', # test0 -> test6
1279 'test7', # test7
1280 ]
1281 return '\n'.join(branch_deps)
1282 self.mock(git_cl, 'RunGit', mock_run_git)
1283
1284 class RecordCalls:
1285 times_called = 0
1286 record_calls = RecordCalls()
1287 def mock_CMDupload(*args, **_kwargs):
1288 record_calls.times_called += 1
1289 return 0
1290 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1291
1292 self.calls = [
1293 (('[Press enter to continue or ctrl-C to quit]',), ''),
1294 ]
1295
1296 class MockChangelist():
1297 def __init__(self):
1298 pass
1299 def GetBranch(self):
1300 return 'test1'
1301 def GetIssue(self):
1302 return '123'
1303 def GetPatchset(self):
1304 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001305 def IsGerrit(self):
1306 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001307
1308 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1309 # CMDupload should have been called 5 times because of 5 dependent branches.
1310 self.assertEquals(5, record_calls.times_called)
1311 self.assertEquals(0, ret)
1312
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001313 def test_gerrit_change_id(self):
1314 self.calls = [
1315 ((['git', 'write-tree'], ),
1316 'hashtree'),
1317 ((['git', 'rev-parse', 'HEAD~0'], ),
1318 'branch-parent'),
1319 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1320 'A B <a@b.org> 1456848326 +0100'),
1321 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1322 'C D <c@d.org> 1456858326 +0100'),
1323 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1324 'hashchange'),
1325 ]
1326 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1327 self.assertEqual(change_id, 'Ihashchange')
1328
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001329 def test_desecription_append_footer(self):
1330 for init_desc, footer_line, expected_desc in [
1331 # Use unique desc first lines for easy test failure identification.
1332 ('foo', 'R=one', 'foo\n\nR=one'),
1333 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1334 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1335 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1336 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1337 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1338 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1339 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1340 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1341 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1342 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1343 ]:
1344 desc = git_cl.ChangeDescription(init_desc)
1345 desc.append_footer(footer_line)
1346 self.assertEqual(desc.description, expected_desc)
1347
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001348 def test_update_reviewers(self):
1349 data = [
1350 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001351 ('foo\nR=xx', [], 'foo\nR=xx'),
1352 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001353 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001354 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1355 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1356 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001357 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001358 ('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 +00001359 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001360 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1361 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1362 # Same as the line before, but full of whitespaces.
1363 (
1364 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1365 'foo\nBar\n\nR=c@c\n BUG =',
1366 ),
1367 # Whitespaces aren't interpreted as new lines.
1368 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001369 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001370 expected = [i[2] for i in data]
1371 actual = []
1372 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001373 obj = git_cl.ChangeDescription(orig)
1374 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001375 actual.append(obj.description)
1376 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001377
wittman@chromium.org455dc922015-01-26 20:15:50 +00001378 def test_get_target_ref(self):
1379 # Check remote or remote branch not present.
1380 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1381 self.assertEqual(None, git_cl.GetTargetRef(None,
1382 'refs/remotes/origin/master',
1383 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001384
wittman@chromium.org455dc922015-01-26 20:15:50 +00001385 # Check default target refs for branches.
1386 self.assertEqual('refs/heads/master',
1387 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1388 None, None))
1389 self.assertEqual('refs/heads/master',
1390 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1391 None, None))
1392 self.assertEqual('refs/heads/master',
1393 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1394 None, None))
1395 self.assertEqual('refs/branch-heads/123',
1396 git_cl.GetTargetRef('origin',
1397 'refs/remotes/branch-heads/123',
1398 None, None))
1399 self.assertEqual('refs/diff/test',
1400 git_cl.GetTargetRef('origin',
1401 'refs/remotes/origin/refs/diff/test',
1402 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001403 self.assertEqual('refs/heads/chrome/m42',
1404 git_cl.GetTargetRef('origin',
1405 'refs/remotes/origin/chrome/m42',
1406 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001407
1408 # Check target refs for user-specified target branch.
1409 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1410 'refs/remotes/branch-heads/123'):
1411 self.assertEqual('refs/branch-heads/123',
1412 git_cl.GetTargetRef('origin',
1413 'refs/remotes/origin/master',
1414 branch, None))
1415 for branch in ('origin/master', 'remotes/origin/master',
1416 'refs/remotes/origin/master'):
1417 self.assertEqual('refs/heads/master',
1418 git_cl.GetTargetRef('origin',
1419 'refs/remotes/branch-heads/123',
1420 branch, None))
1421 for branch in ('master', 'heads/master', 'refs/heads/master'):
1422 self.assertEqual('refs/heads/master',
1423 git_cl.GetTargetRef('origin',
1424 'refs/remotes/branch-heads/123',
1425 branch, None))
1426
1427 # Check target refs for pending prefix.
1428 self.assertEqual('prefix/heads/master',
1429 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1430 None, 'prefix/'))
1431
wychen@chromium.orga872e752015-04-28 23:42:18 +00001432 def test_patch_when_dirty(self):
1433 # Patch when local tree is dirty
1434 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1435 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1436
1437 def test_diff_when_dirty(self):
1438 # Do 'git cl diff' when local tree is dirty
1439 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1440 self.assertNotEqual(git_cl.main(['diff']), 0)
1441
tandriidf09a462016-08-18 16:23:55 -07001442 def _patch_common(self, is_gerrit=False, force_codereview=False,
1443 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001444 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001445 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1446 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001447 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1448 lambda *args: {
1449 'current_revision': '7777777777',
1450 'revisions': {
1451 '1111111111': {
1452 '_number': 1,
1453 'fetch': {'http': {
1454 'url': 'https://chromium.googlesource.com/my/repo',
1455 'ref': 'refs/changes/56/123456/1',
1456 }},
1457 },
1458 '7777777777': {
1459 '_number': 7,
1460 'fetch': {'http': {
1461 'url': 'https://chromium.googlesource.com/my/repo',
1462 'ref': 'refs/changes/56/123456/7',
1463 }},
1464 },
1465 },
1466 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001467 self.mock(git_cl.Changelist, 'GetDescription',
1468 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001469 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1470
tandriidf09a462016-08-18 16:23:55 -07001471 if new_branch:
1472 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1473 else:
1474 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001475 if not force_codereview:
1476 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001477 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001478 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001479 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1480 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001481 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001482 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001483
1484 if is_gerrit:
1485 if not force_codereview:
1486 self.calls += [
1487 ((['git', 'config', 'gerrit.host'],), 'true'),
1488 ]
1489 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001490 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001491 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001492 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001493 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001494 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001495 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001496
tandriidf09a462016-08-18 16:23:55 -07001497 def _common_patch_successful(self, new_branch=False):
1498 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001499 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001500 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001501 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001502 'patch from issue 123456 at patchset 60001 ' +
1503 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001504 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001505 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001506 ((['git', 'config', 'branch.master.rietveldserver',
1507 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001508 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001509 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001510 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001511
1512 def test_patch_successful(self):
1513 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001514 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1515
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001516 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001517 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001518 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1519
wychen@chromium.orga872e752015-04-28 23:42:18 +00001520 def test_patch_conflict(self):
1521 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001522 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001523 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001524
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001525 def test_gerrit_patch_successful(self):
1526 self._patch_common(is_gerrit=True)
1527 self.calls += [
1528 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1529 'refs/changes/56/123456/7'],), ''),
1530 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001531 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001532 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001533 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1534 ((['git', 'config', 'branch.master.merge'],), 'master'),
1535 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1536 ((['git', 'config', 'remote.origin.url'],),
1537 'https://chromium.googlesource.com/my/repo'),
1538 ((['git', 'config', 'branch.master.gerritserver',
1539 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001540 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001541 ]
1542 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1543
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001544 def test_patch_force_codereview(self):
1545 self._patch_common(is_gerrit=True, force_codereview=True)
1546 self.calls += [
1547 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1548 'refs/changes/56/123456/7'],), ''),
1549 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1550 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001551 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001552 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001553 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1554 ((['git', 'config', 'branch.master.merge'],), 'master'),
1555 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1556 ((['git', 'config', 'remote.origin.url'],),
1557 'https://chromium.googlesource.com/my/repo'),
1558 ((['git', 'config', 'branch.master.gerritserver',
1559 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001560 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001561 ]
1562 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1563
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001564 def test_gerrit_patch_url_successful(self):
1565 self._patch_common(is_gerrit=True)
1566 self.calls += [
1567 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1568 'refs/changes/56/123456/1'],), ''),
1569 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001570 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001571 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001572 ((['git', 'config', 'branch.master.gerritserver',
1573 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001574 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001575 ]
1576 self.assertEqual(git_cl.main(
1577 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1578
1579 def test_gerrit_patch_conflict(self):
1580 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001581 self.calls += [
1582 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1583 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001584 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1585 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1586 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001587 ]
1588 with self.assertRaises(SystemExitMock):
1589 git_cl.main(['patch',
1590 'https://chromium-review.googlesource.com/#/c/123456/1'])
1591
tandriic2405f52016-10-10 08:13:15 -07001592 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001593 def notExists(_issue, *_, **kwargs):
1594 self.assertFalse(kwargs['ignore_404'])
1595 raise git_cl.gerrit_util.GerritError(404, '')
1596 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1597
tandriic2405f52016-10-10 08:13:15 -07001598 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001599 self.calls = [
1600 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1601 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1602 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1603 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1604 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1605 ((['git', 'config', 'gerrit.host'],), 'true'),
1606 ((['DieWithError', 'issue 123456 at ' + url + ' does not exist '
1607 'or you have no access to it'],), SystemExitMock()),
1608 ]
1609 with self.assertRaises(SystemExitMock):
1610 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1611
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001612 def _checkout_calls(self):
1613 return [
1614 ((['git', 'config', '--local', '--get-regexp',
1615 'branch\\..*\\.rietveldissue'], ),
1616 ('branch.retrying.rietveldissue 1111111111\n'
1617 'branch.some-fix.rietveldissue 2222222222\n')),
1618 ((['git', 'config', '--local', '--get-regexp',
1619 'branch\\..*\\.gerritissue'], ),
1620 ('branch.ger-branch.gerritissue 123456\n'
1621 'branch.gbranch654.gerritissue 654321\n')),
1622 ]
1623
1624 def test_checkout_gerrit(self):
1625 """Tests git cl checkout <issue>."""
1626 self.calls = self._checkout_calls()
1627 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1628 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1629
1630 def test_checkout_rietveld(self):
1631 """Tests git cl checkout <issue>."""
1632 self.calls = self._checkout_calls()
1633 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1634 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1635
1636 def test_checkout_not_found(self):
1637 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001638 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001639 self.calls = self._checkout_calls()
1640 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1641
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001642 def test_checkout_no_branch_issues(self):
1643 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001644 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001645 self.calls = [
1646 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001647 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001648 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001649 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001650 ]
1651 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1652
tandrii@chromium.org28253532016-04-14 13:46:56 +00001653 def _test_gerrit_ensure_authenticated_common(self, auth,
1654 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001655 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1656 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1657 self.mock(git_cl, 'DieWithError',
1658 lambda msg: self._mocked_call(['DieWithError', msg]))
1659 self.mock(git_cl, 'ask_for_data',
1660 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001661 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001662 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001663 cl.branch = 'master'
1664 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001665 cl.lookedup_issue = True
1666 return cl
1667
1668 def test_gerrit_ensure_authenticated_missing(self):
1669 cl = self._test_gerrit_ensure_authenticated_common(auth={
1670 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1671 })
1672 self.calls.append(
1673 ((['DieWithError',
1674 'Credentials for the following hosts are required:\n'
1675 ' chromium-review.googlesource.com\n'
1676 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1677 'You can (re)generate your credentails by visiting '
1678 'https://chromium-review.googlesource.com/new-password'],), ''),)
1679 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1680
1681 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001682 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001683 cl = self._test_gerrit_ensure_authenticated_common(auth={
1684 'chromium.googlesource.com': 'one',
1685 'chromium-review.googlesource.com': 'other',
1686 })
1687 self.calls.append(
1688 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001689 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001690 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1691
1692 def test_gerrit_ensure_authenticated_ok(self):
1693 cl = self._test_gerrit_ensure_authenticated_common(auth={
1694 'chromium.googlesource.com': 'same',
1695 'chromium-review.googlesource.com': 'same',
1696 })
1697 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1698
tandrii@chromium.org28253532016-04-14 13:46:56 +00001699 def test_gerrit_ensure_authenticated_skipped(self):
1700 cl = self._test_gerrit_ensure_authenticated_common(
1701 auth={}, skip_auth_check=True)
1702 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1703
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001704 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001705 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1706 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001707 self.calls = [
1708 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001709 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001710 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1711 ((['git', 'config', 'rietveld.server'],), ''),
1712 ((['git', 'config', 'rietveld.server'],), ''),
1713 ((['git', 'config', 'branch.feature.rietveldserver'],),
1714 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001715 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001716 ]
1717 self.assertEqual(0, git_cl.main(['set-commit']))
1718
tandriid9e5ce52016-07-13 02:32:59 -07001719 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001720 self.mock(git_cl.gerrit_util, 'SetReview',
1721 lambda h, i, labels: self._mocked_call(
1722 ['SetReview', h, i, labels]))
1723 self.calls = [
1724 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001725 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1726 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001727 ((['git', 'config', 'branch.feature.gerritserver'],),
1728 'https://chromium-review.googlesource.com'),
1729 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001730 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001731 ]
tandriid9e5ce52016-07-13 02:32:59 -07001732
1733 def test_cmd_set_commit_gerrit_clear(self):
1734 self._cmd_set_commit_gerrit_common(0)
1735 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1736
1737 def test_cmd_set_commit_gerrit_dry(self):
1738 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001739 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1740
tandriid9e5ce52016-07-13 02:32:59 -07001741 def test_cmd_set_commit_gerrit(self):
1742 self._cmd_set_commit_gerrit_common(2)
1743 self.assertEqual(0, git_cl.main(['set-commit']))
1744
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001745 def test_description_display(self):
1746 out = StringIO.StringIO()
1747 self.mock(git_cl.sys, 'stdout', out)
1748
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001749 self.mock(git_cl, 'Changelist', ChangelistMock)
1750 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001751
1752 self.assertEqual(0, git_cl.main(['description', '-d']))
1753 self.assertEqual('foo\n', out.getvalue())
1754
1755 def test_description_rietveld(self):
1756 out = StringIO.StringIO()
1757 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001758 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001759
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001760 self.assertEqual(0, git_cl.main([
1761 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1762 self.assertEqual('foobar\n', out.getvalue())
1763
iannucci3c972b92016-08-17 13:24:10 -07001764 def test_StatusFieldOverrideIssueMissingArgs(self):
1765 out = StringIO.StringIO()
1766 self.mock(git_cl.sys, 'stderr', out)
1767
1768 try:
1769 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1770 except SystemExit as ex:
1771 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001772 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001773
1774 out = StringIO.StringIO()
1775 self.mock(git_cl.sys, 'stderr', out)
1776
1777 try:
1778 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1779 except SystemExit as ex:
1780 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001781 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001782
1783 def test_StatusFieldOverrideIssue(self):
1784 out = StringIO.StringIO()
1785 self.mock(git_cl.sys, 'stdout', out)
1786
1787 def assertIssue(cl_self, *_args):
1788 self.assertEquals(cl_self.issue, 1)
1789 return 'foobar'
1790
1791 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1792 self.calls = [
1793 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1794 ((['git', 'config', 'rietveld.server'],), ''),
1795 ((['git', 'config', 'rietveld.server'],), ''),
1796 ]
iannuccie53c9352016-08-17 14:40:40 -07001797 self.assertEqual(
1798 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1799 0)
iannucci3c972b92016-08-17 13:24:10 -07001800 self.assertEqual(out.getvalue(), 'foobar\n')
1801
iannuccie53c9352016-08-17 14:40:40 -07001802 def test_SetCloseOverrideIssue(self):
1803 def assertIssue(cl_self, *_args):
1804 self.assertEquals(cl_self.issue, 1)
1805 return 'foobar'
1806
1807 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1808 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1809 self.calls = [
1810 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1811 ((['git', 'config', 'rietveld.server'],), ''),
1812 ((['git', 'config', 'rietveld.server'],), ''),
1813 ]
1814 self.assertEqual(
1815 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1816
1817 def test_SetCommitOverrideIssue(self):
1818 def assertIssue(cl_self, *_args):
1819 self.assertEquals(cl_self.issue, 1)
1820 return 'foobar'
1821
1822 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1823 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1824 self.calls = [
1825 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1826 ((['git', 'config', 'rietveld.server'],), ''),
1827 ((['git', 'config', 'rietveld.server'],), ''),
1828 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1829 ((['git', 'config', 'rietveld.server'],), ''),
1830 ((['git', 'config', 'rietveld.server'],), ''),
1831 ]
1832 self.assertEqual(
1833 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1834
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001835 def test_description_gerrit(self):
1836 out = StringIO.StringIO()
1837 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001838 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001839
1840 self.assertEqual(0, git_cl.main([
1841 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1842 self.assertEqual('foobar\n', out.getvalue())
1843
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001844 def test_description_set_raw(self):
1845 out = StringIO.StringIO()
1846 self.mock(git_cl.sys, 'stdout', out)
1847
1848 self.mock(git_cl, 'Changelist', ChangelistMock)
1849 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1850
1851 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1852 self.assertEqual('hihi', ChangelistMock.desc)
1853
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001854 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001855 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001856
1857 def RunEditor(desc, _, **kwargs):
1858 self.assertEquals(
1859 '# Enter a description of the change.\n'
1860 '# This will be displayed on the codereview site.\n'
1861 '# The first line will also be used as the subject of the review.\n'
1862 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001863 '--------------------\n'
1864 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001865 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001866 # Simulate user changing something.
1867 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001868
dsansomee2d6fd92016-09-08 00:10:47 -07001869 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001870 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001871
1872 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1873 self.mock(git_cl.Changelist, 'GetDescription',
1874 lambda *args: current_desc)
1875 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1876 UpdateDescriptionRemote)
1877 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1878
1879 self.calls = [
1880 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001881 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001882 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1883 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001884 ((['git', 'config', 'core.editor'],), 'vi'),
1885 ]
1886 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1887
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001888 def test_description_set_stdin(self):
1889 out = StringIO.StringIO()
1890 self.mock(git_cl.sys, 'stdout', out)
1891
1892 self.mock(git_cl, 'Changelist', ChangelistMock)
1893 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1894
1895 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1896 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1897
kmarshall3bff56b2016-06-06 18:31:47 -07001898 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001899 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1900
kmarshall3bff56b2016-06-06 18:31:47 -07001901 self.calls = \
1902 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1903 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07001904 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001905 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1906 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07001907 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1908 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1909 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001910 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1911 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1912 ((['git', 'branch', '-D', 'foo'],), '')]
1913
kmarshall3bff56b2016-06-06 18:31:47 -07001914 self.mock(git_cl, 'get_cl_statuses',
1915 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001916 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1917 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1918 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001919
1920 self.assertEqual(0, git_cl.main(['archive', '-f']))
1921
1922 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001923 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001924 self.calls = \
1925 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1926 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07001927 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001928 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1929 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001930 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1931
kmarshall9249e012016-08-23 12:02:16 -07001932 self.mock(git_cl, 'get_cl_statuses',
1933 lambda branches, fine_grained, max_processes:
1934 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
1935
1936 self.assertEqual(1, git_cl.main(['archive', '-f']))
1937
1938 def test_archive_dry_run(self):
1939 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1940
1941 self.calls = \
1942 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1943 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1944 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1945 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1946 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1947 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1948 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1949 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1950 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07001951
1952 self.mock(git_cl, 'get_cl_statuses',
1953 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001954 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1955 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1956 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001957
kmarshall9249e012016-08-23 12:02:16 -07001958 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
1959
1960 def test_archive_no_tags(self):
1961 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1962
1963 self.calls = \
1964 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1965 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1966 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1967 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1968 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1969 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1970 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1971 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1972 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1973 ((['git', 'branch', '-D', 'foo'],), '')]
1974
1975 self.mock(git_cl, 'get_cl_statuses',
1976 lambda branches, fine_grained, max_processes:
1977 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1978 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1979 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
1980
1981 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07001982
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001983 def test_cmd_issue_erase_existing(self):
1984 out = StringIO.StringIO()
1985 self.mock(git_cl.sys, 'stdout', out)
1986 self.calls = [
1987 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001988 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1989 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001990 # Let this command raise exception (retcode=1) - it should be ignored.
1991 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07001992 CERR1),
1993 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1994 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001995 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1996 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1997 ''),
1998 ]
1999 self.assertEqual(0, git_cl.main(['issue', '0']))
2000
phajdan.jre328cf92016-08-22 04:12:17 -07002001 def test_cmd_issue_json(self):
2002 out = StringIO.StringIO()
2003 self.mock(git_cl.sys, 'stdout', out)
2004 self.calls = [
2005 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002006 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002007 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2008 ((['git', 'config', 'rietveld.server'],),
2009 'https://codereview.chromium.org'),
2010 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2011 (('write_json', 'output.json',
2012 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2013 ''),
2014 ]
2015 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2016
tandriide281ae2016-10-12 06:02:30 -07002017 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002018 self.mock(git_cl.Changelist, 'GetChange',
2019 lambda _, *a: (
2020 self._mocked_call(['GetChange']+list(a))))
2021 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2022 lambda *_, **__: (
2023 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002024 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2025 lambda _, s: self._mocked_call(['SetCQState', s]))
2026 self.calls = [
2027 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002028 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002029 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2030 ((['git', 'config', 'rietveld.server'],),
2031 'https://codereview.chromium.org'),
2032 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2033 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2034 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2035 ((['get_or_create_merge_base', 'feature', 'feature'],),
2036 'fake_ancestor_sha'),
2037 ((['GetChange', 'fake_ancestor_sha', None], ),
2038 git_cl.presubmit_support.GitChange(
2039 '', '', '', '', '', '', '', '')),
2040 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2041 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002042 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2043 ]
2044 out = StringIO.StringIO()
2045 self.mock(git_cl.sys, 'stdout', out)
2046 self.assertEqual(0, git_cl.main(['try']))
2047 self.assertEqual(
2048 out.getvalue(),
2049 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2050
tandrii8c5a3532016-11-04 07:52:02 -07002051 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2052 self.mock(git_cl.Changelist, 'GetChange',
2053 lambda _, *a: (
2054 self._mocked_call(['GetChange']+list(a))))
2055 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2056 lambda *_, **__: (
2057 self._mocked_call(['DoGetTryMasters'])))
2058 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2059 lambda _, s: self._mocked_call(['SetCQState', s]))
2060
2061 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2062 # Get realistic expectations.
2063 gerrit_change_list_impl._GetGerritHost()
2064 return self._mocked_call(['_GetChangeDetail', opts or []])
2065 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2066 _GetChangeDetail)
2067
2068 self.calls = [
2069 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2070 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2071 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2072 ((['git', 'config', 'branch.feature.gerritserver'],),
2073 'https://chromium-review.googlesource.com'),
2074 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2075 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2076 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2077 ((['get_or_create_merge_base', 'feature', 'feature'],),
2078 'fake_ancestor_sha'),
2079 ((['GetChange', 'fake_ancestor_sha', None], ),
2080 git_cl.presubmit_support.GitChange(
2081 '', '', '', '', '', '', '', '')),
2082 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2083 ((['DoGetTryMasters'], ), None),
2084 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2085 ]
2086 out = StringIO.StringIO()
2087 self.mock(git_cl.sys, 'stdout', out)
2088 self.assertEqual(0, git_cl.main(['try']))
2089 self.assertEqual(
2090 out.getvalue(),
2091 'scheduled CQ Dry Run on '
2092 'https://chromium-review.googlesource.com/123456\n')
2093
2094 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2095 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2096 lambda _: {
2097 'owner_email': 'owner@e.mail',
2098 'private': False,
2099 'closed': False,
2100 'project': 'depot_tools',
2101 'patchsets': [20001],
2102 })
tandriide281ae2016-10-12 06:02:30 -07002103 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2104 self.calls = [
2105 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2106 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2107 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2108 ((['git', 'config', 'rietveld.server'],),
2109 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002110 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002111 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002112 ]
2113
2114 def _buildbucket_retry(*_, **kw):
2115 # self.maxDiff = 10000
2116 body = json.loads(kw['body'])
2117 self.assertEqual(len(body['builds']), 1)
2118 build = body['builds'][0]
2119 params = json.loads(build.pop('parameters_json'))
2120 self.assertEqual(params, {
2121 u'builder_name': u'win',
2122 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2123 u'revision': None}],
2124 u'properties': {
2125 u'category': u'git_cl_try',
2126 u'issue': 123,
2127 u'key': u'val',
2128 u'json': [{u'a': 1}, None],
2129 u'master': u'tryserver.chromium',
2130 u'patch_project': u'depot_tools',
2131 u'patch_storage': u'rietveld',
2132 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002133 u'rietveld': u'https://codereview.chromium.org',
2134 }
2135 })
2136 self.assertEqual(build, {
2137 u'bucket': u'master.tryserver.chromium',
2138 u'client_operation_id': u'uuid4',
2139 u'tags': [u'builder:win',
2140 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002141 u'user_agent:git_cl_try',
2142 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002143 })
2144
2145 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2146
2147 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2148 self.assertEqual(0, git_cl.main([
2149 'try', '-m', 'tryserver.chromium', '-b', 'win',
2150 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2151 self.assertRegexpMatches(
2152 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002153 'Tried jobs on:\nBucket: master.tryserver.chromium')
2154
tandrii8c5a3532016-11-04 07:52:02 -07002155 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2156 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2157 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2158
2159 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2160 # Get realistic expectations.
2161 gerrit_change_list_impl._GetGerritHost()
2162 return self._mocked_call(['_GetChangeDetail', opts or []])
2163 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2164 _GetChangeDetail)
2165
2166 self.calls = [
2167 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2168 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2169 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2170 ((['git', 'config', 'branch.feature.gerritserver'],),
2171 'https://chromium-review.googlesource.com'),
2172 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002173 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2174 {'owner': {'email': 'owner@e.mail'}}),
2175 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2176 'project': 'depot_tools',
2177 'revisions': {
2178 'deadbeaf': {
2179 '_number': 6,
2180 },
2181 'beeeeeef': {
2182 '_number': 7,
2183 'fetch': {'http': {
2184 'url': 'https://chromium.googlesource.com/depot_tools',
2185 'ref': 'refs/changes/56/123456/7'
2186 }},
2187 },
2188 },
2189 }),
2190 ]
2191
2192 def _buildbucket_retry(*_, **kw):
2193 # self.maxDiff = 10000
2194 body = json.loads(kw['body'])
2195 self.assertEqual(len(body['builds']), 1)
2196 build = body['builds'][0]
2197 params = json.loads(build.pop('parameters_json'))
2198 self.assertEqual(params, {
2199 u'builder_name': u'win',
2200 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2201 u'revision': None}],
2202 u'properties': {
2203 u'category': u'git_cl_try',
2204 u'key': u'val',
2205 u'json': [{u'a': 1}, None],
2206 u'master': u'tryserver.chromium',
2207
2208 u'patch_gerrit_url':
2209 u'https://chromium-review.googlesource.com',
2210 u'patch_issue': 123456,
2211 u'patch_project': u'depot_tools',
2212 u'patch_ref': u'refs/changes/56/123456/7',
2213 u'patch_repository_url':
2214 u'https://chromium.googlesource.com/depot_tools',
2215 u'patch_set': 7,
2216 u'patch_storage': u'gerrit',
2217 }
2218 })
2219 self.assertEqual(build, {
2220 u'bucket': u'master.tryserver.chromium',
2221 u'client_operation_id': u'uuid4',
2222 u'tags': [
2223 u'builder:win',
2224 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2225 u'user_agent:git_cl_try',
2226 u'master:tryserver.chromium'],
2227 })
2228
2229 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2230
2231 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2232 self.assertEqual(0, git_cl.main([
2233 'try', '-m', 'tryserver.chromium', '-b', 'win',
2234 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2235 self.assertRegexpMatches(
2236 git_cl.sys.stdout.getvalue(),
2237 'Tried jobs on:\nBucket: master.tryserver.chromium')
2238
borenet6c0efe62016-10-19 08:13:29 -07002239 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002240 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2241 lambda _: {
2242 'owner_email': 'owner@e.mail',
2243 'private': False,
2244 'closed': False,
2245 'project': 'depot_tools',
2246 'patchsets': [20001],
2247 })
borenet6c0efe62016-10-19 08:13:29 -07002248 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2249 self.calls = [
2250 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2251 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2252 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2253 ((['git', 'config', 'rietveld.server'],),
2254 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002255 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002256 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002257 ]
2258
2259 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002260 body = json.loads(kw['body'])
2261 self.assertEqual(len(body['builds']), 1)
2262 build = body['builds'][0]
2263 params = json.loads(build.pop('parameters_json'))
2264 self.assertEqual(params, {
2265 u'builder_name': u'win',
2266 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2267 u'revision': None}],
2268 u'properties': {
2269 u'category': u'git_cl_try',
2270 u'issue': 123,
2271 u'patch_project': u'depot_tools',
2272 u'patch_storage': u'rietveld',
2273 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002274 u'rietveld': u'https://codereview.chromium.org',
2275 }
2276 })
2277 self.assertEqual(build, {
2278 u'bucket': u'test.bucket',
2279 u'client_operation_id': u'uuid4',
2280 u'tags': [u'builder:win',
2281 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2282 u'user_agent:git_cl_try'],
2283 })
2284
2285 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2286
2287 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2288 self.assertEqual(0, git_cl.main([
2289 'try', '-B', 'test.bucket', '-b', 'win']))
2290 self.assertRegexpMatches(
2291 git_cl.sys.stdout.getvalue(),
2292 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002293
qyearsley123a4682016-10-26 09:12:17 -07002294 def test_git_cl_try_bots_on_multiple_masters(self):
2295 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2296 self.calls = [
2297 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2298 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2299 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2300 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002301 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002302 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2303 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2304 ]
2305
2306 def _buildbucket_retry(*_, **kw):
2307 body = json.loads(kw['body'])
2308 self.assertEqual(len(body['builds']), 2)
2309
2310 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2311 self.assertEqual(first_build_params['builder_name'], 'builder1')
2312 self.assertEqual(first_build_params['properties']['master'], 'master1')
2313
2314 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2315 self.assertEqual(first_build_params['builder_name'], 'builder2')
2316 self.assertEqual(first_build_params['properties']['master'], 'master2')
2317
2318 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2319
2320 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2321 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2322
2323 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2324 self.assertEqual(
2325 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2326 self.assertEqual(
2327 git_cl.sys.stdout.getvalue(),
2328 'Tried jobs on:\n'
2329 'Bucket: master.master1\n'
2330 ' builder1: []\n'
2331 'Bucket: master.master2\n'
2332 ' builder2: []\n'
2333 'To see results here, run: git cl try-results\n'
2334 'To see results in browser, run: git cl web\n')
2335
tandrii16e0b4e2016-06-07 10:34:28 -07002336 def _common_GerritCommitMsgHookCheck(self):
2337 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2338 self.mock(git_cl.os.path, 'abspath',
2339 lambda path: self._mocked_call(['abspath', path]))
2340 self.mock(git_cl.os.path, 'exists',
2341 lambda path: self._mocked_call(['exists', path]))
2342 self.mock(git_cl.gclient_utils, 'FileRead',
2343 lambda path: self._mocked_call(['FileRead', path]))
2344 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2345 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2346 self.calls = [
2347 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2348 ((['abspath', '../'],), '/abs/git_repo_root'),
2349 ]
2350 return git_cl.Changelist(codereview='gerrit', issue=123)
2351
2352 def test_GerritCommitMsgHookCheck_custom_hook(self):
2353 cl = self._common_GerritCommitMsgHookCheck()
2354 self.calls += [
2355 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2356 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2357 '#!/bin/sh\necho "custom hook"')
2358 ]
2359 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2360
2361 def test_GerritCommitMsgHookCheck_not_exists(self):
2362 cl = self._common_GerritCommitMsgHookCheck()
2363 self.calls += [
2364 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2365 ]
2366 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2367
2368 def test_GerritCommitMsgHookCheck(self):
2369 cl = self._common_GerritCommitMsgHookCheck()
2370 self.calls += [
2371 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2372 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2373 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2374 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2375 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2376 ''),
2377 ]
2378 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2379
tandriic4344b52016-08-29 06:04:54 -07002380 def test_GerritCmdLand(self):
2381 self.calls += [
2382 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2383 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2384 'deadbeaf'),
2385 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2386 ((['git', 'config', 'branch.feature.gerritserver'],),
2387 'chromium-review.googlesource.com'),
2388 ]
2389 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2390 cl._codereview_impl._GetChangeDetail = lambda _: {
2391 'labels': {},
2392 'current_revision': 'deadbeaf',
2393 }
agable32978d92016-11-01 12:55:02 -07002394 cl._codereview_impl._GetChangeCommit = lambda: {
2395 'commit': 'deadbeef',
2396 'web_links': [{'name': 'gerrit',
2397 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2398 }
tandriic4344b52016-08-29 06:04:54 -07002399 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002400 out = StringIO.StringIO()
2401 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002402 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002403 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002404 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002405
tandrii221ab252016-10-06 08:12:04 -07002406 BUILDBUCKET_BUILDS_MAP = {
2407 '9000': {
2408 'id': '9000',
2409 'status': 'STARTED',
2410 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2411 'result_details_json': '{"properties": {}}',
2412 'bucket': 'master.x.y',
2413 'created_by': 'user:someone@chromium.org',
2414 'created_ts': '147200002222000',
2415 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2416 },
2417 '8000': {
2418 'id': '8000',
2419 'status': 'COMPLETED',
2420 'result': 'FAILURE',
2421 'failure_reason': 'BUILD_FAILURE',
2422 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2423 'result_details_json': '{"properties": {}}',
2424 'bucket': 'master.x.y',
2425 'created_by': 'user:someone@chromium.org',
2426 'created_ts': '147200001111000',
2427 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2428 },
2429 }
2430
2431 def test_write_try_results_json(self):
2432 expected_output = [
2433 {
2434 'buildbucket_id': '8000',
2435 'bucket': 'master.x.y',
2436 'builder_name': 'my-builder',
2437 'status': 'COMPLETED',
2438 'result': 'FAILURE',
2439 'failure_reason': 'BUILD_FAILURE',
2440 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2441 },
2442 {
2443 'buildbucket_id': '9000',
2444 'bucket': 'master.x.y',
2445 'builder_name': 'my-builder',
2446 'status': 'STARTED',
2447 'result': None,
2448 'failure_reason': None,
2449 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2450 }
2451 ]
2452 self.calls = [(('write_json', 'output.json', expected_output), '')]
2453 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2454
tandrii45b2a582016-10-11 03:14:16 -07002455 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002456 out = StringIO.StringIO()
2457 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002458 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2459 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002460 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2461 self._mocked_call(['get_authenticator_for_host', host]))
2462 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2463 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002464
2465 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2466 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002467 self.calls += [
2468 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2469 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2470 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2471 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2472 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2473 ((['git', 'config', 'branch.feature.rietveldserver'],),
2474 'codereview.example.com'),
2475 ((['get_authenticator_for_host', 'codereview.example.com'],),
2476 AuthenticatorMock()),
2477 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2478
2479 def test_fetch_try_jobs_none_rietveld(self):
2480 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002481 # Simulate that user isn't logged in.
2482 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002483 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002484 self.assertRegexpMatches(sys.stdout.getvalue(),
2485 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002486 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2487
2488 def test_fetch_try_jobs_some_rietveld(self):
2489 self._setup_fetch_try_jobs_rietveld({
2490 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2491 })
2492 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002493 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2494 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2495 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2496
2497 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2498 self._setup_fetch_try_jobs(most_recent_patchset=13)
2499 self.calls += [
2500 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2501 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2502 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002503 # TODO(tandrii): Uncomment the below if we decide to support checking
2504 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002505 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002506 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002507 ((['git', 'config', 'branch.feature.gerritserver'],),
2508 'https://x-review.googlesource.com'),
2509 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2510 AuthenticatorMock()),
2511 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2512
2513 def test_fetch_try_jobs_none_gerrit(self):
2514 self._setup_fetch_try_jobs_gerrit({})
2515 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002516 # TODO(tandrii): Uncomment the below if we decide to support checking
2517 # patchsets for Gerrit.
2518 # self.assertRegexpMatches(
2519 # sys.stdout.getvalue(),
2520 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002521 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2522
2523 def test_fetch_try_jobs_some_gerrit(self):
2524 self._setup_fetch_try_jobs_gerrit({
2525 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2526 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002527 # TODO(tandrii): Uncomment the below if we decide to support checking
2528 # patchsets for Gerrit.
2529 # self.calls.remove(
2530 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002531 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2532
2533 # ... and doesn't result in warning.
2534 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2535 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002536 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2537 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2538
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002539
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002540if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002541 git_cl.logging.basicConfig(
2542 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002543 unittest.main()