blob: 6d22906410d361583f84c37ae524a4aa8ae52850 [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),
tandrii48df5812016-10-17 03:55:37 -0700373 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
374 CERR1),
375 ((['git', 'config', 'gerrit.host', 'true'],), ''),
376 ]
377 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
378
maruel@chromium.orga3353652011-11-30 14:26:57 +0000379 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000380 def _is_gerrit_calls(cls, gerrit=False):
381 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
382 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
383
384 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000385 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000386 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000387 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000388
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000389 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000390 def _upload_no_rev_calls(cls, similarity, find_copies):
391 return (cls._git_base_calls(similarity, find_copies) +
392 cls._git_upload_no_rev_calls())
393
394 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000395 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000396 if similarity is None:
397 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700398 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700399 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000400 else:
tandrii33a46ff2016-08-23 05:53:40 -0700401 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700402 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000403
404 if find_copies is None:
405 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700406 find_copies_call = ((['git', 'config', '--bool',
407 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000408 else:
tandrii5d48c322016-08-18 16:19:37 -0700409 val = str(find_copies).lower()
410 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000411 'branch.master.git-find-copies', val],), '')
412
413 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000414 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800415 '-l100000', '-C'+similarity,
416 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000417 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000418 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000419 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000420
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000421 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000422 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000423 similarity_call,
424 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
425 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000426 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000427 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700428 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
429 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000430 ((['git', 'config', 'rietveld.server'],),
431 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000432 ((['git', 'config', 'branch.master.merge'],), 'master'),
433 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000434 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000435 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000436 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000437 ((['git', 'rev-parse', '--show-cdup'],), ''),
438 ((['git', 'rev-parse', 'HEAD'],), '12345'),
439 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000440 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000441 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700442 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000443 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000444 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000445 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000446 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000447 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000448 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000449 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000450 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000451 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000452 ]
453
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000454 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000455 def _git_upload_no_rev_calls(cls):
456 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000457 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000458 ]
459
460 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000461 def _git_upload_calls(cls, private):
462 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000463 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000464 private_call = []
465 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000466 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000467 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000468 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000469
maruel@chromium.orga3353652011-11-30 14:26:57 +0000470 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000471 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000472 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000473 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000474 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000475 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000476 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
477 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000478 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000479 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000480 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700481 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000482 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000483 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000484 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700485 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000486 ] + cls._git_post_upload_calls()
487
488 @classmethod
489 def _git_post_upload_calls(cls):
490 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000491 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
492 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
493 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000494 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000495 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000496 ]
497
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000498 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000499 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000500 fake_ancestor = 'fake_ancestor'
501 fake_cl = 'fake_cl_for_patch'
502 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000503 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000504 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000505 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000506 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000507 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000508 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000509 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000510 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700511 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000512 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000513 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000514 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000515 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000516 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000517 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000518 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000519 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000520 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000521 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000522 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000523
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000524 @classmethod
525 def _dcommit_calls_1(cls):
526 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000527 ((['git', 'config', 'rietveld.autoupdate'],),
528 ''),
529 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
530 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000531 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000532 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000533 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
534 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
535 None),
536 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000537 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700538 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700539 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000540 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700541 ((['git', 'config', '--bool',
542 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000543 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
544 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700545 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000546 ((['git',
547 'config', 'rietveld.server'],), 'codereview.example.com'),
548 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000549 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000550 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000551 ((['git', 'config', 'branch.working.merge'],),
552 'refs/heads/master'),
553 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000554 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000555 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000556 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000557 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000558 'refs/remotes/origin/master'],),
559 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000560 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000561 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000562 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000563 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000564 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000565 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000566 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000567 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000568 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000569 ]
570
571 @classmethod
572 def _dcommit_calls_normal(cls):
573 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000574 ((['git', 'rev-parse', '--show-cdup'],), ''),
575 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000576 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000577 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000578 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000579 '.'],),
580 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000581 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700582 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000583 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000584 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000585 ((['git', 'config', 'user.email'],), 'author@example.com'),
586 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000587 ]
588
589 @classmethod
590 def _dcommit_calls_bypassed(cls):
591 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000592 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000593 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000594 ]
595
596 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000597 def _dcommit_calls_3(cls):
598 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000599 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -0800600 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
601 'fake_ancestor_sha', 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000602 (' PRESUBMIT.py | 2 +-\n'
603 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000604 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700605 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000606 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
607 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700608 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000609 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000610 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
611 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
612 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000613 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000614 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000615 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000616 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000617 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000618 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000619 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000620 ((['git', 'checkout', '-q', 'working'],), ''),
621 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000622 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000623
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000624 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700625 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000626 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000627 return [
628 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000629 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000630 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000631 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700632 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000633 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000634 '--git_similarity', similarity or '50'
635 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000636 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000637 ]
638
639 def _run_reviewer_test(
640 self,
641 upload_args,
642 expected_description,
643 returned_description,
644 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000645 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700646 private=False,
647 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000648 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000649 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000650 try:
651 similarity = upload_args[upload_args.index('--similarity')+1]
652 except ValueError:
653 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000654
655 if '--find-copies' in upload_args:
656 find_copies = True
657 elif '--no-find-copies' in upload_args:
658 find_copies = False
659 else:
660 find_copies = None
661
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000662 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700663 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000664
665 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000666
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000667 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000668 self.assertEquals(
669 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000670 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000671 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000672 '#--------------------This line is 72 characters long'
673 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000674 expected_description,
675 desc)
676 return returned_description
677 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000678
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000679 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000680 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700681 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000682 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000683 return 1, 2
684 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000685
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000686 git_cl.main(['upload'] + upload_args)
687
688 def test_no_reviewer(self):
689 self._run_reviewer_test(
690 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000691 'desc\n\nBUG=',
692 '# Blah blah comment.\ndesc\n\nBUG=',
693 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694 [])
695
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000696 def test_keep_similarity(self):
697 self._run_reviewer_test(
698 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000699 'desc\n\nBUG=',
700 '# Blah blah comment.\ndesc\n\nBUG=',
701 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000702 [])
703
iannucci@chromium.org79540052012-10-19 23:15:26 +0000704 def test_keep_find_copies(self):
705 self._run_reviewer_test(
706 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000707 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000708 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000709 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000710 [])
711
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000712 def test_private(self):
713 self._run_reviewer_test(
714 ['--private'],
715 'desc\n\nBUG=',
716 '# Blah blah comment.\ndesc\n\nBUG=\n',
717 'desc\n\nBUG=',
718 [])
719
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000720 def test_reviewers_cmd_line(self):
721 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000722 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000723 self._run_reviewer_test(
724 ['-r' 'foo@example.com'],
725 description,
726 '\n%s\n' % description,
727 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000728 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000729
730 def test_reviewer_tbr_overriden(self):
731 # Reviewer is overriden with TBR
732 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000733 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000734 self._run_reviewer_test(
735 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000736 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000737 description.strip('\n'),
738 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000739 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000740
741 def test_reviewer_multiple(self):
742 # Handles multiple R= or TBR= lines.
743 description = (
bradnelsond975b302016-10-23 12:20:23 -0700744 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
745 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000746 self._run_reviewer_test(
747 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000748 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000749 description,
750 description,
bradnelsond975b302016-10-23 12:20:23 -0700751 ['--reviewers=another@example.com,reviewer@example.com'],
752 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000753
maruel@chromium.orga3353652011-11-30 14:26:57 +0000754 def test_reviewer_send_mail(self):
755 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000756 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000757 self._run_reviewer_test(
758 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000759 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000760 description.strip('\n'),
761 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000762 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000763
764 def test_reviewer_send_mail_no_rev(self):
765 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000766 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700767 self.calls = self._upload_no_rev_calls(None, None) + [
768 ((['DieWithError', 'Must specify reviewers to send email.'],),
769 SystemExitMock())
770 ]
771
772 def RunEditor(desc, _, **kwargs):
773 return desc
774 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
775 self.mock(sys, 'stdout', stdout)
776 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000777 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700778 self.assertEqual(
779 'Using 50% similarity for rename/copy detection. Override with '
780 '--similarity.\n',
781 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000782
tandriif9aefb72016-07-01 09:06:51 -0700783 def test_bug_on_cmd(self):
784 self._run_reviewer_test(
785 ['--bug=500658,proj:123'],
786 'desc\n\nBUG=500658\nBUG=proj:123',
787 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
788 'desc\n\nBUG=500658\nBUG=proj:1234',
789 [])
790
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000791 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000792 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000793 self.calls = (
794 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000795 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000796 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000797 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000798 git_cl.main(['dcommit'])
799
800 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000801 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000802 self.calls = (
803 self._dcommit_calls_1() +
804 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000805 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000806 git_cl.main(['dcommit', '--bypass-hooks'])
807
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100808 def _land_rietveld_common(self, debug_stdout=False):
809 if not debug_stdout:
810 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
811 self.mock(RietveldMock, 'update_description', staticmethod(
812 lambda i, d: self._mocked_call(['update_description', i, d])))
813 self.mock(RietveldMock, 'add_comment', staticmethod(
814 lambda i, c: self._mocked_call(['add_comment', i, c])))
815 self.calls = [
816 ((['git', 'config', 'rietveld.autoupdate'],), ''),
817 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
818 ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
819 CERR1),
820 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
821 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
822 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
823 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
824 CERR1),
825 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
826 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
827 ((['git', 'config', 'rietveld.server'],),
828 'https://codereview.chromium.org'),
829 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
830 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
831 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
832 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
833 ((['git', 'rev-list', '--merges',
834 '--grep=^SVN changes up to revision [0-9]*$',
835 'refs/remotes/origin/master^!'],), ''),
836 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
837 ''), # No commits to rebase, according to local view of origin.
838 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
839 'fake_ancestor_sha'),
840 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
841 ((['git', 'rev-parse', '--show-cdup'],), ''),
842 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
843 ((['git', 'diff', '--name-status', '--no-renames', '-r',
844 'fake_ancestor_sha...', '.'],),
845 'M\tfile1.cpp'),
846 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
847 ((['git', 'config', 'branch.feature.rietveldserver'],),
848 'https://codereview.chromium.org'),
849 ((['git', 'config', 'user.email'],), 'user@e.mail'),
850 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
851 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
852 'fake_ancestor_sha', 'feature'],),
853 # This command just prints smth like this:
854 # file1.cpp | 53 ++++++--
855 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
856 ''),
857 ((['git', 'show-ref', '--quiet', '--verify',
858 'refs/heads/git-cl-commit'],),
859 ''), # 0 return code means branch exists.
860 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
861 ((['git', 'show-ref', '--quiet', '--verify',
862 'refs/heads/git-cl-cherry-pick'],),
863 CERR1), # This means git-cl-cherry-pick branch does not exist.
864 ((['git', 'rev-parse', '--show-cdup'],), ''),
865 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
866 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
867 ((['git', 'commit', '-m',
868 'Issue: 123\n\nR=john@chromium.org\n\n'
869 'Review URL: https://codereview.chromium.org/123 .'],), ''),
870 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
871 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
872 ((['git', 'config', '--get', 'remote.origin.url'],),
873 'https://chromium.googlesource.com/infra/infra'),
874 ]
875
876 def test_land_rietveld(self):
877 self._land_rietveld_common()
878 self.calls += [
879 ((['git', 'config', 'rietveld.pending-ref-prefix'],), CERR1),
880 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
881 ''),
882 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
883 ((['git', 'checkout', '-q', 'feature'],), ''),
884 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
885 ((['git', 'config', 'rietveld.viewvc-url'],),
886 'https://chromium.googlesource.com/infra/infra/+/'),
887 ((['update_description', 123,
888 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
889 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
890 ''),
891 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
892 'fake_sha_rebased (presubmit successful).'],), ''),
893 ]
894 git_cl.main(['land'])
895
896 def test_land_rietveld_gnumbd(self):
897 self._land_rietveld_common()
898 self.mock(git_cl, 'WaitForRealCommit',
899 lambda *a: self._mocked_call(['WaitForRealCommit'] + list(a)))
900 self.calls += [
901 ((['git', 'config', 'rietveld.pending-ref-prefix'],), 'refs/pending/'),
902 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
903 ((['git', 'retry', 'fetch', 'origin',
904 '+refs/pending/heads/master:refs/git-cl/pending/heads/master'],), ''),
905 ((['git', 'checkout', 'refs/git-cl/pending/heads/master'],), ''),
906 ((['git', 'cherry-pick', 'fake_sha_rebased'],), ''),
907
908 ((['git', 'retry', 'push', '--porcelain', 'origin',
909 'HEAD:refs/pending/heads/master'],),''),
910 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased_on_pending'),
911
912 ((['git', 'checkout', '-q', 'feature'],), ''),
913 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
914
915 ((['WaitForRealCommit', 'origin', 'fake_sha_rebased_on_pending',
916 'refs/remotes/origin/master', 'refs/heads/master'],),
917 'fake_sha_gnumbded'),
918
919 ((['git', 'config', 'rietveld.viewvc-url'],),
920 'https://chromium.googlesource.com/infra/infra/+/'),
921 ((['update_description', 123,
922 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
923 'https://chromium.googlesource.com/infra/infra/+/fake_sha_gnumbded'],),
924 ''),
925 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
926 'fake_sha_gnumbded (presubmit successful).'],),
927 ''),
928 ]
929 git_cl.main(['land'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000930
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +0100931 def test_ShouldGenerateGitNumberFooters(self):
932 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: StringIO.StringIO(
Andrii Shyshkalovb8c535f2016-11-24 18:01:52 +0100933 'GENERATE_GIT_NUMBER_FOOTERS: true\n'
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +0100934 ))
935 self.assertTrue(git_cl.ShouldGenerateGitNumberFooters())
936
937 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: StringIO.StringIO(
Andrii Shyshkalovb8c535f2016-11-24 18:01:52 +0100938 'GENERATE_GIT_NUMBER_FOOTERS: false\n'
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +0100939 ))
940 self.assertFalse(git_cl.ShouldGenerateGitNumberFooters())
941
942 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: StringIO.StringIO(
Andrii Shyshkalovb8c535f2016-11-24 18:01:52 +0100943 'GENERATE_GIT_NUMBER_FOOTERS: anything but true is false\n'
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +0100944 ))
945 self.assertFalse(git_cl.ShouldGenerateGitNumberFooters())
946
947 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: StringIO.StringIO(
Andrii Shyshkalovb8c535f2016-11-24 18:01:52 +0100948 'whatever: ignored'
Andrii Shyshkalov5fb47742016-11-24 17:09:40 +0100949 ))
950 self.assertFalse(git_cl.ShouldGenerateGitNumberFooters())
951
952 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: None)
953 self.assertFalse(git_cl.ShouldGenerateGitNumberFooters())
954
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000955 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000956 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000957 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000958 if skip_auth_check:
959 return [((cmd, ), 'true')]
960
tandrii5d48c322016-08-18 16:19:37 -0700961 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000962 if issue:
963 calls.extend([
964 ((['git', 'config', 'branch.master.gerritserver'],), ''),
965 ])
966 calls.extend([
967 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
968 ((['git', 'config', 'branch.master.remote'],), 'origin'),
969 ((['git', 'config', 'remote.origin.url'],),
970 'https://chromium.googlesource.com/my/repo'),
971 ((['git', 'config', 'remote.origin.url'],),
972 'https://chromium.googlesource.com/my/repo'),
973 ])
974 return calls
975
976 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000977 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000978 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000979 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700980 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -0700981 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000982 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700983 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
984 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000985 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000986 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700987 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
988 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -0700989 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000990 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000991 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000992 ((['get_or_create_merge_base', 'master',
993 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000994 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000995 # Calls to verify branch point is ancestor
996 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
997 cls._git_sanity_checks('fake_ancestor_sha', 'master',
998 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000999 ((['git', 'rev-parse', '--show-cdup'],), ''),
1000 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001001
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001002 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001003 'diff', '--name-status', '--no-renames', '-r',
1004 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001005 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001006 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001007 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001008 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001009 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001010 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001011 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001012 ((['git', 'config', 'user.email'],), 'me@example.com'),
1013 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001014 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1015 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001016 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001017 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001018
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001019 @classmethod
1020 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001021 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001022 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001023 ref_suffix='', notify=False,
bradnelsond975b302016-10-23 12:20:23 -07001024 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001025 if post_amend_description is None:
1026 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001027 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001028 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001029
tandriia60502f2016-06-20 02:01:53 -07001030 if squash_mode == 'default':
1031 calls.extend([
1032 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1033 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1034 ])
1035 elif squash_mode in ('override_squash', 'override_nosquash'):
1036 calls.extend([
1037 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1038 'true' if squash_mode == 'override_squash' else 'false'),
1039 ])
1040 else:
1041 assert squash_mode in ('squash', 'nosquash')
1042
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001043 # If issue is given, then description is fetched from Gerrit instead.
1044 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001045 calls += [
1046 ((['git', 'log', '--pretty=format:%s\n\n%b',
1047 'fake_ancestor_sha..HEAD'],),
1048 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001049 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001050 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001051 # DownloadGerritHook(False)
1052 ((False, ),
1053 ''),
1054 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001055 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001056 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001057 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001058 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001059 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001060 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001061 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001062 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001063 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001064 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001065 if not issue:
1066 # Prompting to edit description on first upload.
1067 calls += [
1068 ((['git', 'config', 'core.editor'],), ''),
1069 ((['RunEditor'],), description),
1070 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001071 ref_to_push = 'abcdef0123456789'
1072 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001073 ((['git', 'config', 'branch.master.merge'],),
1074 'refs/heads/master'),
1075 ((['git', 'config', 'branch.master.remote'],),
1076 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001077 ((['get_or_create_merge_base', 'master',
1078 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001079 'origin/master'),
1080 ((['git', 'rev-parse', 'HEAD:'],),
1081 '0123456789abcdef'),
1082 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001083 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001084 ref_to_push),
1085 ]
1086 else:
1087 ref_to_push = 'HEAD'
1088
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001089 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001090 ((['git', 'rev-list',
1091 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001092 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001093
1094 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1095 if ref_suffix:
1096 ref_suffix += ',' + notify_suffix
1097 else:
1098 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001099
ukai@chromium.orge8077812012-02-03 03:41:46 +00001100 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001101 ref_suffix += ',' + ','.join('r=%s' % email
1102 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001103 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00001104 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001105 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001106 ('remote:\n'
1107 'remote: Processing changes: (\)\n'
1108 'remote: Processing changes: (|)\n'
1109 'remote: Processing changes: (/)\n'
1110 'remote: Processing changes: (-)\n'
1111 'remote: Processing changes: new: 1 (/)\n'
1112 'remote: Processing changes: new: 1, done\n'
1113 'remote:\n'
1114 'remote: New Changes:\n'
1115 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1116 'remote:\n'
1117 'To https://chromium.googlesource.com/yyy/zzz\n'
1118 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001119 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001120 if squash:
1121 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001122 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001123 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001124 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001125 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001126 ((['git', 'config', 'branch.master.gerritsquashhash',
1127 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001128 ]
tandrii88189772016-09-29 04:29:57 -07001129 calls += [
1130 ((['git', 'config', 'rietveld.cc'],), ''),
1131 ((['AddReviewers', 'chromium-review.googlesource.com',
1132 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -07001133 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -07001134 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001135 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001136 return calls
1137
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001138 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001139 self,
1140 upload_args,
1141 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001142 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001143 squash=True,
1144 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001145 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001146 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001147 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001148 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001149 issue=None,
1150 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001151 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001152 if squash_mode is None:
1153 if '--no-squash' in upload_args:
1154 squash_mode = 'nosquash'
1155 elif '--squash' in upload_args:
1156 squash_mode = 'squash'
1157 else:
1158 squash_mode = 'default'
1159
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001160 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001161 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001162 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001163 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001164 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001165 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1166 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001167 self.mock(git_cl.gclient_utils, 'RunEditor',
1168 lambda *_, **__: self._mocked_call(['RunEditor']))
1169 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001170 self.mock(git_cl.gerrit_util, 'AddReviewers',
1171 lambda h, i, add, is_reviewer: self._mocked_call(
1172 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001173
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001174 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001175 self.calls += self._gerrit_upload_calls(
1176 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001177 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001178 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001179 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001180 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001181 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001182 # Uncomment when debugging.
1183 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001184 git_cl.main(['upload'] + upload_args)
1185
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001186 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001187 self._run_gerrit_upload_test(
1188 ['--no-squash'],
1189 'desc\n\nBUG=\n',
1190 [],
1191 squash=False,
1192 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1193
1194 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001195 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001196 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001197 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001198 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001199 [],
tandriia60502f2016-06-20 02:01:53 -07001200 squash=False,
1201 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001202 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001203
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001204 def test_gerrit_no_reviewer(self):
1205 self._run_gerrit_upload_test(
1206 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001207 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001208 [],
1209 squash=False,
1210 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001211
tandriieefe8322016-08-17 10:12:24 -07001212 def test_gerrit_patch_bad_chars(self):
1213 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001214 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001215 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001216 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001217 squash=False,
1218 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001219 ref_suffix='%m=Dont_put_bad_chars')
1220 self.assertIn(
1221 'WARNING: Patchset title may only contain alphanumeric chars '
1222 'and spaces. Cleaned up title:\nDont put bad chars\n',
1223 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001224
ukai@chromium.orge8077812012-02-03 03:41:46 +00001225 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001226 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001227 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001228 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001229 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001230 squash=False,
1231 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001232 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001233
1234 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001235 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001236 [],
bradnelsond975b302016-10-23 12:20:23 -07001237 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1238 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001239 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001240 ['reviewer@example.com', 'another@example.com'],
1241 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001242 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001243 ref_suffix='%l=Code-Review+1',
1244 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001245
1246 def test_gerrit_upload_squash_first_is_default(self):
1247 # Mock Gerrit CL description to indicate the first upload.
1248 self.mock(git_cl.Changelist, 'GetDescription',
1249 lambda *_: None)
1250 self._run_gerrit_upload_test(
1251 [],
1252 'desc\nBUG=\n\nChange-Id: 123456789',
1253 [],
1254 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001255
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001256 def test_gerrit_upload_squash_first(self):
1257 # Mock Gerrit CL description to indicate the first upload.
1258 self.mock(git_cl.Changelist, 'GetDescription',
1259 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001260 self._run_gerrit_upload_test(
1261 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001262 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001263 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001264 squash=True,
1265 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001266
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001267 def test_gerrit_upload_squash_reupload(self):
1268 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1269 # Mock Gerrit CL description to indicate re-upload.
1270 self.mock(git_cl.Changelist, 'GetDescription',
1271 lambda *args: description)
1272 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1273 lambda *args: 1)
1274 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1275 lambda *args: {'change_id': '123456789'})
1276 self._run_gerrit_upload_test(
1277 ['--squash'],
1278 description,
1279 [],
1280 squash=True,
1281 expected_upstream_ref='origin/master',
1282 issue=123456)
1283
rmistry@google.com2dd99862015-06-22 12:22:18 +00001284 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001285 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001286 def mock_run_git(*args, **_kwargs):
1287 if args[0] == ['for-each-ref',
1288 '--format=%(refname:short) %(upstream:short)',
1289 'refs/heads']:
1290 # Create a local branch dependency tree that looks like this:
1291 # test1 -> test2 -> test3 -> test4 -> test5
1292 # -> test3.1
1293 # test6 -> test0
1294 branch_deps = [
1295 'test2 test1', # test1 -> test2
1296 'test3 test2', # test2 -> test3
1297 'test3.1 test2', # test2 -> test3.1
1298 'test4 test3', # test3 -> test4
1299 'test5 test4', # test4 -> test5
1300 'test6 test0', # test0 -> test6
1301 'test7', # test7
1302 ]
1303 return '\n'.join(branch_deps)
1304 self.mock(git_cl, 'RunGit', mock_run_git)
1305
1306 class RecordCalls:
1307 times_called = 0
1308 record_calls = RecordCalls()
1309 def mock_CMDupload(*args, **_kwargs):
1310 record_calls.times_called += 1
1311 return 0
1312 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1313
1314 self.calls = [
1315 (('[Press enter to continue or ctrl-C to quit]',), ''),
1316 ]
1317
1318 class MockChangelist():
1319 def __init__(self):
1320 pass
1321 def GetBranch(self):
1322 return 'test1'
1323 def GetIssue(self):
1324 return '123'
1325 def GetPatchset(self):
1326 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001327 def IsGerrit(self):
1328 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001329
1330 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1331 # CMDupload should have been called 5 times because of 5 dependent branches.
1332 self.assertEquals(5, record_calls.times_called)
1333 self.assertEquals(0, ret)
1334
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001335 def test_gerrit_change_id(self):
1336 self.calls = [
1337 ((['git', 'write-tree'], ),
1338 'hashtree'),
1339 ((['git', 'rev-parse', 'HEAD~0'], ),
1340 'branch-parent'),
1341 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1342 'A B <a@b.org> 1456848326 +0100'),
1343 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1344 'C D <c@d.org> 1456858326 +0100'),
1345 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1346 'hashchange'),
1347 ]
1348 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1349 self.assertEqual(change_id, 'Ihashchange')
1350
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001351 def test_desecription_append_footer(self):
1352 for init_desc, footer_line, expected_desc in [
1353 # Use unique desc first lines for easy test failure identification.
1354 ('foo', 'R=one', 'foo\n\nR=one'),
1355 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1356 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1357 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1358 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1359 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1360 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1361 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1362 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1363 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1364 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1365 ]:
1366 desc = git_cl.ChangeDescription(init_desc)
1367 desc.append_footer(footer_line)
1368 self.assertEqual(desc.description, expected_desc)
1369
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001370 def test_update_reviewers(self):
1371 data = [
1372 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001373 ('foo\nR=xx', [], 'foo\nR=xx'),
1374 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001375 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001376 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1377 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1378 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001379 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001380 ('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 +00001381 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001382 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1383 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1384 # Same as the line before, but full of whitespaces.
1385 (
1386 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1387 'foo\nBar\n\nR=c@c\n BUG =',
1388 ),
1389 # Whitespaces aren't interpreted as new lines.
1390 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001391 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001392 expected = [i[2] for i in data]
1393 actual = []
1394 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001395 obj = git_cl.ChangeDescription(orig)
1396 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001397 actual.append(obj.description)
1398 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001399
wittman@chromium.org455dc922015-01-26 20:15:50 +00001400 def test_get_target_ref(self):
1401 # Check remote or remote branch not present.
1402 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1403 self.assertEqual(None, git_cl.GetTargetRef(None,
1404 'refs/remotes/origin/master',
1405 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001406
wittman@chromium.org455dc922015-01-26 20:15:50 +00001407 # Check default target refs for branches.
1408 self.assertEqual('refs/heads/master',
1409 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1410 None, None))
1411 self.assertEqual('refs/heads/master',
1412 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1413 None, None))
1414 self.assertEqual('refs/heads/master',
1415 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1416 None, None))
1417 self.assertEqual('refs/branch-heads/123',
1418 git_cl.GetTargetRef('origin',
1419 'refs/remotes/branch-heads/123',
1420 None, None))
1421 self.assertEqual('refs/diff/test',
1422 git_cl.GetTargetRef('origin',
1423 'refs/remotes/origin/refs/diff/test',
1424 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001425 self.assertEqual('refs/heads/chrome/m42',
1426 git_cl.GetTargetRef('origin',
1427 'refs/remotes/origin/chrome/m42',
1428 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001429
1430 # Check target refs for user-specified target branch.
1431 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1432 'refs/remotes/branch-heads/123'):
1433 self.assertEqual('refs/branch-heads/123',
1434 git_cl.GetTargetRef('origin',
1435 'refs/remotes/origin/master',
1436 branch, None))
1437 for branch in ('origin/master', 'remotes/origin/master',
1438 'refs/remotes/origin/master'):
1439 self.assertEqual('refs/heads/master',
1440 git_cl.GetTargetRef('origin',
1441 'refs/remotes/branch-heads/123',
1442 branch, None))
1443 for branch in ('master', 'heads/master', 'refs/heads/master'):
1444 self.assertEqual('refs/heads/master',
1445 git_cl.GetTargetRef('origin',
1446 'refs/remotes/branch-heads/123',
1447 branch, None))
1448
1449 # Check target refs for pending prefix.
1450 self.assertEqual('prefix/heads/master',
1451 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1452 None, 'prefix/'))
1453
wychen@chromium.orga872e752015-04-28 23:42:18 +00001454 def test_patch_when_dirty(self):
1455 # Patch when local tree is dirty
1456 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1457 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1458
1459 def test_diff_when_dirty(self):
1460 # Do 'git cl diff' when local tree is dirty
1461 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1462 self.assertNotEqual(git_cl.main(['diff']), 0)
1463
tandriidf09a462016-08-18 16:23:55 -07001464 def _patch_common(self, is_gerrit=False, force_codereview=False,
1465 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001466 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001467 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1468 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001469 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1470 lambda *args: {
1471 'current_revision': '7777777777',
1472 'revisions': {
1473 '1111111111': {
1474 '_number': 1,
1475 'fetch': {'http': {
1476 'url': 'https://chromium.googlesource.com/my/repo',
1477 'ref': 'refs/changes/56/123456/1',
1478 }},
1479 },
1480 '7777777777': {
1481 '_number': 7,
1482 'fetch': {'http': {
1483 'url': 'https://chromium.googlesource.com/my/repo',
1484 'ref': 'refs/changes/56/123456/7',
1485 }},
1486 },
1487 },
1488 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001489 self.mock(git_cl.Changelist, 'GetDescription',
1490 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001491 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1492
tandriidf09a462016-08-18 16:23:55 -07001493 if new_branch:
1494 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1495 else:
1496 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001497 if not force_codereview:
1498 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001499 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001500 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001501 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1502 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001503 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001504 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001505
1506 if is_gerrit:
1507 if not force_codereview:
1508 self.calls += [
1509 ((['git', 'config', 'gerrit.host'],), 'true'),
1510 ]
1511 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001512 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001513 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001514 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001515 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001516 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001517 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001518
tandriidf09a462016-08-18 16:23:55 -07001519 def _common_patch_successful(self, new_branch=False):
1520 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001521 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001522 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001523 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001524 'patch from issue 123456 at patchset 60001 ' +
1525 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001526 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001527 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001528 ((['git', 'config', 'branch.master.rietveldserver',
1529 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001530 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001531 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001532 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001533
1534 def test_patch_successful(self):
1535 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001536 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1537
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001538 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001539 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001540 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1541
wychen@chromium.orga872e752015-04-28 23:42:18 +00001542 def test_patch_conflict(self):
1543 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001544 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001545 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001546
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001547 def test_gerrit_patch_successful(self):
1548 self._patch_common(is_gerrit=True)
1549 self.calls += [
1550 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1551 'refs/changes/56/123456/7'],), ''),
1552 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001553 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001554 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001555 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1556 ((['git', 'config', 'branch.master.merge'],), 'master'),
1557 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1558 ((['git', 'config', 'remote.origin.url'],),
1559 'https://chromium.googlesource.com/my/repo'),
1560 ((['git', 'config', 'branch.master.gerritserver',
1561 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001562 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001563 ]
1564 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1565
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001566 def test_patch_force_codereview(self):
1567 self._patch_common(is_gerrit=True, force_codereview=True)
1568 self.calls += [
1569 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1570 'refs/changes/56/123456/7'],), ''),
1571 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1572 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001573 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001574 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001575 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1576 ((['git', 'config', 'branch.master.merge'],), 'master'),
1577 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1578 ((['git', 'config', 'remote.origin.url'],),
1579 'https://chromium.googlesource.com/my/repo'),
1580 ((['git', 'config', 'branch.master.gerritserver',
1581 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001582 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001583 ]
1584 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1585
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001586 def test_gerrit_patch_url_successful(self):
1587 self._patch_common(is_gerrit=True)
1588 self.calls += [
1589 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1590 'refs/changes/56/123456/1'],), ''),
1591 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001592 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001593 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001594 ((['git', 'config', 'branch.master.gerritserver',
1595 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001596 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001597 ]
1598 self.assertEqual(git_cl.main(
1599 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1600
1601 def test_gerrit_patch_conflict(self):
1602 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001603 self.calls += [
1604 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1605 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001606 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1607 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1608 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001609 ]
1610 with self.assertRaises(SystemExitMock):
1611 git_cl.main(['patch',
1612 'https://chromium-review.googlesource.com/#/c/123456/1'])
1613
tandriic2405f52016-10-10 08:13:15 -07001614 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001615 def notExists(_issue, *_, **kwargs):
1616 self.assertFalse(kwargs['ignore_404'])
1617 raise git_cl.gerrit_util.GerritError(404, '')
1618 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1619
tandriic2405f52016-10-10 08:13:15 -07001620 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001621 self.calls = [
1622 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1623 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1624 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1625 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1626 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1627 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001628 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001629 'or you have no access to it'],), SystemExitMock()),
1630 ]
1631 with self.assertRaises(SystemExitMock):
1632 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1633
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001634 def _checkout_calls(self):
1635 return [
1636 ((['git', 'config', '--local', '--get-regexp',
1637 'branch\\..*\\.rietveldissue'], ),
1638 ('branch.retrying.rietveldissue 1111111111\n'
1639 'branch.some-fix.rietveldissue 2222222222\n')),
1640 ((['git', 'config', '--local', '--get-regexp',
1641 'branch\\..*\\.gerritissue'], ),
1642 ('branch.ger-branch.gerritissue 123456\n'
1643 'branch.gbranch654.gerritissue 654321\n')),
1644 ]
1645
1646 def test_checkout_gerrit(self):
1647 """Tests git cl checkout <issue>."""
1648 self.calls = self._checkout_calls()
1649 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1650 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1651
1652 def test_checkout_rietveld(self):
1653 """Tests git cl checkout <issue>."""
1654 self.calls = self._checkout_calls()
1655 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1656 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1657
1658 def test_checkout_not_found(self):
1659 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001660 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001661 self.calls = self._checkout_calls()
1662 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1663
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001664 def test_checkout_no_branch_issues(self):
1665 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001666 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001667 self.calls = [
1668 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001669 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001670 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001671 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001672 ]
1673 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1674
tandrii@chromium.org28253532016-04-14 13:46:56 +00001675 def _test_gerrit_ensure_authenticated_common(self, auth,
1676 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001677 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1678 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1679 self.mock(git_cl, 'DieWithError',
1680 lambda msg: self._mocked_call(['DieWithError', msg]))
1681 self.mock(git_cl, 'ask_for_data',
1682 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001683 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001684 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001685 cl.branch = 'master'
1686 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001687 cl.lookedup_issue = True
1688 return cl
1689
1690 def test_gerrit_ensure_authenticated_missing(self):
1691 cl = self._test_gerrit_ensure_authenticated_common(auth={
1692 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1693 })
1694 self.calls.append(
1695 ((['DieWithError',
1696 'Credentials for the following hosts are required:\n'
1697 ' chromium-review.googlesource.com\n'
1698 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1699 'You can (re)generate your credentails by visiting '
1700 'https://chromium-review.googlesource.com/new-password'],), ''),)
1701 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1702
1703 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001704 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001705 cl = self._test_gerrit_ensure_authenticated_common(auth={
1706 'chromium.googlesource.com': 'one',
1707 'chromium-review.googlesource.com': 'other',
1708 })
1709 self.calls.append(
1710 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001711 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001712 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1713
1714 def test_gerrit_ensure_authenticated_ok(self):
1715 cl = self._test_gerrit_ensure_authenticated_common(auth={
1716 'chromium.googlesource.com': 'same',
1717 'chromium-review.googlesource.com': 'same',
1718 })
1719 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1720
tandrii@chromium.org28253532016-04-14 13:46:56 +00001721 def test_gerrit_ensure_authenticated_skipped(self):
1722 cl = self._test_gerrit_ensure_authenticated_common(
1723 auth={}, skip_auth_check=True)
1724 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1725
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001726 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001727 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1728 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001729 self.calls = [
1730 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001731 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001732 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1733 ((['git', 'config', 'rietveld.server'],), ''),
1734 ((['git', 'config', 'rietveld.server'],), ''),
1735 ((['git', 'config', 'branch.feature.rietveldserver'],),
1736 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001737 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001738 ]
1739 self.assertEqual(0, git_cl.main(['set-commit']))
1740
tandriid9e5ce52016-07-13 02:32:59 -07001741 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001742 self.mock(git_cl.gerrit_util, 'SetReview',
1743 lambda h, i, labels: self._mocked_call(
1744 ['SetReview', h, i, labels]))
1745 self.calls = [
1746 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001747 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1748 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001749 ((['git', 'config', 'branch.feature.gerritserver'],),
1750 'https://chromium-review.googlesource.com'),
1751 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001752 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001753 ]
tandriid9e5ce52016-07-13 02:32:59 -07001754
1755 def test_cmd_set_commit_gerrit_clear(self):
1756 self._cmd_set_commit_gerrit_common(0)
1757 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1758
1759 def test_cmd_set_commit_gerrit_dry(self):
1760 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001761 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1762
tandriid9e5ce52016-07-13 02:32:59 -07001763 def test_cmd_set_commit_gerrit(self):
1764 self._cmd_set_commit_gerrit_common(2)
1765 self.assertEqual(0, git_cl.main(['set-commit']))
1766
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001767 def test_description_display(self):
1768 out = StringIO.StringIO()
1769 self.mock(git_cl.sys, 'stdout', out)
1770
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001771 self.mock(git_cl, 'Changelist', ChangelistMock)
1772 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001773
1774 self.assertEqual(0, git_cl.main(['description', '-d']))
1775 self.assertEqual('foo\n', out.getvalue())
1776
1777 def test_description_rietveld(self):
1778 out = StringIO.StringIO()
1779 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001780 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001781
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001782 self.assertEqual(0, git_cl.main([
1783 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1784 self.assertEqual('foobar\n', out.getvalue())
1785
iannucci3c972b92016-08-17 13:24:10 -07001786 def test_StatusFieldOverrideIssueMissingArgs(self):
1787 out = StringIO.StringIO()
1788 self.mock(git_cl.sys, 'stderr', out)
1789
1790 try:
1791 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1792 except SystemExit as ex:
1793 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001794 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001795
1796 out = StringIO.StringIO()
1797 self.mock(git_cl.sys, 'stderr', out)
1798
1799 try:
1800 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1801 except SystemExit as ex:
1802 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001803 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001804
1805 def test_StatusFieldOverrideIssue(self):
1806 out = StringIO.StringIO()
1807 self.mock(git_cl.sys, 'stdout', out)
1808
1809 def assertIssue(cl_self, *_args):
1810 self.assertEquals(cl_self.issue, 1)
1811 return 'foobar'
1812
1813 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1814 self.calls = [
1815 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1816 ((['git', 'config', 'rietveld.server'],), ''),
1817 ((['git', 'config', 'rietveld.server'],), ''),
1818 ]
iannuccie53c9352016-08-17 14:40:40 -07001819 self.assertEqual(
1820 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1821 0)
iannucci3c972b92016-08-17 13:24:10 -07001822 self.assertEqual(out.getvalue(), 'foobar\n')
1823
iannuccie53c9352016-08-17 14:40:40 -07001824 def test_SetCloseOverrideIssue(self):
1825 def assertIssue(cl_self, *_args):
1826 self.assertEquals(cl_self.issue, 1)
1827 return 'foobar'
1828
1829 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1830 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1831 self.calls = [
1832 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1833 ((['git', 'config', 'rietveld.server'],), ''),
1834 ((['git', 'config', 'rietveld.server'],), ''),
1835 ]
1836 self.assertEqual(
1837 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1838
1839 def test_SetCommitOverrideIssue(self):
1840 def assertIssue(cl_self, *_args):
1841 self.assertEquals(cl_self.issue, 1)
1842 return 'foobar'
1843
1844 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1845 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1846 self.calls = [
1847 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1848 ((['git', 'config', 'rietveld.server'],), ''),
1849 ((['git', 'config', 'rietveld.server'],), ''),
1850 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1851 ((['git', 'config', 'rietveld.server'],), ''),
1852 ((['git', 'config', 'rietveld.server'],), ''),
1853 ]
1854 self.assertEqual(
1855 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1856
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001857 def test_description_gerrit(self):
1858 out = StringIO.StringIO()
1859 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001860 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001861
1862 self.assertEqual(0, git_cl.main([
1863 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1864 self.assertEqual('foobar\n', out.getvalue())
1865
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001866 def test_description_set_raw(self):
1867 out = StringIO.StringIO()
1868 self.mock(git_cl.sys, 'stdout', out)
1869
1870 self.mock(git_cl, 'Changelist', ChangelistMock)
1871 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1872
1873 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1874 self.assertEqual('hihi', ChangelistMock.desc)
1875
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001876 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001877 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001878
1879 def RunEditor(desc, _, **kwargs):
1880 self.assertEquals(
1881 '# Enter a description of the change.\n'
1882 '# This will be displayed on the codereview site.\n'
1883 '# The first line will also be used as the subject of the review.\n'
1884 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001885 '--------------------\n'
1886 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001887 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001888 # Simulate user changing something.
1889 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001890
dsansomee2d6fd92016-09-08 00:10:47 -07001891 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001892 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001893
1894 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1895 self.mock(git_cl.Changelist, 'GetDescription',
1896 lambda *args: current_desc)
1897 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1898 UpdateDescriptionRemote)
1899 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1900
1901 self.calls = [
1902 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001903 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001904 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1905 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001906 ((['git', 'config', 'core.editor'],), 'vi'),
1907 ]
1908 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1909
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001910 def test_description_set_stdin(self):
1911 out = StringIO.StringIO()
1912 self.mock(git_cl.sys, 'stdout', out)
1913
1914 self.mock(git_cl, 'Changelist', ChangelistMock)
1915 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1916
1917 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1918 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1919
kmarshall3bff56b2016-06-06 18:31:47 -07001920 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001921 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1922
kmarshall3bff56b2016-06-06 18:31:47 -07001923 self.calls = \
1924 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1925 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07001926 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001927 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1928 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07001929 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1930 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1931 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001932 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1933 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1934 ((['git', 'branch', '-D', 'foo'],), '')]
1935
kmarshall3bff56b2016-06-06 18:31:47 -07001936 self.mock(git_cl, 'get_cl_statuses',
1937 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001938 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1939 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1940 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001941
1942 self.assertEqual(0, git_cl.main(['archive', '-f']))
1943
1944 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001945 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001946 self.calls = \
1947 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1948 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07001949 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001950 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1951 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001952 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1953
kmarshall9249e012016-08-23 12:02:16 -07001954 self.mock(git_cl, 'get_cl_statuses',
1955 lambda branches, fine_grained, max_processes:
1956 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
1957
1958 self.assertEqual(1, git_cl.main(['archive', '-f']))
1959
1960 def test_archive_dry_run(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'),]
kmarshall3bff56b2016-06-06 18:31:47 -07001973
1974 self.mock(git_cl, 'get_cl_statuses',
1975 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001976 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1977 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1978 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001979
kmarshall9249e012016-08-23 12:02:16 -07001980 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
1981
1982 def test_archive_no_tags(self):
1983 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1984
1985 self.calls = \
1986 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1987 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1988 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1989 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1990 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1991 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1992 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1993 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1994 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1995 ((['git', 'branch', '-D', 'foo'],), '')]
1996
1997 self.mock(git_cl, 'get_cl_statuses',
1998 lambda branches, fine_grained, max_processes:
1999 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2000 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2001 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2002
2003 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002004
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002005 def test_cmd_issue_erase_existing(self):
2006 out = StringIO.StringIO()
2007 self.mock(git_cl.sys, 'stdout', out)
2008 self.calls = [
2009 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002010 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2011 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002012 # Let this command raise exception (retcode=1) - it should be ignored.
2013 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002014 CERR1),
2015 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2016 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002017 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2018 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2019 ''),
2020 ]
2021 self.assertEqual(0, git_cl.main(['issue', '0']))
2022
phajdan.jre328cf92016-08-22 04:12:17 -07002023 def test_cmd_issue_json(self):
2024 out = StringIO.StringIO()
2025 self.mock(git_cl.sys, 'stdout', out)
2026 self.calls = [
2027 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002028 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002029 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2030 ((['git', 'config', 'rietveld.server'],),
2031 'https://codereview.chromium.org'),
2032 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2033 (('write_json', 'output.json',
2034 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2035 ''),
2036 ]
2037 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2038
tandriide281ae2016-10-12 06:02:30 -07002039 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002040 self.mock(git_cl.Changelist, 'GetChange',
2041 lambda _, *a: (
2042 self._mocked_call(['GetChange']+list(a))))
2043 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2044 lambda *_, **__: (
2045 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002046 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2047 lambda _, s: self._mocked_call(['SetCQState', s]))
2048 self.calls = [
2049 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002050 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002051 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2052 ((['git', 'config', 'rietveld.server'],),
2053 'https://codereview.chromium.org'),
2054 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2055 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2056 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2057 ((['get_or_create_merge_base', 'feature', 'feature'],),
2058 'fake_ancestor_sha'),
2059 ((['GetChange', 'fake_ancestor_sha', None], ),
2060 git_cl.presubmit_support.GitChange(
2061 '', '', '', '', '', '', '', '')),
2062 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2063 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002064 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2065 ]
2066 out = StringIO.StringIO()
2067 self.mock(git_cl.sys, 'stdout', out)
2068 self.assertEqual(0, git_cl.main(['try']))
2069 self.assertEqual(
2070 out.getvalue(),
2071 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2072
tandrii8c5a3532016-11-04 07:52:02 -07002073 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2074 self.mock(git_cl.Changelist, 'GetChange',
2075 lambda _, *a: (
2076 self._mocked_call(['GetChange']+list(a))))
2077 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2078 lambda *_, **__: (
2079 self._mocked_call(['DoGetTryMasters'])))
2080 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2081 lambda _, s: self._mocked_call(['SetCQState', s]))
2082
2083 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2084 # Get realistic expectations.
2085 gerrit_change_list_impl._GetGerritHost()
2086 return self._mocked_call(['_GetChangeDetail', opts or []])
2087 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2088 _GetChangeDetail)
2089
2090 self.calls = [
2091 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2092 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2093 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2094 ((['git', 'config', 'branch.feature.gerritserver'],),
2095 'https://chromium-review.googlesource.com'),
2096 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
2097 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2098 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2099 ((['get_or_create_merge_base', 'feature', 'feature'],),
2100 'fake_ancestor_sha'),
2101 ((['GetChange', 'fake_ancestor_sha', None], ),
2102 git_cl.presubmit_support.GitChange(
2103 '', '', '', '', '', '', '', '')),
2104 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2105 ((['DoGetTryMasters'], ), None),
2106 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2107 ]
2108 out = StringIO.StringIO()
2109 self.mock(git_cl.sys, 'stdout', out)
2110 self.assertEqual(0, git_cl.main(['try']))
2111 self.assertEqual(
2112 out.getvalue(),
2113 'scheduled CQ Dry Run on '
2114 'https://chromium-review.googlesource.com/123456\n')
2115
2116 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2117 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2118 lambda _: {
2119 'owner_email': 'owner@e.mail',
2120 'private': False,
2121 'closed': False,
2122 'project': 'depot_tools',
2123 'patchsets': [20001],
2124 })
tandriide281ae2016-10-12 06:02:30 -07002125 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2126 self.calls = [
2127 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2128 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2129 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2130 ((['git', 'config', 'rietveld.server'],),
2131 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002132 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002133 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002134 ]
2135
2136 def _buildbucket_retry(*_, **kw):
2137 # self.maxDiff = 10000
2138 body = json.loads(kw['body'])
2139 self.assertEqual(len(body['builds']), 1)
2140 build = body['builds'][0]
2141 params = json.loads(build.pop('parameters_json'))
2142 self.assertEqual(params, {
2143 u'builder_name': u'win',
2144 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2145 u'revision': None}],
2146 u'properties': {
2147 u'category': u'git_cl_try',
2148 u'issue': 123,
2149 u'key': u'val',
2150 u'json': [{u'a': 1}, None],
2151 u'master': u'tryserver.chromium',
2152 u'patch_project': u'depot_tools',
2153 u'patch_storage': u'rietveld',
2154 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002155 u'rietveld': u'https://codereview.chromium.org',
2156 }
2157 })
2158 self.assertEqual(build, {
2159 u'bucket': u'master.tryserver.chromium',
2160 u'client_operation_id': u'uuid4',
2161 u'tags': [u'builder:win',
2162 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002163 u'user_agent:git_cl_try',
2164 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002165 })
2166
2167 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2168
2169 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2170 self.assertEqual(0, git_cl.main([
2171 'try', '-m', 'tryserver.chromium', '-b', 'win',
2172 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2173 self.assertRegexpMatches(
2174 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002175 'Tried jobs on:\nBucket: master.tryserver.chromium')
2176
tandrii8c5a3532016-11-04 07:52:02 -07002177 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2178 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2179 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2180
2181 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2182 # Get realistic expectations.
2183 gerrit_change_list_impl._GetGerritHost()
2184 return self._mocked_call(['_GetChangeDetail', opts or []])
2185 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2186 _GetChangeDetail)
2187
2188 self.calls = [
2189 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2190 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2191 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2192 ((['git', 'config', 'branch.feature.gerritserver'],),
2193 'https://chromium-review.googlesource.com'),
2194 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002195 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2196 {'owner': {'email': 'owner@e.mail'}}),
2197 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2198 'project': 'depot_tools',
2199 'revisions': {
2200 'deadbeaf': {
2201 '_number': 6,
2202 },
2203 'beeeeeef': {
2204 '_number': 7,
2205 'fetch': {'http': {
2206 'url': 'https://chromium.googlesource.com/depot_tools',
2207 'ref': 'refs/changes/56/123456/7'
2208 }},
2209 },
2210 },
2211 }),
2212 ]
2213
2214 def _buildbucket_retry(*_, **kw):
2215 # self.maxDiff = 10000
2216 body = json.loads(kw['body'])
2217 self.assertEqual(len(body['builds']), 1)
2218 build = body['builds'][0]
2219 params = json.loads(build.pop('parameters_json'))
2220 self.assertEqual(params, {
2221 u'builder_name': u'win',
2222 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2223 u'revision': None}],
2224 u'properties': {
2225 u'category': u'git_cl_try',
2226 u'key': u'val',
2227 u'json': [{u'a': 1}, None],
2228 u'master': u'tryserver.chromium',
2229
2230 u'patch_gerrit_url':
2231 u'https://chromium-review.googlesource.com',
2232 u'patch_issue': 123456,
2233 u'patch_project': u'depot_tools',
2234 u'patch_ref': u'refs/changes/56/123456/7',
2235 u'patch_repository_url':
2236 u'https://chromium.googlesource.com/depot_tools',
2237 u'patch_set': 7,
2238 u'patch_storage': u'gerrit',
2239 }
2240 })
2241 self.assertEqual(build, {
2242 u'bucket': u'master.tryserver.chromium',
2243 u'client_operation_id': u'uuid4',
2244 u'tags': [
2245 u'builder:win',
2246 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2247 u'user_agent:git_cl_try',
2248 u'master:tryserver.chromium'],
2249 })
2250
2251 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2252
2253 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2254 self.assertEqual(0, git_cl.main([
2255 'try', '-m', 'tryserver.chromium', '-b', 'win',
2256 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2257 self.assertRegexpMatches(
2258 git_cl.sys.stdout.getvalue(),
2259 'Tried jobs on:\nBucket: master.tryserver.chromium')
2260
borenet6c0efe62016-10-19 08:13:29 -07002261 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002262 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2263 lambda _: {
2264 'owner_email': 'owner@e.mail',
2265 'private': False,
2266 'closed': False,
2267 'project': 'depot_tools',
2268 'patchsets': [20001],
2269 })
borenet6c0efe62016-10-19 08:13:29 -07002270 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2271 self.calls = [
2272 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2273 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2274 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2275 ((['git', 'config', 'rietveld.server'],),
2276 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002277 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002278 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002279 ]
2280
2281 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002282 body = json.loads(kw['body'])
2283 self.assertEqual(len(body['builds']), 1)
2284 build = body['builds'][0]
2285 params = json.loads(build.pop('parameters_json'))
2286 self.assertEqual(params, {
2287 u'builder_name': u'win',
2288 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2289 u'revision': None}],
2290 u'properties': {
2291 u'category': u'git_cl_try',
2292 u'issue': 123,
2293 u'patch_project': u'depot_tools',
2294 u'patch_storage': u'rietveld',
2295 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002296 u'rietveld': u'https://codereview.chromium.org',
2297 }
2298 })
2299 self.assertEqual(build, {
2300 u'bucket': u'test.bucket',
2301 u'client_operation_id': u'uuid4',
2302 u'tags': [u'builder:win',
2303 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2304 u'user_agent:git_cl_try'],
2305 })
2306
2307 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2308
2309 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2310 self.assertEqual(0, git_cl.main([
2311 'try', '-B', 'test.bucket', '-b', 'win']))
2312 self.assertRegexpMatches(
2313 git_cl.sys.stdout.getvalue(),
2314 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002315
qyearsley123a4682016-10-26 09:12:17 -07002316 def test_git_cl_try_bots_on_multiple_masters(self):
2317 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2318 self.calls = [
2319 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2320 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2321 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2322 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002323 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002324 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2325 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2326 ]
2327
2328 def _buildbucket_retry(*_, **kw):
2329 body = json.loads(kw['body'])
2330 self.assertEqual(len(body['builds']), 2)
2331
2332 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2333 self.assertEqual(first_build_params['builder_name'], 'builder1')
2334 self.assertEqual(first_build_params['properties']['master'], 'master1')
2335
2336 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2337 self.assertEqual(first_build_params['builder_name'], 'builder2')
2338 self.assertEqual(first_build_params['properties']['master'], 'master2')
2339
2340 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2341
2342 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2343 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2344
2345 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2346 self.assertEqual(
2347 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2348 self.assertEqual(
2349 git_cl.sys.stdout.getvalue(),
2350 'Tried jobs on:\n'
2351 'Bucket: master.master1\n'
2352 ' builder1: []\n'
2353 'Bucket: master.master2\n'
2354 ' builder2: []\n'
2355 'To see results here, run: git cl try-results\n'
2356 'To see results in browser, run: git cl web\n')
2357
tandrii16e0b4e2016-06-07 10:34:28 -07002358 def _common_GerritCommitMsgHookCheck(self):
2359 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2360 self.mock(git_cl.os.path, 'abspath',
2361 lambda path: self._mocked_call(['abspath', path]))
2362 self.mock(git_cl.os.path, 'exists',
2363 lambda path: self._mocked_call(['exists', path]))
2364 self.mock(git_cl.gclient_utils, 'FileRead',
2365 lambda path: self._mocked_call(['FileRead', path]))
2366 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2367 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2368 self.calls = [
2369 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2370 ((['abspath', '../'],), '/abs/git_repo_root'),
2371 ]
2372 return git_cl.Changelist(codereview='gerrit', issue=123)
2373
2374 def test_GerritCommitMsgHookCheck_custom_hook(self):
2375 cl = self._common_GerritCommitMsgHookCheck()
2376 self.calls += [
2377 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2378 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2379 '#!/bin/sh\necho "custom hook"')
2380 ]
2381 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2382
2383 def test_GerritCommitMsgHookCheck_not_exists(self):
2384 cl = self._common_GerritCommitMsgHookCheck()
2385 self.calls += [
2386 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2387 ]
2388 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2389
2390 def test_GerritCommitMsgHookCheck(self):
2391 cl = self._common_GerritCommitMsgHookCheck()
2392 self.calls += [
2393 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2394 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2395 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2396 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2397 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2398 ''),
2399 ]
2400 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2401
tandriic4344b52016-08-29 06:04:54 -07002402 def test_GerritCmdLand(self):
2403 self.calls += [
2404 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2405 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2406 'deadbeaf'),
2407 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2408 ((['git', 'config', 'branch.feature.gerritserver'],),
2409 'chromium-review.googlesource.com'),
2410 ]
2411 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2412 cl._codereview_impl._GetChangeDetail = lambda _: {
2413 'labels': {},
2414 'current_revision': 'deadbeaf',
2415 }
agable32978d92016-11-01 12:55:02 -07002416 cl._codereview_impl._GetChangeCommit = lambda: {
2417 'commit': 'deadbeef',
2418 'web_links': [{'name': 'gerrit',
2419 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2420 }
tandriic4344b52016-08-29 06:04:54 -07002421 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002422 out = StringIO.StringIO()
2423 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002424 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002425 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002426 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002427
tandrii221ab252016-10-06 08:12:04 -07002428 BUILDBUCKET_BUILDS_MAP = {
2429 '9000': {
2430 'id': '9000',
2431 'status': 'STARTED',
2432 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2433 'result_details_json': '{"properties": {}}',
2434 'bucket': 'master.x.y',
2435 'created_by': 'user:someone@chromium.org',
2436 'created_ts': '147200002222000',
2437 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2438 },
2439 '8000': {
2440 'id': '8000',
2441 'status': 'COMPLETED',
2442 'result': 'FAILURE',
2443 'failure_reason': 'BUILD_FAILURE',
2444 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2445 'result_details_json': '{"properties": {}}',
2446 'bucket': 'master.x.y',
2447 'created_by': 'user:someone@chromium.org',
2448 'created_ts': '147200001111000',
2449 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2450 },
2451 }
2452
2453 def test_write_try_results_json(self):
2454 expected_output = [
2455 {
2456 'buildbucket_id': '8000',
2457 'bucket': 'master.x.y',
2458 'builder_name': 'my-builder',
2459 'status': 'COMPLETED',
2460 'result': 'FAILURE',
2461 'failure_reason': 'BUILD_FAILURE',
2462 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2463 },
2464 {
2465 'buildbucket_id': '9000',
2466 'bucket': 'master.x.y',
2467 'builder_name': 'my-builder',
2468 'status': 'STARTED',
2469 'result': None,
2470 'failure_reason': None,
2471 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2472 }
2473 ]
2474 self.calls = [(('write_json', 'output.json', expected_output), '')]
2475 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2476
tandrii45b2a582016-10-11 03:14:16 -07002477 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002478 out = StringIO.StringIO()
2479 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002480 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2481 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002482 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2483 self._mocked_call(['get_authenticator_for_host', host]))
2484 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2485 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002486
2487 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2488 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002489 self.calls += [
2490 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2491 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2492 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2493 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2494 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2495 ((['git', 'config', 'branch.feature.rietveldserver'],),
2496 'codereview.example.com'),
2497 ((['get_authenticator_for_host', 'codereview.example.com'],),
2498 AuthenticatorMock()),
2499 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2500
2501 def test_fetch_try_jobs_none_rietveld(self):
2502 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002503 # Simulate that user isn't logged in.
2504 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002505 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002506 self.assertRegexpMatches(sys.stdout.getvalue(),
2507 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002508 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2509
2510 def test_fetch_try_jobs_some_rietveld(self):
2511 self._setup_fetch_try_jobs_rietveld({
2512 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2513 })
2514 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002515 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2516 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2517 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2518
2519 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2520 self._setup_fetch_try_jobs(most_recent_patchset=13)
2521 self.calls += [
2522 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2523 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2524 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002525 # TODO(tandrii): Uncomment the below if we decide to support checking
2526 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002527 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002528 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002529 ((['git', 'config', 'branch.feature.gerritserver'],),
2530 'https://x-review.googlesource.com'),
2531 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2532 AuthenticatorMock()),
2533 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2534
2535 def test_fetch_try_jobs_none_gerrit(self):
2536 self._setup_fetch_try_jobs_gerrit({})
2537 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002538 # TODO(tandrii): Uncomment the below if we decide to support checking
2539 # patchsets for Gerrit.
2540 # self.assertRegexpMatches(
2541 # sys.stdout.getvalue(),
2542 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002543 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2544
2545 def test_fetch_try_jobs_some_gerrit(self):
2546 self._setup_fetch_try_jobs_gerrit({
2547 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2548 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002549 # TODO(tandrii): Uncomment the below if we decide to support checking
2550 # patchsets for Gerrit.
2551 # self.calls.remove(
2552 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002553 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2554
2555 # ... and doesn't result in warning.
2556 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2557 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002558 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2559 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2560
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002561
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002562if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002563 git_cl.logging.basicConfig(
2564 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002565 unittest.main()