blob: 82d830a5710414803e31e3eb2697488024cb33fd [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 ],
71 }
72
iannuccie53c9352016-08-17 14:40:40 -070073 @staticmethod
74 def close_issue(_issue):
75 return 'Closed'
76
skobes6468b902016-10-24 08:45:10 -070077 @staticmethod
78 def get_patch(issue, patchset):
79 return 'patch set from issue %s patchset %s' % (issue, patchset)
80
81
82class GitCheckoutMock(object):
83 def __init__(self, *args, **kwargs):
84 pass
85
86 @staticmethod
87 def reset():
88 GitCheckoutMock.conflict = False
89
90 def apply_patch(self, p):
91 if GitCheckoutMock.conflict:
92 raise Exception('failed')
93
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000094
95class WatchlistsMock(object):
96 def __init__(self, _):
97 pass
98 @staticmethod
99 def GetWatchersForPaths(_):
100 return ['joe@example.com']
101
102
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000103class CodereviewSettingsFileMock(object):
104 def __init__(self):
105 pass
106 # pylint: disable=R0201
107 def read(self):
108 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000109 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000110
111
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000112class AuthenticatorMock(object):
113 def __init__(self, *_args):
114 pass
115 def has_cached_credentials(self):
116 return True
tandrii221ab252016-10-06 08:12:04 -0700117 def authorize(self, http):
118 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000119
120
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000121def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
122 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
123
124 Usage:
125 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
126 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
127
128 OR
129 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
130 CookiesAuthenticatorMockFactory(cookie='cookie'))
131 """
132 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
133 def __init__(self): # pylint: disable=W0231
134 # Intentionally not calling super() because it reads actual cookie files.
135 pass
136 @classmethod
137 def get_gitcookies_path(cls):
138 return '~/.gitcookies'
139 @classmethod
140 def get_netrc_path(cls):
141 return '~/.netrc'
142 def get_auth_header(self, host):
143 if same_cookie:
144 return same_cookie
145 return (hosts_with_creds or {}).get(host)
146 return CookiesAuthenticatorMock
147
kmarshall9249e012016-08-23 12:02:16 -0700148class MockChangelistWithBranchAndIssue():
149 def __init__(self, branch, issue):
150 self.branch = branch
151 self.issue = issue
152 def GetBranch(self):
153 return self.branch
154 def GetIssue(self):
155 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000156
tandriic2405f52016-10-10 08:13:15 -0700157
158class SystemExitMock(Exception):
159 pass
160
161
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000162class TestGitClBasic(unittest.TestCase):
163 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
164 parsed = urlparse.urlparse(url)
165 result = func(parsed)
166 if fail:
167 self.assertIsNone(result)
168 return None
169 self.assertIsNotNone(result)
170 self.assertEqual(result.issue, issue)
171 self.assertEqual(result.patchset, patchset)
172 self.assertEqual(result.hostname, hostname)
173 return result
174
175 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700176 def test(url, issue=None, patchset=None, hostname=None, fail=None):
177 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000178 git_cl._RietveldChangelistImpl.ParseIssueURL,
179 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000180
181 test('http://codereview.chromium.org/123',
182 123, None, 'codereview.chromium.org')
183 test('https://codereview.chromium.org/123',
184 123, None, 'codereview.chromium.org')
185 test('https://codereview.chromium.org/123/',
186 123, None, 'codereview.chromium.org')
187 test('https://codereview.chromium.org/123/whatever',
188 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700189 test('https://codereview.chromium.org/123/#ps20001',
190 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000191 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700192 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000193 # This looks like bad Gerrit, but is actually valid Rietveld.
194 test('https://chrome-review.source.com/123/4/',
195 123, None, 'chrome-review.source.com')
196
197 test('https://codereview.chromium.org/deadbeaf', fail=True)
198 test('https://codereview.chromium.org/api/123', fail=True)
199 test('bad://codereview.chromium.org/123', fail=True)
200 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
201
202 def test_ParseIssueURL_gerrit(self):
203 def test(url, issue=None, patchset=None, hostname=None, fail=None):
204 self._test_ParseIssueUrl(
205 git_cl._GerritChangelistImpl.ParseIssueURL,
206 url, issue, patchset, hostname, fail)
207
208 test('http://chrome-review.source.com/c/123',
209 123, None, 'chrome-review.source.com')
210 test('https://chrome-review.source.com/c/123/',
211 123, None, 'chrome-review.source.com')
212 test('https://chrome-review.source.com/c/123/4',
213 123, 4, 'chrome-review.source.com')
214 test('https://chrome-review.source.com/#/c/123/4',
215 123, 4, 'chrome-review.source.com')
216 test('https://chrome-review.source.com/c/123/4',
217 123, 4, 'chrome-review.source.com')
218 test('https://chrome-review.source.com/123',
219 123, None, 'chrome-review.source.com')
220 test('https://chrome-review.source.com/123/4',
221 123, 4, 'chrome-review.source.com')
222
223 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
224 test('https://chrome-review.source.com/c/abc/', fail=True)
225 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
226
227 def test_ParseIssueNumberArgument(self):
228 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
229 result = git_cl.ParseIssueNumberArgument(arg)
230 self.assertIsNotNone(result)
231 if fail:
232 self.assertFalse(result.valid)
233 else:
234 self.assertEqual(result.issue, issue)
235 self.assertEqual(result.patchset, patchset)
236 self.assertEqual(result.hostname, hostname)
237
238 test('123', 123)
239 test('', fail=True)
240 test('abc', fail=True)
241 test('123/1', fail=True)
242 test('123a', fail=True)
243 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
244 # Rietveld.
245 test('https://codereview.source.com/123',
246 123, None, 'codereview.source.com')
247 test('https://codereview.source.com/www123', fail=True)
248 # Gerrrit.
249 test('https://chrome-review.source.com/c/123/4',
250 123, 4, 'chrome-review.source.com')
251 test('https://chrome-review.source.com/bad/123/4', fail=True)
252
tandriif9aefb72016-07-01 09:06:51 -0700253 def test_get_bug_line_values(self):
254 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
255 self.assertEqual(f('', ''), [])
256 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
257 self.assertEqual(f('v8', '456'), ['v8:456'])
258 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
259 # Not nice, but not worth carying.
260 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
261 ['v8:456', 'chromium:123', 'v8:123'])
262
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000263
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000264class TestGitCl(TestCase):
265 def setUp(self):
266 super(TestGitCl, self).setUp()
267 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700268 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000269 self.mock(subprocess2, 'call', self._mocked_call)
270 self.mock(subprocess2, 'check_call', self._mocked_call)
271 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700272 self.mock(subprocess2, 'communicate',
273 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000274 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000275 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000276 self.mock(git_common, 'get_or_create_merge_base',
277 lambda *a: (
278 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000279 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000280 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000281 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700282 self.mock(git_cl, 'write_json', lambda path, contents:
283 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000284 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000285 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000286 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700287 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
288 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000289 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000290 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000291 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000292 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
293 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700294 self.mock(git_cl, 'DieWithError',
295 lambda msg: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000296 # It's important to reset settings to not have inter-tests interference.
297 git_cl.settings = None
298
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000299
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000300 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000301 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000302 # Note: has_failed returns True if at least 1 test ran so far, current
303 # included, has failed. That means current test may have actually ran
304 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000305 if not self.has_failed():
306 self.assertEquals([], self.calls)
307 finally:
308 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000309
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000310 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000311 self.assertTrue(
312 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700313 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000314 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000315 expected_args, result = top
316
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000317 # Also logs otherwise it could get caught in a try/finally and be hard to
318 # diagnose.
319 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700320 N = 5
321 prior_calls = '\n '.join(
322 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
323 for i, c in enumerate(self._calls_done[-N:]))
324 following_calls = '\n '.join(
325 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
326 for i, c in enumerate(self.calls[:N]))
327 extended_msg = (
328 'A few prior calls:\n %s\n\n'
329 'This (expected):\n @%d: %r\n'
330 'This (actual):\n @%d: %r\n\n'
331 'A few following expected calls:\n %s' %
332 (prior_calls, len(self._calls_done), expected_args,
333 len(self._calls_done), args, following_calls))
334 git_cl.logging.error(extended_msg)
335
tandrii99a72f22016-08-17 14:33:24 -0700336 self.fail('@%d\n'
337 ' Expected: %r\n'
338 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700339 len(self._calls_done), expected_args, args))
340
341 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700342 if isinstance(result, Exception):
343 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000344 return result
345
tandrii48df5812016-10-17 03:55:37 -0700346 def test_LoadCodereviewSettingsFromFile_gerrit(self):
347 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
348 self.calls = [
349 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
350 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
351 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
352 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
353 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
354 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
355 ((['git', 'config', '--unset-all', 'rietveld.force-https-commit-url'],),
356 CERR1),
357 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
358 CERR1),
359 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
360 ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],),
361 CERR1),
362 ((['git', 'config', '--unset-all', 'rietveld.git-number-footer'],),
363 CERR1),
364 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
365 CERR1),
366 ((['git', 'config', 'gerrit.host', 'true'],), ''),
367 ]
368 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
369
maruel@chromium.orga3353652011-11-30 14:26:57 +0000370 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000371 def _is_gerrit_calls(cls, gerrit=False):
372 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
373 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
374
375 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000376 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000377 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000378 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000379
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000380 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000381 def _upload_no_rev_calls(cls, similarity, find_copies):
382 return (cls._git_base_calls(similarity, find_copies) +
383 cls._git_upload_no_rev_calls())
384
385 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000386 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000387 if similarity is None:
388 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700389 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700390 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000391 else:
tandrii33a46ff2016-08-23 05:53:40 -0700392 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700393 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000394
395 if find_copies is None:
396 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700397 find_copies_call = ((['git', 'config', '--bool',
398 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000399 else:
tandrii5d48c322016-08-18 16:19:37 -0700400 val = str(find_copies).lower()
401 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000402 'branch.master.git-find-copies', val],), '')
403
404 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000405 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800406 '-l100000', '-C'+similarity,
407 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000408 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000409 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000410 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000411
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000412 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000413 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000414 similarity_call,
415 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
416 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000417 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000418 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700419 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
420 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000421 ((['git', 'config', 'rietveld.server'],),
422 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000423 ((['git', 'config', 'branch.master.merge'],), 'master'),
424 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000425 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000426 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000427 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000428 ((['git', 'rev-parse', '--show-cdup'],), ''),
429 ((['git', 'rev-parse', 'HEAD'],), '12345'),
430 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000431 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000432 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700433 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000434 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000435 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000436 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000437 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000438 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000439 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000440 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000441 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000442 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000443 ]
444
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000445 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000446 def _git_upload_no_rev_calls(cls):
447 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000448 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000449 ]
450
451 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000452 def _git_upload_calls(cls, private):
453 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000454 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000455 private_call = []
456 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000457 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000458 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000459 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000460
maruel@chromium.orga3353652011-11-30 14:26:57 +0000461 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000462 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000463 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000464 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000465 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000466 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000467 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
468 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000469 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000470 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000471 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700472 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000473 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000474 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000475 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700476 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000477 ] + cls._git_post_upload_calls()
478
479 @classmethod
480 def _git_post_upload_calls(cls):
481 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000482 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
483 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
484 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000485 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000486 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000487 ]
488
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000489 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000490 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000491 fake_ancestor = 'fake_ancestor'
492 fake_cl = 'fake_cl_for_patch'
493 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000494 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000495 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000496 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000497 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000498 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000499 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000500 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000501 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700502 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000503 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000504 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000505 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000506 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000507 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000508 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000509 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000510 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000511 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000512 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000513 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000514
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000515 @classmethod
516 def _dcommit_calls_1(cls):
517 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000518 ((['git', 'config', 'rietveld.autoupdate'],),
519 ''),
520 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
521 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000522 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000523 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000524 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
525 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
526 None),
527 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000528 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700529 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700530 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000531 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700532 ((['git', 'config', '--bool',
533 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000534 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
535 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700536 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000537 ((['git',
538 'config', 'rietveld.server'],), 'codereview.example.com'),
539 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000540 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000541 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000542 ((['git', 'config', 'branch.working.merge'],),
543 'refs/heads/master'),
544 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000545 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000546 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000547 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000548 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000549 'refs/remotes/origin/master'],),
550 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000551 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000552 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000553 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000554 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000555 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000556 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000557 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000558 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000559 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000560 ]
561
562 @classmethod
563 def _dcommit_calls_normal(cls):
564 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000565 ((['git', 'rev-parse', '--show-cdup'],), ''),
566 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000567 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000568 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000569 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000570 '.'],),
571 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000572 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700573 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000574 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000575 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000576 ((['git', 'config', 'user.email'],), 'author@example.com'),
577 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000578 ]
579
580 @classmethod
581 def _dcommit_calls_bypassed(cls):
582 return [
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'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000585 ]
586
587 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000588 def _dcommit_calls_3(cls):
589 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000590 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -0800591 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
592 'fake_ancestor_sha', 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000593 (' PRESUBMIT.py | 2 +-\n'
594 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000595 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700596 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000597 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
598 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700599 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000600 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000601 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
602 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
603 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000604 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000605 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000606 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000607 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000608 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000609 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000610 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000611 ((['git', 'checkout', '-q', 'working'],), ''),
612 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000613 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000614
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000615 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700616 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000617 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000618 return [
619 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000620 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000621 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000622 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700623 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000624 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000625 '--git_similarity', similarity or '50'
626 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000627 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000628 ]
629
630 def _run_reviewer_test(
631 self,
632 upload_args,
633 expected_description,
634 returned_description,
635 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000636 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700637 private=False,
638 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000639 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000640 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000641 try:
642 similarity = upload_args[upload_args.index('--similarity')+1]
643 except ValueError:
644 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000645
646 if '--find-copies' in upload_args:
647 find_copies = True
648 elif '--no-find-copies' in upload_args:
649 find_copies = False
650 else:
651 find_copies = None
652
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000653 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700654 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000655
656 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000657
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000658 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000659 self.assertEquals(
660 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000661 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000662 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000663 '#--------------------This line is 72 characters long'
664 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000665 expected_description,
666 desc)
667 return returned_description
668 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000669
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000670 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000671 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700672 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000673 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000674 return 1, 2
675 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000676
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000677 git_cl.main(['upload'] + upload_args)
678
679 def test_no_reviewer(self):
680 self._run_reviewer_test(
681 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000682 'desc\n\nBUG=',
683 '# Blah blah comment.\ndesc\n\nBUG=',
684 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000685 [])
686
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000687 def test_keep_similarity(self):
688 self._run_reviewer_test(
689 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000690 'desc\n\nBUG=',
691 '# Blah blah comment.\ndesc\n\nBUG=',
692 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000693 [])
694
iannucci@chromium.org79540052012-10-19 23:15:26 +0000695 def test_keep_find_copies(self):
696 self._run_reviewer_test(
697 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000698 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000699 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000700 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000701 [])
702
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000703 def test_private(self):
704 self._run_reviewer_test(
705 ['--private'],
706 'desc\n\nBUG=',
707 '# Blah blah comment.\ndesc\n\nBUG=\n',
708 'desc\n\nBUG=',
709 [])
710
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000711 def test_reviewers_cmd_line(self):
712 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000713 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000714 self._run_reviewer_test(
715 ['-r' 'foo@example.com'],
716 description,
717 '\n%s\n' % description,
718 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000719 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000720
721 def test_reviewer_tbr_overriden(self):
722 # Reviewer is overriden with TBR
723 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000724 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000725 self._run_reviewer_test(
726 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000727 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000728 description.strip('\n'),
729 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000730 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000731
732 def test_reviewer_multiple(self):
733 # Handles multiple R= or TBR= lines.
734 description = (
bradnelsond975b302016-10-23 12:20:23 -0700735 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
736 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000737 self._run_reviewer_test(
738 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000739 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000740 description,
741 description,
bradnelsond975b302016-10-23 12:20:23 -0700742 ['--reviewers=another@example.com,reviewer@example.com'],
743 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000744
maruel@chromium.orga3353652011-11-30 14:26:57 +0000745 def test_reviewer_send_mail(self):
746 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000747 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000748 self._run_reviewer_test(
749 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000750 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000751 description.strip('\n'),
752 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000753 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000754
755 def test_reviewer_send_mail_no_rev(self):
756 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000757 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700758 self.calls = self._upload_no_rev_calls(None, None) + [
759 ((['DieWithError', 'Must specify reviewers to send email.'],),
760 SystemExitMock())
761 ]
762
763 def RunEditor(desc, _, **kwargs):
764 return desc
765 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
766 self.mock(sys, 'stdout', stdout)
767 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000768 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700769 self.assertEqual(
770 'Using 50% similarity for rename/copy detection. Override with '
771 '--similarity.\n',
772 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000773
tandriif9aefb72016-07-01 09:06:51 -0700774 def test_bug_on_cmd(self):
775 self._run_reviewer_test(
776 ['--bug=500658,proj:123'],
777 'desc\n\nBUG=500658\nBUG=proj:123',
778 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
779 'desc\n\nBUG=500658\nBUG=proj:1234',
780 [])
781
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000782 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000783 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000784 self.calls = (
785 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000786 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000787 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000788 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000789 git_cl.main(['dcommit'])
790
791 def test_dcommit_bypass_hooks(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() +
795 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000796 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000797 git_cl.main(['dcommit', '--bypass-hooks'])
798
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000799
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000800 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000801 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000802 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000803 if skip_auth_check:
804 return [((cmd, ), 'true')]
805
tandrii5d48c322016-08-18 16:19:37 -0700806 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000807 if issue:
808 calls.extend([
809 ((['git', 'config', 'branch.master.gerritserver'],), ''),
810 ])
811 calls.extend([
812 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
813 ((['git', 'config', 'branch.master.remote'],), 'origin'),
814 ((['git', 'config', 'remote.origin.url'],),
815 'https://chromium.googlesource.com/my/repo'),
816 ((['git', 'config', 'remote.origin.url'],),
817 'https://chromium.googlesource.com/my/repo'),
818 ])
819 return calls
820
821 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000822 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000823 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700825 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -0700826 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700828 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
829 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000830 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000831 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700832 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
833 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -0700834 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000835 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000836 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000837 ((['get_or_create_merge_base', 'master',
838 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000839 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000840 # Calls to verify branch point is ancestor
841 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
842 cls._git_sanity_checks('fake_ancestor_sha', 'master',
843 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000844 ((['git', 'rev-parse', '--show-cdup'],), ''),
845 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000846
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000847 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000848 'diff', '--name-status', '--no-renames', '-r',
849 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000850 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700851 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000852 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000853 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000854 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000855 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000856 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000857 ((['git', 'config', 'user.email'],), 'me@example.com'),
858 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -0800859 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
860 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000861 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000862 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000863
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000864 @classmethod
865 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700866 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000867 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000868 ref_suffix='', notify=False,
bradnelsond975b302016-10-23 12:20:23 -0700869 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000870 if post_amend_description is None:
871 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -0700872 calls = []
bradnelsond975b302016-10-23 12:20:23 -0700873 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000874
tandriia60502f2016-06-20 02:01:53 -0700875 if squash_mode == 'default':
876 calls.extend([
877 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
878 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
879 ])
880 elif squash_mode in ('override_squash', 'override_nosquash'):
881 calls.extend([
882 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
883 'true' if squash_mode == 'override_squash' else 'false'),
884 ])
885 else:
886 assert squash_mode in ('squash', 'nosquash')
887
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000888 # If issue is given, then description is fetched from Gerrit instead.
889 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000890 calls += [
891 ((['git', 'log', '--pretty=format:%s\n\n%b',
892 'fake_ancestor_sha..HEAD'],),
893 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000894 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000895 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000896 # DownloadGerritHook(False)
897 ((False, ),
898 ''),
899 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000900 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000901 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000902 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000903 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000904 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000905 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000906 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000907 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000908 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000909 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000910 if not issue:
911 # Prompting to edit description on first upload.
912 calls += [
913 ((['git', 'config', 'core.editor'],), ''),
914 ((['RunEditor'],), description),
915 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000916 ref_to_push = 'abcdef0123456789'
917 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000918 ((['git', 'config', 'branch.master.merge'],),
919 'refs/heads/master'),
920 ((['git', 'config', 'branch.master.remote'],),
921 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000922 ((['get_or_create_merge_base', 'master',
923 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000924 'origin/master'),
925 ((['git', 'rev-parse', 'HEAD:'],),
926 '0123456789abcdef'),
927 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000928 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000929 ref_to_push),
930 ]
931 else:
932 ref_to_push = 'HEAD'
933
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000934 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000935 ((['git', 'rev-list',
936 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000937 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000938
939 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
940 if ref_suffix:
941 ref_suffix += ',' + notify_suffix
942 else:
943 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000944
ukai@chromium.orge8077812012-02-03 03:41:46 +0000945 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000946 ref_suffix += ',' + ','.join('r=%s' % email
947 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000948 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000949 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000950 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000951 ('remote:\n'
952 'remote: Processing changes: (\)\n'
953 'remote: Processing changes: (|)\n'
954 'remote: Processing changes: (/)\n'
955 'remote: Processing changes: (-)\n'
956 'remote: Processing changes: new: 1 (/)\n'
957 'remote: Processing changes: new: 1, done\n'
958 'remote:\n'
959 'remote: New Changes:\n'
960 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
961 'remote:\n'
962 'To https://chromium.googlesource.com/yyy/zzz\n'
963 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000964 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000965 if squash:
966 calls += [
tandrii33a46ff2016-08-23 05:53:40 -0700967 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -0700968 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000969 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -0700970 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000971 ((['git', 'config', 'branch.master.gerritsquashhash',
972 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000973 ]
tandrii88189772016-09-29 04:29:57 -0700974 calls += [
975 ((['git', 'config', 'rietveld.cc'],), ''),
976 ((['AddReviewers', 'chromium-review.googlesource.com',
977 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -0700978 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -0700979 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000980 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000981 return calls
982
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000983 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000984 self,
985 upload_args,
986 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000987 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -0700988 squash=True,
989 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000990 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000991 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000992 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000993 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -0700994 issue=None,
995 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000996 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -0700997 if squash_mode is None:
998 if '--no-squash' in upload_args:
999 squash_mode = 'nosquash'
1000 elif '--squash' in upload_args:
1001 squash_mode = 'squash'
1002 else:
1003 squash_mode = 'default'
1004
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001005 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001006 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001007 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001008 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001009 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001010 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1011 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001012 self.mock(git_cl.gclient_utils, 'RunEditor',
1013 lambda *_, **__: self._mocked_call(['RunEditor']))
1014 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001015 self.mock(git_cl.gerrit_util, 'AddReviewers',
1016 lambda h, i, add, is_reviewer: self._mocked_call(
1017 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001018
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001019 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001020 self.calls += self._gerrit_upload_calls(
1021 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001022 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001023 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001024 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001025 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001026 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001027 # Uncomment when debugging.
1028 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001029 git_cl.main(['upload'] + upload_args)
1030
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001031 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001032 self._run_gerrit_upload_test(
1033 ['--no-squash'],
1034 'desc\n\nBUG=\n',
1035 [],
1036 squash=False,
1037 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1038
1039 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001040 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001041 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001042 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001043 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001044 [],
tandriia60502f2016-06-20 02:01:53 -07001045 squash=False,
1046 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001047 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001048
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001049 def test_gerrit_no_reviewer(self):
1050 self._run_gerrit_upload_test(
1051 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001052 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001053 [],
1054 squash=False,
1055 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001056
tandriieefe8322016-08-17 10:12:24 -07001057 def test_gerrit_patch_bad_chars(self):
1058 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001059 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001060 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001061 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001062 squash=False,
1063 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001064 ref_suffix='%m=Dont_put_bad_chars')
1065 self.assertIn(
1066 'WARNING: Patchset title may only contain alphanumeric chars '
1067 'and spaces. Cleaned up title:\nDont put bad chars\n',
1068 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001069
ukai@chromium.orge8077812012-02-03 03:41:46 +00001070 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001071 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001072 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001073 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001074 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001075 squash=False,
1076 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001077 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001078
1079 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001080 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001081 [],
bradnelsond975b302016-10-23 12:20:23 -07001082 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1083 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001084 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001085 ['reviewer@example.com', 'another@example.com'],
1086 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001087 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001088 ref_suffix='%l=Code-Review+1',
1089 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001090
1091 def test_gerrit_upload_squash_first_is_default(self):
1092 # Mock Gerrit CL description to indicate the first upload.
1093 self.mock(git_cl.Changelist, 'GetDescription',
1094 lambda *_: None)
1095 self._run_gerrit_upload_test(
1096 [],
1097 'desc\nBUG=\n\nChange-Id: 123456789',
1098 [],
1099 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001100
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001101 def test_gerrit_upload_squash_first(self):
1102 # Mock Gerrit CL description to indicate the first upload.
1103 self.mock(git_cl.Changelist, 'GetDescription',
1104 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001105 self._run_gerrit_upload_test(
1106 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001107 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001108 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001109 squash=True,
1110 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001111
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001112 def test_gerrit_upload_squash_reupload(self):
1113 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1114 # Mock Gerrit CL description to indicate re-upload.
1115 self.mock(git_cl.Changelist, 'GetDescription',
1116 lambda *args: description)
1117 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1118 lambda *args: 1)
1119 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1120 lambda *args: {'change_id': '123456789'})
1121 self._run_gerrit_upload_test(
1122 ['--squash'],
1123 description,
1124 [],
1125 squash=True,
1126 expected_upstream_ref='origin/master',
1127 issue=123456)
1128
rmistry@google.com2dd99862015-06-22 12:22:18 +00001129 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001130 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001131 def mock_run_git(*args, **_kwargs):
1132 if args[0] == ['for-each-ref',
1133 '--format=%(refname:short) %(upstream:short)',
1134 'refs/heads']:
1135 # Create a local branch dependency tree that looks like this:
1136 # test1 -> test2 -> test3 -> test4 -> test5
1137 # -> test3.1
1138 # test6 -> test0
1139 branch_deps = [
1140 'test2 test1', # test1 -> test2
1141 'test3 test2', # test2 -> test3
1142 'test3.1 test2', # test2 -> test3.1
1143 'test4 test3', # test3 -> test4
1144 'test5 test4', # test4 -> test5
1145 'test6 test0', # test0 -> test6
1146 'test7', # test7
1147 ]
1148 return '\n'.join(branch_deps)
1149 self.mock(git_cl, 'RunGit', mock_run_git)
1150
1151 class RecordCalls:
1152 times_called = 0
1153 record_calls = RecordCalls()
1154 def mock_CMDupload(*args, **_kwargs):
1155 record_calls.times_called += 1
1156 return 0
1157 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1158
1159 self.calls = [
1160 (('[Press enter to continue or ctrl-C to quit]',), ''),
1161 ]
1162
1163 class MockChangelist():
1164 def __init__(self):
1165 pass
1166 def GetBranch(self):
1167 return 'test1'
1168 def GetIssue(self):
1169 return '123'
1170 def GetPatchset(self):
1171 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001172 def IsGerrit(self):
1173 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001174
1175 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1176 # CMDupload should have been called 5 times because of 5 dependent branches.
1177 self.assertEquals(5, record_calls.times_called)
1178 self.assertEquals(0, ret)
1179
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001180 def test_gerrit_change_id(self):
1181 self.calls = [
1182 ((['git', 'write-tree'], ),
1183 'hashtree'),
1184 ((['git', 'rev-parse', 'HEAD~0'], ),
1185 'branch-parent'),
1186 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1187 'A B <a@b.org> 1456848326 +0100'),
1188 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1189 'C D <c@d.org> 1456858326 +0100'),
1190 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1191 'hashchange'),
1192 ]
1193 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1194 self.assertEqual(change_id, 'Ihashchange')
1195
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001196 def test_desecription_append_footer(self):
1197 for init_desc, footer_line, expected_desc in [
1198 # Use unique desc first lines for easy test failure identification.
1199 ('foo', 'R=one', 'foo\n\nR=one'),
1200 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1201 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1202 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1203 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1204 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1205 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1206 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1207 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1208 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1209 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1210 ]:
1211 desc = git_cl.ChangeDescription(init_desc)
1212 desc.append_footer(footer_line)
1213 self.assertEqual(desc.description, expected_desc)
1214
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001215 def test_update_reviewers(self):
1216 data = [
1217 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001218 ('foo\nR=xx', [], 'foo\nR=xx'),
1219 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001220 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001221 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1222 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1223 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001224 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001225 ('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 +00001226 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001227 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1228 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1229 # Same as the line before, but full of whitespaces.
1230 (
1231 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1232 'foo\nBar\n\nR=c@c\n BUG =',
1233 ),
1234 # Whitespaces aren't interpreted as new lines.
1235 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001236 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001237 expected = [i[2] for i in data]
1238 actual = []
1239 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001240 obj = git_cl.ChangeDescription(orig)
1241 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001242 actual.append(obj.description)
1243 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001244
wittman@chromium.org455dc922015-01-26 20:15:50 +00001245 def test_get_target_ref(self):
1246 # Check remote or remote branch not present.
1247 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1248 self.assertEqual(None, git_cl.GetTargetRef(None,
1249 'refs/remotes/origin/master',
1250 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001251
wittman@chromium.org455dc922015-01-26 20:15:50 +00001252 # Check default target refs for branches.
1253 self.assertEqual('refs/heads/master',
1254 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1255 None, None))
1256 self.assertEqual('refs/heads/master',
1257 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1258 None, None))
1259 self.assertEqual('refs/heads/master',
1260 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1261 None, None))
1262 self.assertEqual('refs/branch-heads/123',
1263 git_cl.GetTargetRef('origin',
1264 'refs/remotes/branch-heads/123',
1265 None, None))
1266 self.assertEqual('refs/diff/test',
1267 git_cl.GetTargetRef('origin',
1268 'refs/remotes/origin/refs/diff/test',
1269 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001270 self.assertEqual('refs/heads/chrome/m42',
1271 git_cl.GetTargetRef('origin',
1272 'refs/remotes/origin/chrome/m42',
1273 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001274
1275 # Check target refs for user-specified target branch.
1276 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1277 'refs/remotes/branch-heads/123'):
1278 self.assertEqual('refs/branch-heads/123',
1279 git_cl.GetTargetRef('origin',
1280 'refs/remotes/origin/master',
1281 branch, None))
1282 for branch in ('origin/master', 'remotes/origin/master',
1283 'refs/remotes/origin/master'):
1284 self.assertEqual('refs/heads/master',
1285 git_cl.GetTargetRef('origin',
1286 'refs/remotes/branch-heads/123',
1287 branch, None))
1288 for branch in ('master', 'heads/master', 'refs/heads/master'):
1289 self.assertEqual('refs/heads/master',
1290 git_cl.GetTargetRef('origin',
1291 'refs/remotes/branch-heads/123',
1292 branch, None))
1293
1294 # Check target refs for pending prefix.
1295 self.assertEqual('prefix/heads/master',
1296 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1297 None, 'prefix/'))
1298
wychen@chromium.orga872e752015-04-28 23:42:18 +00001299 def test_patch_when_dirty(self):
1300 # Patch when local tree is dirty
1301 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1302 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1303
1304 def test_diff_when_dirty(self):
1305 # Do 'git cl diff' when local tree is dirty
1306 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1307 self.assertNotEqual(git_cl.main(['diff']), 0)
1308
tandriidf09a462016-08-18 16:23:55 -07001309 def _patch_common(self, is_gerrit=False, force_codereview=False,
1310 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001311 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001312 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1313 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001314 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1315 lambda *args: {
1316 'current_revision': '7777777777',
1317 'revisions': {
1318 '1111111111': {
1319 '_number': 1,
1320 'fetch': {'http': {
1321 'url': 'https://chromium.googlesource.com/my/repo',
1322 'ref': 'refs/changes/56/123456/1',
1323 }},
1324 },
1325 '7777777777': {
1326 '_number': 7,
1327 'fetch': {'http': {
1328 'url': 'https://chromium.googlesource.com/my/repo',
1329 'ref': 'refs/changes/56/123456/7',
1330 }},
1331 },
1332 },
1333 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001334 self.mock(git_cl.Changelist, 'GetDescription',
1335 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001336 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1337
tandriidf09a462016-08-18 16:23:55 -07001338 if new_branch:
1339 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1340 else:
1341 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001342 if not force_codereview:
1343 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001344 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001345 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001346 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1347 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001348 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001349 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001350
1351 if is_gerrit:
1352 if not force_codereview:
1353 self.calls += [
1354 ((['git', 'config', 'gerrit.host'],), 'true'),
1355 ]
1356 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001357 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001358 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001359 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001360 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001361 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001362 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001363
tandriidf09a462016-08-18 16:23:55 -07001364 def _common_patch_successful(self, new_branch=False):
1365 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001366 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001367 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001368 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001369 'patch from issue 123456 at patchset 60001 ' +
1370 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001371 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001372 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001373 ((['git', 'config', 'branch.master.rietveldserver',
1374 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001375 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001376 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001377 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001378
1379 def test_patch_successful(self):
1380 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001381 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1382
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001383 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001384 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001385 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1386
wychen@chromium.orga872e752015-04-28 23:42:18 +00001387 def test_patch_conflict(self):
1388 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001389 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001390 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001391
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001392 def test_gerrit_patch_successful(self):
1393 self._patch_common(is_gerrit=True)
1394 self.calls += [
1395 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1396 'refs/changes/56/123456/7'],), ''),
1397 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001398 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001399 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001400 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1401 ((['git', 'config', 'branch.master.merge'],), 'master'),
1402 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1403 ((['git', 'config', 'remote.origin.url'],),
1404 'https://chromium.googlesource.com/my/repo'),
1405 ((['git', 'config', 'branch.master.gerritserver',
1406 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001407 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001408 ]
1409 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1410
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001411 def test_patch_force_codereview(self):
1412 self._patch_common(is_gerrit=True, force_codereview=True)
1413 self.calls += [
1414 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1415 'refs/changes/56/123456/7'],), ''),
1416 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1417 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001418 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001419 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001420 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1421 ((['git', 'config', 'branch.master.merge'],), 'master'),
1422 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1423 ((['git', 'config', 'remote.origin.url'],),
1424 'https://chromium.googlesource.com/my/repo'),
1425 ((['git', 'config', 'branch.master.gerritserver',
1426 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001427 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001428 ]
1429 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1430
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001431 def test_gerrit_patch_url_successful(self):
1432 self._patch_common(is_gerrit=True)
1433 self.calls += [
1434 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1435 'refs/changes/56/123456/1'],), ''),
1436 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001437 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001438 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001439 ((['git', 'config', 'branch.master.gerritserver',
1440 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001441 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001442 ]
1443 self.assertEqual(git_cl.main(
1444 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1445
1446 def test_gerrit_patch_conflict(self):
1447 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001448 self.calls += [
1449 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1450 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001451 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1452 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1453 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001454 ]
1455 with self.assertRaises(SystemExitMock):
1456 git_cl.main(['patch',
1457 'https://chromium-review.googlesource.com/#/c/123456/1'])
1458
tandriic2405f52016-10-10 08:13:15 -07001459 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001460 def notExists(_issue, *_, **kwargs):
1461 self.assertFalse(kwargs['ignore_404'])
1462 raise git_cl.gerrit_util.GerritError(404, '')
1463 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1464
tandriic2405f52016-10-10 08:13:15 -07001465 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001466 self.calls = [
1467 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1468 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1469 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1470 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1471 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1472 ((['git', 'config', 'gerrit.host'],), 'true'),
1473 ((['DieWithError', 'issue 123456 at ' + url + ' does not exist '
1474 'or you have no access to it'],), SystemExitMock()),
1475 ]
1476 with self.assertRaises(SystemExitMock):
1477 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1478
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001479 def _checkout_calls(self):
1480 return [
1481 ((['git', 'config', '--local', '--get-regexp',
1482 'branch\\..*\\.rietveldissue'], ),
1483 ('branch.retrying.rietveldissue 1111111111\n'
1484 'branch.some-fix.rietveldissue 2222222222\n')),
1485 ((['git', 'config', '--local', '--get-regexp',
1486 'branch\\..*\\.gerritissue'], ),
1487 ('branch.ger-branch.gerritissue 123456\n'
1488 'branch.gbranch654.gerritissue 654321\n')),
1489 ]
1490
1491 def test_checkout_gerrit(self):
1492 """Tests git cl checkout <issue>."""
1493 self.calls = self._checkout_calls()
1494 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1495 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1496
1497 def test_checkout_rietveld(self):
1498 """Tests git cl checkout <issue>."""
1499 self.calls = self._checkout_calls()
1500 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1501 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1502
1503 def test_checkout_not_found(self):
1504 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001505 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001506 self.calls = self._checkout_calls()
1507 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1508
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001509 def test_checkout_no_branch_issues(self):
1510 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001511 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001512 self.calls = [
1513 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001514 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001515 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001516 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001517 ]
1518 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1519
tandrii@chromium.org28253532016-04-14 13:46:56 +00001520 def _test_gerrit_ensure_authenticated_common(self, auth,
1521 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001522 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1523 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1524 self.mock(git_cl, 'DieWithError',
1525 lambda msg: self._mocked_call(['DieWithError', msg]))
1526 self.mock(git_cl, 'ask_for_data',
1527 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001528 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001529 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001530 cl.branch = 'master'
1531 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001532 cl.lookedup_issue = True
1533 return cl
1534
1535 def test_gerrit_ensure_authenticated_missing(self):
1536 cl = self._test_gerrit_ensure_authenticated_common(auth={
1537 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1538 })
1539 self.calls.append(
1540 ((['DieWithError',
1541 'Credentials for the following hosts are required:\n'
1542 ' chromium-review.googlesource.com\n'
1543 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1544 'You can (re)generate your credentails by visiting '
1545 'https://chromium-review.googlesource.com/new-password'],), ''),)
1546 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1547
1548 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001549 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001550 cl = self._test_gerrit_ensure_authenticated_common(auth={
1551 'chromium.googlesource.com': 'one',
1552 'chromium-review.googlesource.com': 'other',
1553 })
1554 self.calls.append(
1555 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001556 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001557 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1558
1559 def test_gerrit_ensure_authenticated_ok(self):
1560 cl = self._test_gerrit_ensure_authenticated_common(auth={
1561 'chromium.googlesource.com': 'same',
1562 'chromium-review.googlesource.com': 'same',
1563 })
1564 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1565
tandrii@chromium.org28253532016-04-14 13:46:56 +00001566 def test_gerrit_ensure_authenticated_skipped(self):
1567 cl = self._test_gerrit_ensure_authenticated_common(
1568 auth={}, skip_auth_check=True)
1569 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1570
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001571 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001572 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1573 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001574 self.calls = [
1575 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001576 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001577 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1578 ((['git', 'config', 'rietveld.server'],), ''),
1579 ((['git', 'config', 'rietveld.server'],), ''),
1580 ((['git', 'config', 'branch.feature.rietveldserver'],),
1581 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001582 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001583 ]
1584 self.assertEqual(0, git_cl.main(['set-commit']))
1585
tandriid9e5ce52016-07-13 02:32:59 -07001586 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001587 self.mock(git_cl.gerrit_util, 'SetReview',
1588 lambda h, i, labels: self._mocked_call(
1589 ['SetReview', h, i, labels]))
1590 self.calls = [
1591 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001592 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1593 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001594 ((['git', 'config', 'branch.feature.gerritserver'],),
1595 'https://chromium-review.googlesource.com'),
1596 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001597 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001598 ]
tandriid9e5ce52016-07-13 02:32:59 -07001599
1600 def test_cmd_set_commit_gerrit_clear(self):
1601 self._cmd_set_commit_gerrit_common(0)
1602 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1603
1604 def test_cmd_set_commit_gerrit_dry(self):
1605 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001606 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1607
tandriid9e5ce52016-07-13 02:32:59 -07001608 def test_cmd_set_commit_gerrit(self):
1609 self._cmd_set_commit_gerrit_common(2)
1610 self.assertEqual(0, git_cl.main(['set-commit']))
1611
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001612 def test_description_display(self):
1613 out = StringIO.StringIO()
1614 self.mock(git_cl.sys, 'stdout', out)
1615
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001616 self.mock(git_cl, 'Changelist', ChangelistMock)
1617 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001618
1619 self.assertEqual(0, git_cl.main(['description', '-d']))
1620 self.assertEqual('foo\n', out.getvalue())
1621
1622 def test_description_rietveld(self):
1623 out = StringIO.StringIO()
1624 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001625 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001626
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001627 self.assertEqual(0, git_cl.main([
1628 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1629 self.assertEqual('foobar\n', out.getvalue())
1630
iannucci3c972b92016-08-17 13:24:10 -07001631 def test_StatusFieldOverrideIssueMissingArgs(self):
1632 out = StringIO.StringIO()
1633 self.mock(git_cl.sys, 'stderr', out)
1634
1635 try:
1636 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1637 except SystemExit as ex:
1638 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001639 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001640
1641 out = StringIO.StringIO()
1642 self.mock(git_cl.sys, 'stderr', out)
1643
1644 try:
1645 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1646 except SystemExit as ex:
1647 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001648 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001649
1650 def test_StatusFieldOverrideIssue(self):
1651 out = StringIO.StringIO()
1652 self.mock(git_cl.sys, 'stdout', out)
1653
1654 def assertIssue(cl_self, *_args):
1655 self.assertEquals(cl_self.issue, 1)
1656 return 'foobar'
1657
1658 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1659 self.calls = [
1660 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1661 ((['git', 'config', 'rietveld.server'],), ''),
1662 ((['git', 'config', 'rietveld.server'],), ''),
1663 ]
iannuccie53c9352016-08-17 14:40:40 -07001664 self.assertEqual(
1665 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1666 0)
iannucci3c972b92016-08-17 13:24:10 -07001667 self.assertEqual(out.getvalue(), 'foobar\n')
1668
iannuccie53c9352016-08-17 14:40:40 -07001669 def test_SetCloseOverrideIssue(self):
1670 def assertIssue(cl_self, *_args):
1671 self.assertEquals(cl_self.issue, 1)
1672 return 'foobar'
1673
1674 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1675 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1676 self.calls = [
1677 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1678 ((['git', 'config', 'rietveld.server'],), ''),
1679 ((['git', 'config', 'rietveld.server'],), ''),
1680 ]
1681 self.assertEqual(
1682 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1683
1684 def test_SetCommitOverrideIssue(self):
1685 def assertIssue(cl_self, *_args):
1686 self.assertEquals(cl_self.issue, 1)
1687 return 'foobar'
1688
1689 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1690 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1691 self.calls = [
1692 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1693 ((['git', 'config', 'rietveld.server'],), ''),
1694 ((['git', 'config', 'rietveld.server'],), ''),
1695 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1696 ((['git', 'config', 'rietveld.server'],), ''),
1697 ((['git', 'config', 'rietveld.server'],), ''),
1698 ]
1699 self.assertEqual(
1700 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1701
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001702 def test_description_gerrit(self):
1703 out = StringIO.StringIO()
1704 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001705 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001706
1707 self.assertEqual(0, git_cl.main([
1708 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1709 self.assertEqual('foobar\n', out.getvalue())
1710
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001711 def test_description_set_raw(self):
1712 out = StringIO.StringIO()
1713 self.mock(git_cl.sys, 'stdout', out)
1714
1715 self.mock(git_cl, 'Changelist', ChangelistMock)
1716 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1717
1718 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1719 self.assertEqual('hihi', ChangelistMock.desc)
1720
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001721 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001722 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001723
1724 def RunEditor(desc, _, **kwargs):
1725 self.assertEquals(
1726 '# Enter a description of the change.\n'
1727 '# This will be displayed on the codereview site.\n'
1728 '# The first line will also be used as the subject of the review.\n'
1729 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001730 '--------------------\n'
1731 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001732 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001733 # Simulate user changing something.
1734 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001735
dsansomee2d6fd92016-09-08 00:10:47 -07001736 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001737 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001738
1739 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1740 self.mock(git_cl.Changelist, 'GetDescription',
1741 lambda *args: current_desc)
1742 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1743 UpdateDescriptionRemote)
1744 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1745
1746 self.calls = [
1747 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001748 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001749 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1750 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001751 ((['git', 'config', 'core.editor'],), 'vi'),
1752 ]
1753 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1754
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001755 def test_description_set_stdin(self):
1756 out = StringIO.StringIO()
1757 self.mock(git_cl.sys, 'stdout', out)
1758
1759 self.mock(git_cl, 'Changelist', ChangelistMock)
1760 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1761
1762 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1763 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1764
kmarshall3bff56b2016-06-06 18:31:47 -07001765 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001766 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1767
kmarshall3bff56b2016-06-06 18:31:47 -07001768 self.calls = \
1769 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1770 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07001771 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001772 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1773 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07001774 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1775 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1776 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001777 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1778 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1779 ((['git', 'branch', '-D', 'foo'],), '')]
1780
kmarshall3bff56b2016-06-06 18:31:47 -07001781 self.mock(git_cl, 'get_cl_statuses',
1782 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001783 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1784 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1785 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001786
1787 self.assertEqual(0, git_cl.main(['archive', '-f']))
1788
1789 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001790 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001791 self.calls = \
1792 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1793 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07001794 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001795 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1796 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001797 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1798
kmarshall9249e012016-08-23 12:02:16 -07001799 self.mock(git_cl, 'get_cl_statuses',
1800 lambda branches, fine_grained, max_processes:
1801 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
1802
1803 self.assertEqual(1, git_cl.main(['archive', '-f']))
1804
1805 def test_archive_dry_run(self):
1806 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1807
1808 self.calls = \
1809 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1810 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1811 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1812 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1813 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1814 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1815 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1816 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1817 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07001818
1819 self.mock(git_cl, 'get_cl_statuses',
1820 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001821 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1822 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1823 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001824
kmarshall9249e012016-08-23 12:02:16 -07001825 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
1826
1827 def test_archive_no_tags(self):
1828 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1829
1830 self.calls = \
1831 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1832 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1833 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1834 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1835 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1836 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1837 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1838 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1839 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1840 ((['git', 'branch', '-D', 'foo'],), '')]
1841
1842 self.mock(git_cl, 'get_cl_statuses',
1843 lambda branches, fine_grained, max_processes:
1844 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1845 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1846 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
1847
1848 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07001849
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001850 def test_cmd_issue_erase_existing(self):
1851 out = StringIO.StringIO()
1852 self.mock(git_cl.sys, 'stdout', out)
1853 self.calls = [
1854 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001855 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1856 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001857 # Let this command raise exception (retcode=1) - it should be ignored.
1858 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07001859 CERR1),
1860 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1861 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001862 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1863 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1864 ''),
1865 ]
1866 self.assertEqual(0, git_cl.main(['issue', '0']))
1867
phajdan.jre328cf92016-08-22 04:12:17 -07001868 def test_cmd_issue_json(self):
1869 out = StringIO.StringIO()
1870 self.mock(git_cl.sys, 'stdout', out)
1871 self.calls = [
1872 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001873 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07001874 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1875 ((['git', 'config', 'rietveld.server'],),
1876 'https://codereview.chromium.org'),
1877 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1878 (('write_json', 'output.json',
1879 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
1880 ''),
1881 ]
1882 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
1883
tandriide281ae2016-10-12 06:02:30 -07001884 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07001885 self.mock(git_cl.Changelist, 'GetChange',
1886 lambda _, *a: (
1887 self._mocked_call(['GetChange']+list(a))))
1888 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1889 lambda *_, **__: (
1890 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07001891 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
1892 lambda _, s: self._mocked_call(['SetCQState', s]))
1893 self.calls = [
1894 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001895 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07001896 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1897 ((['git', 'config', 'rietveld.server'],),
1898 'https://codereview.chromium.org'),
1899 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1900 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1901 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1902 ((['get_or_create_merge_base', 'feature', 'feature'],),
1903 'fake_ancestor_sha'),
1904 ((['GetChange', 'fake_ancestor_sha', None], ),
1905 git_cl.presubmit_support.GitChange(
1906 '', '', '', '', '', '', '', '')),
1907 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1908 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07001909 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1910 ]
1911 out = StringIO.StringIO()
1912 self.mock(git_cl.sys, 'stdout', out)
1913 self.assertEqual(0, git_cl.main(['try']))
1914 self.assertEqual(
1915 out.getvalue(),
1916 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
1917
tandrii8c5a3532016-11-04 07:52:02 -07001918 def test_git_cl_try_default_cq_dry_run_gerrit(self):
1919 self.mock(git_cl.Changelist, 'GetChange',
1920 lambda _, *a: (
1921 self._mocked_call(['GetChange']+list(a))))
1922 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1923 lambda *_, **__: (
1924 self._mocked_call(['DoGetTryMasters'])))
1925 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
1926 lambda _, s: self._mocked_call(['SetCQState', s]))
1927
1928 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
1929 # Get realistic expectations.
1930 gerrit_change_list_impl._GetGerritHost()
1931 return self._mocked_call(['_GetChangeDetail', opts or []])
1932 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1933 _GetChangeDetail)
1934
1935 self.calls = [
1936 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1937 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1938 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
1939 ((['git', 'config', 'branch.feature.gerritserver'],),
1940 'https://chromium-review.googlesource.com'),
1941 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
1942 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1943 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1944 ((['get_or_create_merge_base', 'feature', 'feature'],),
1945 'fake_ancestor_sha'),
1946 ((['GetChange', 'fake_ancestor_sha', None], ),
1947 git_cl.presubmit_support.GitChange(
1948 '', '', '', '', '', '', '', '')),
1949 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1950 ((['DoGetTryMasters'], ), None),
1951 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1952 ]
1953 out = StringIO.StringIO()
1954 self.mock(git_cl.sys, 'stdout', out)
1955 self.assertEqual(0, git_cl.main(['try']))
1956 self.assertEqual(
1957 out.getvalue(),
1958 'scheduled CQ Dry Run on '
1959 'https://chromium-review.googlesource.com/123456\n')
1960
1961 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
1962 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
1963 lambda _: {
1964 'owner_email': 'owner@e.mail',
1965 'private': False,
1966 'closed': False,
1967 'project': 'depot_tools',
1968 'patchsets': [20001],
1969 })
tandriide281ae2016-10-12 06:02:30 -07001970 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
1971 self.calls = [
1972 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1973 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1974 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1975 ((['git', 'config', 'rietveld.server'],),
1976 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07001977 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07001978 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07001979 ]
1980
1981 def _buildbucket_retry(*_, **kw):
1982 # self.maxDiff = 10000
1983 body = json.loads(kw['body'])
1984 self.assertEqual(len(body['builds']), 1)
1985 build = body['builds'][0]
1986 params = json.loads(build.pop('parameters_json'))
1987 self.assertEqual(params, {
1988 u'builder_name': u'win',
1989 u'changes': [{u'author': {u'email': u'owner@e.mail'},
1990 u'revision': None}],
1991 u'properties': {
1992 u'category': u'git_cl_try',
1993 u'issue': 123,
1994 u'key': u'val',
1995 u'json': [{u'a': 1}, None],
1996 u'master': u'tryserver.chromium',
1997 u'patch_project': u'depot_tools',
1998 u'patch_storage': u'rietveld',
1999 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002000 u'rietveld': u'https://codereview.chromium.org',
2001 }
2002 })
2003 self.assertEqual(build, {
2004 u'bucket': u'master.tryserver.chromium',
2005 u'client_operation_id': u'uuid4',
2006 u'tags': [u'builder:win',
2007 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002008 u'user_agent:git_cl_try',
2009 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002010 })
2011
2012 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2013
2014 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2015 self.assertEqual(0, git_cl.main([
2016 'try', '-m', 'tryserver.chromium', '-b', 'win',
2017 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2018 self.assertRegexpMatches(
2019 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002020 'Tried jobs on:\nBucket: master.tryserver.chromium')
2021
tandrii8c5a3532016-11-04 07:52:02 -07002022 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2023 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2024 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2025
2026 def _GetChangeDetail(gerrit_change_list_impl, opts=None):
2027 # Get realistic expectations.
2028 gerrit_change_list_impl._GetGerritHost()
2029 return self._mocked_call(['_GetChangeDetail', opts or []])
2030 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
2031 _GetChangeDetail)
2032
2033 self.calls = [
2034 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2035 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2036 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2037 ((['git', 'config', 'branch.feature.gerritserver'],),
2038 'https://chromium-review.googlesource.com'),
2039 ((['_GetChangeDetail', []],), {'status': 'OPEN'}),
tandrii8c5a3532016-11-04 07:52:02 -07002040 ((['_GetChangeDetail', ['DETAILED_ACCOUNTS']],),
2041 {'owner': {'email': 'owner@e.mail'}}),
2042 ((['_GetChangeDetail', ['ALL_REVISIONS']],), {
2043 'project': 'depot_tools',
2044 'revisions': {
2045 'deadbeaf': {
2046 '_number': 6,
2047 },
2048 'beeeeeef': {
2049 '_number': 7,
2050 'fetch': {'http': {
2051 'url': 'https://chromium.googlesource.com/depot_tools',
2052 'ref': 'refs/changes/56/123456/7'
2053 }},
2054 },
2055 },
2056 }),
2057 ]
2058
2059 def _buildbucket_retry(*_, **kw):
2060 # self.maxDiff = 10000
2061 body = json.loads(kw['body'])
2062 self.assertEqual(len(body['builds']), 1)
2063 build = body['builds'][0]
2064 params = json.loads(build.pop('parameters_json'))
2065 self.assertEqual(params, {
2066 u'builder_name': u'win',
2067 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2068 u'revision': None}],
2069 u'properties': {
2070 u'category': u'git_cl_try',
2071 u'key': u'val',
2072 u'json': [{u'a': 1}, None],
2073 u'master': u'tryserver.chromium',
2074
2075 u'patch_gerrit_url':
2076 u'https://chromium-review.googlesource.com',
2077 u'patch_issue': 123456,
2078 u'patch_project': u'depot_tools',
2079 u'patch_ref': u'refs/changes/56/123456/7',
2080 u'patch_repository_url':
2081 u'https://chromium.googlesource.com/depot_tools',
2082 u'patch_set': 7,
2083 u'patch_storage': u'gerrit',
2084 }
2085 })
2086 self.assertEqual(build, {
2087 u'bucket': u'master.tryserver.chromium',
2088 u'client_operation_id': u'uuid4',
2089 u'tags': [
2090 u'builder:win',
2091 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2092 u'user_agent:git_cl_try',
2093 u'master:tryserver.chromium'],
2094 })
2095
2096 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2097
2098 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2099 self.assertEqual(0, git_cl.main([
2100 'try', '-m', 'tryserver.chromium', '-b', 'win',
2101 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2102 self.assertRegexpMatches(
2103 git_cl.sys.stdout.getvalue(),
2104 'Tried jobs on:\nBucket: master.tryserver.chromium')
2105
borenet6c0efe62016-10-19 08:13:29 -07002106 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002107 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2108 lambda _: {
2109 'owner_email': 'owner@e.mail',
2110 'private': False,
2111 'closed': False,
2112 'project': 'depot_tools',
2113 'patchsets': [20001],
2114 })
borenet6c0efe62016-10-19 08:13:29 -07002115 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2116 self.calls = [
2117 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2118 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2119 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2120 ((['git', 'config', 'rietveld.server'],),
2121 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002122 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002123 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002124 ]
2125
2126 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002127 body = json.loads(kw['body'])
2128 self.assertEqual(len(body['builds']), 1)
2129 build = body['builds'][0]
2130 params = json.loads(build.pop('parameters_json'))
2131 self.assertEqual(params, {
2132 u'builder_name': u'win',
2133 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2134 u'revision': None}],
2135 u'properties': {
2136 u'category': u'git_cl_try',
2137 u'issue': 123,
2138 u'patch_project': u'depot_tools',
2139 u'patch_storage': u'rietveld',
2140 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002141 u'rietveld': u'https://codereview.chromium.org',
2142 }
2143 })
2144 self.assertEqual(build, {
2145 u'bucket': u'test.bucket',
2146 u'client_operation_id': u'uuid4',
2147 u'tags': [u'builder:win',
2148 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2149 u'user_agent:git_cl_try'],
2150 })
2151
2152 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2153
2154 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2155 self.assertEqual(0, git_cl.main([
2156 'try', '-B', 'test.bucket', '-b', 'win']))
2157 self.assertRegexpMatches(
2158 git_cl.sys.stdout.getvalue(),
2159 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002160
qyearsley123a4682016-10-26 09:12:17 -07002161 def test_git_cl_try_bots_on_multiple_masters(self):
2162 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2163 self.calls = [
2164 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2165 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2166 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2167 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002168 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002169 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2170 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2171 ]
2172
2173 def _buildbucket_retry(*_, **kw):
2174 body = json.loads(kw['body'])
2175 self.assertEqual(len(body['builds']), 2)
2176
2177 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2178 self.assertEqual(first_build_params['builder_name'], 'builder1')
2179 self.assertEqual(first_build_params['properties']['master'], 'master1')
2180
2181 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2182 self.assertEqual(first_build_params['builder_name'], 'builder2')
2183 self.assertEqual(first_build_params['properties']['master'], 'master2')
2184
2185 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2186
2187 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2188 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2189
2190 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2191 self.assertEqual(
2192 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2193 self.assertEqual(
2194 git_cl.sys.stdout.getvalue(),
2195 'Tried jobs on:\n'
2196 'Bucket: master.master1\n'
2197 ' builder1: []\n'
2198 'Bucket: master.master2\n'
2199 ' builder2: []\n'
2200 'To see results here, run: git cl try-results\n'
2201 'To see results in browser, run: git cl web\n')
2202
tandrii16e0b4e2016-06-07 10:34:28 -07002203 def _common_GerritCommitMsgHookCheck(self):
2204 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2205 self.mock(git_cl.os.path, 'abspath',
2206 lambda path: self._mocked_call(['abspath', path]))
2207 self.mock(git_cl.os.path, 'exists',
2208 lambda path: self._mocked_call(['exists', path]))
2209 self.mock(git_cl.gclient_utils, 'FileRead',
2210 lambda path: self._mocked_call(['FileRead', path]))
2211 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2212 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2213 self.calls = [
2214 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2215 ((['abspath', '../'],), '/abs/git_repo_root'),
2216 ]
2217 return git_cl.Changelist(codereview='gerrit', issue=123)
2218
2219 def test_GerritCommitMsgHookCheck_custom_hook(self):
2220 cl = self._common_GerritCommitMsgHookCheck()
2221 self.calls += [
2222 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2223 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2224 '#!/bin/sh\necho "custom hook"')
2225 ]
2226 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2227
2228 def test_GerritCommitMsgHookCheck_not_exists(self):
2229 cl = self._common_GerritCommitMsgHookCheck()
2230 self.calls += [
2231 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2232 ]
2233 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2234
2235 def test_GerritCommitMsgHookCheck(self):
2236 cl = self._common_GerritCommitMsgHookCheck()
2237 self.calls += [
2238 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2239 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2240 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2241 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2242 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2243 ''),
2244 ]
2245 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2246
tandriic4344b52016-08-29 06:04:54 -07002247 def test_GerritCmdLand(self):
2248 self.calls += [
2249 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2250 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2251 'deadbeaf'),
2252 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2253 ((['git', 'config', 'branch.feature.gerritserver'],),
2254 'chromium-review.googlesource.com'),
2255 ]
2256 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2257 cl._codereview_impl._GetChangeDetail = lambda _: {
2258 'labels': {},
2259 'current_revision': 'deadbeaf',
2260 }
agable32978d92016-11-01 12:55:02 -07002261 cl._codereview_impl._GetChangeCommit = lambda: {
2262 'commit': 'deadbeef',
2263 'web_links': [{'name': 'gerrit',
2264 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2265 }
tandriic4344b52016-08-29 06:04:54 -07002266 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002267 out = StringIO.StringIO()
2268 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002269 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002270 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002271 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002272
tandrii221ab252016-10-06 08:12:04 -07002273 BUILDBUCKET_BUILDS_MAP = {
2274 '9000': {
2275 'id': '9000',
2276 'status': 'STARTED',
2277 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2278 'result_details_json': '{"properties": {}}',
2279 'bucket': 'master.x.y',
2280 'created_by': 'user:someone@chromium.org',
2281 'created_ts': '147200002222000',
2282 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2283 },
2284 '8000': {
2285 'id': '8000',
2286 'status': 'COMPLETED',
2287 'result': 'FAILURE',
2288 'failure_reason': 'BUILD_FAILURE',
2289 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2290 'result_details_json': '{"properties": {}}',
2291 'bucket': 'master.x.y',
2292 'created_by': 'user:someone@chromium.org',
2293 'created_ts': '147200001111000',
2294 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2295 },
2296 }
2297
2298 def test_write_try_results_json(self):
2299 expected_output = [
2300 {
2301 'buildbucket_id': '8000',
2302 'bucket': 'master.x.y',
2303 'builder_name': 'my-builder',
2304 'status': 'COMPLETED',
2305 'result': 'FAILURE',
2306 'failure_reason': 'BUILD_FAILURE',
2307 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2308 },
2309 {
2310 'buildbucket_id': '9000',
2311 'bucket': 'master.x.y',
2312 'builder_name': 'my-builder',
2313 'status': 'STARTED',
2314 'result': None,
2315 'failure_reason': None,
2316 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2317 }
2318 ]
2319 self.calls = [(('write_json', 'output.json', expected_output), '')]
2320 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2321
tandrii45b2a582016-10-11 03:14:16 -07002322 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002323 out = StringIO.StringIO()
2324 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002325 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2326 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002327 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2328 self._mocked_call(['get_authenticator_for_host', host]))
2329 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2330 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002331
2332 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2333 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002334 self.calls += [
2335 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2336 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2337 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2338 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2339 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2340 ((['git', 'config', 'branch.feature.rietveldserver'],),
2341 'codereview.example.com'),
2342 ((['get_authenticator_for_host', 'codereview.example.com'],),
2343 AuthenticatorMock()),
2344 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2345
2346 def test_fetch_try_jobs_none_rietveld(self):
2347 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002348 # Simulate that user isn't logged in.
2349 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002350 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002351 self.assertRegexpMatches(sys.stdout.getvalue(),
2352 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002353 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2354
2355 def test_fetch_try_jobs_some_rietveld(self):
2356 self._setup_fetch_try_jobs_rietveld({
2357 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2358 })
2359 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002360 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2361 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2362 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2363
2364 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2365 self._setup_fetch_try_jobs(most_recent_patchset=13)
2366 self.calls += [
2367 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2368 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2369 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002370 # TODO(tandrii): Uncomment the below if we decide to support checking
2371 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002372 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002373 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002374 ((['git', 'config', 'branch.feature.gerritserver'],),
2375 'https://x-review.googlesource.com'),
2376 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2377 AuthenticatorMock()),
2378 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2379
2380 def test_fetch_try_jobs_none_gerrit(self):
2381 self._setup_fetch_try_jobs_gerrit({})
2382 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002383 # TODO(tandrii): Uncomment the below if we decide to support checking
2384 # patchsets for Gerrit.
2385 # self.assertRegexpMatches(
2386 # sys.stdout.getvalue(),
2387 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002388 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2389
2390 def test_fetch_try_jobs_some_gerrit(self):
2391 self._setup_fetch_try_jobs_gerrit({
2392 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2393 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002394 # TODO(tandrii): Uncomment the below if we decide to support checking
2395 # patchsets for Gerrit.
2396 # self.calls.remove(
2397 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002398 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2399
2400 # ... and doesn't result in warning.
2401 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2402 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002403 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2404 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2405
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002406
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002407if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002408 git_cl.logging.basicConfig(
2409 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002410 unittest.main()