blob: 0d8b285d3917053ba682e3ce437dbc6c4abc3d00 [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',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000406 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000407 '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',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000591 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000592 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000593 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000594 (' PRESUBMIT.py | 2 +-\n'
595 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000596 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700597 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000598 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
599 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700600 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000601 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000602 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
603 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
604 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000605 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000606 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000607 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000608 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000609 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000610 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000611 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000612 ((['git', 'checkout', '-q', 'working'],), ''),
613 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000614 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000615
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000616 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700617 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000618 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000619 return [
620 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000621 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000622 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000623 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700624 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000625 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000626 '--git_similarity', similarity or '50'
627 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000628 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000629 ]
630
631 def _run_reviewer_test(
632 self,
633 upload_args,
634 expected_description,
635 returned_description,
636 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000637 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700638 private=False,
639 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000640 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000641 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000642 try:
643 similarity = upload_args[upload_args.index('--similarity')+1]
644 except ValueError:
645 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000646
647 if '--find-copies' in upload_args:
648 find_copies = True
649 elif '--no-find-copies' in upload_args:
650 find_copies = False
651 else:
652 find_copies = None
653
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000654 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700655 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000656
657 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000658
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000659 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000660 self.assertEquals(
661 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000662 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000663 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000664 '#--------------------This line is 72 characters long'
665 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000666 expected_description,
667 desc)
668 return returned_description
669 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000670
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000671 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000672 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700673 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000674 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000675 return 1, 2
676 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000677
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000678 git_cl.main(['upload'] + upload_args)
679
680 def test_no_reviewer(self):
681 self._run_reviewer_test(
682 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000683 'desc\n\nBUG=',
684 '# Blah blah comment.\ndesc\n\nBUG=',
685 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000686 [])
687
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000688 def test_keep_similarity(self):
689 self._run_reviewer_test(
690 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000691 'desc\n\nBUG=',
692 '# Blah blah comment.\ndesc\n\nBUG=',
693 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000694 [])
695
iannucci@chromium.org79540052012-10-19 23:15:26 +0000696 def test_keep_find_copies(self):
697 self._run_reviewer_test(
698 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000699 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000700 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000701 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000702 [])
703
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000704 def test_private(self):
705 self._run_reviewer_test(
706 ['--private'],
707 'desc\n\nBUG=',
708 '# Blah blah comment.\ndesc\n\nBUG=\n',
709 'desc\n\nBUG=',
710 [])
711
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000712 def test_reviewers_cmd_line(self):
713 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000714 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000715 self._run_reviewer_test(
716 ['-r' 'foo@example.com'],
717 description,
718 '\n%s\n' % description,
719 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000720 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000721
722 def test_reviewer_tbr_overriden(self):
723 # Reviewer is overriden with TBR
724 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000725 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000726 self._run_reviewer_test(
727 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000728 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000729 description.strip('\n'),
730 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000731 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000732
733 def test_reviewer_multiple(self):
734 # Handles multiple R= or TBR= lines.
735 description = (
bradnelsond975b302016-10-23 12:20:23 -0700736 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
737 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000738 self._run_reviewer_test(
739 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000740 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000741 description,
742 description,
bradnelsond975b302016-10-23 12:20:23 -0700743 ['--reviewers=another@example.com,reviewer@example.com'],
744 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000745
maruel@chromium.orga3353652011-11-30 14:26:57 +0000746 def test_reviewer_send_mail(self):
747 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000748 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000749 self._run_reviewer_test(
750 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000751 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000752 description.strip('\n'),
753 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000754 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000755
756 def test_reviewer_send_mail_no_rev(self):
757 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000758 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700759 self.calls = self._upload_no_rev_calls(None, None) + [
760 ((['DieWithError', 'Must specify reviewers to send email.'],),
761 SystemExitMock())
762 ]
763
764 def RunEditor(desc, _, **kwargs):
765 return desc
766 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
767 self.mock(sys, 'stdout', stdout)
768 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000769 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700770 self.assertEqual(
771 'Using 50% similarity for rename/copy detection. Override with '
772 '--similarity.\n',
773 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000774
tandriif9aefb72016-07-01 09:06:51 -0700775 def test_bug_on_cmd(self):
776 self._run_reviewer_test(
777 ['--bug=500658,proj:123'],
778 'desc\n\nBUG=500658\nBUG=proj:123',
779 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
780 'desc\n\nBUG=500658\nBUG=proj:1234',
781 [])
782
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000783 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000784 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000785 self.calls = (
786 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000787 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000788 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000789 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000790 git_cl.main(['dcommit'])
791
792 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000793 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000794 self.calls = (
795 self._dcommit_calls_1() +
796 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000797 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000798 git_cl.main(['dcommit', '--bypass-hooks'])
799
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000800
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000801 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000802 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000803 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000804 if skip_auth_check:
805 return [((cmd, ), 'true')]
806
tandrii5d48c322016-08-18 16:19:37 -0700807 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000808 if issue:
809 calls.extend([
810 ((['git', 'config', 'branch.master.gerritserver'],), ''),
811 ])
812 calls.extend([
813 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
814 ((['git', 'config', 'branch.master.remote'],), 'origin'),
815 ((['git', 'config', 'remote.origin.url'],),
816 'https://chromium.googlesource.com/my/repo'),
817 ((['git', 'config', 'remote.origin.url'],),
818 'https://chromium.googlesource.com/my/repo'),
819 ])
820 return calls
821
822 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000823 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000824 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000825 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700826 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -0700827 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000828 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700829 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
830 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000831 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000832 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700833 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
834 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -0700835 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000836 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000837 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000838 ((['get_or_create_merge_base', 'master',
839 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000840 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000841 # Calls to verify branch point is ancestor
842 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
843 cls._git_sanity_checks('fake_ancestor_sha', 'master',
844 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git', 'rev-parse', '--show-cdup'],), ''),
846 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000847
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000848 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000849 'diff', '--name-status', '--no-renames', '-r',
850 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000851 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700852 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000853 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000854 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000855 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000856 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000857 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000858 ((['git', 'config', 'user.email'],), 'me@example.com'),
859 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000860 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000861 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000862 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000863 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000864
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000865 @classmethod
866 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700867 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000868 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000869 ref_suffix='', notify=False,
bradnelsond975b302016-10-23 12:20:23 -0700870 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000871 if post_amend_description is None:
872 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -0700873 calls = []
bradnelsond975b302016-10-23 12:20:23 -0700874 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000875
tandriia60502f2016-06-20 02:01:53 -0700876 if squash_mode == 'default':
877 calls.extend([
878 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
879 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
880 ])
881 elif squash_mode in ('override_squash', 'override_nosquash'):
882 calls.extend([
883 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
884 'true' if squash_mode == 'override_squash' else 'false'),
885 ])
886 else:
887 assert squash_mode in ('squash', 'nosquash')
888
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000889 # If issue is given, then description is fetched from Gerrit instead.
890 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000891 calls += [
892 ((['git', 'log', '--pretty=format:%s\n\n%b',
893 'fake_ancestor_sha..HEAD'],),
894 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000895 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000896 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000897 # DownloadGerritHook(False)
898 ((False, ),
899 ''),
900 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000901 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000902 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000903 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000904 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000905 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000906 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000907 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000908 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000909 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000910 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000911 if not issue:
912 # Prompting to edit description on first upload.
913 calls += [
914 ((['git', 'config', 'core.editor'],), ''),
915 ((['RunEditor'],), description),
916 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000917 ref_to_push = 'abcdef0123456789'
918 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000919 ((['git', 'config', 'branch.master.merge'],),
920 'refs/heads/master'),
921 ((['git', 'config', 'branch.master.remote'],),
922 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000923 ((['get_or_create_merge_base', 'master',
924 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000925 'origin/master'),
926 ((['git', 'rev-parse', 'HEAD:'],),
927 '0123456789abcdef'),
928 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000929 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000930 ref_to_push),
931 ]
932 else:
933 ref_to_push = 'HEAD'
934
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000935 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000936 ((['git', 'rev-list',
937 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000938 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000939
940 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
941 if ref_suffix:
942 ref_suffix += ',' + notify_suffix
943 else:
944 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000945
ukai@chromium.orge8077812012-02-03 03:41:46 +0000946 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000947 ref_suffix += ',' + ','.join('r=%s' % email
948 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000949 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000950 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000951 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000952 ('remote:\n'
953 'remote: Processing changes: (\)\n'
954 'remote: Processing changes: (|)\n'
955 'remote: Processing changes: (/)\n'
956 'remote: Processing changes: (-)\n'
957 'remote: Processing changes: new: 1 (/)\n'
958 'remote: Processing changes: new: 1, done\n'
959 'remote:\n'
960 'remote: New Changes:\n'
961 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
962 'remote:\n'
963 'To https://chromium.googlesource.com/yyy/zzz\n'
964 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000965 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000966 if squash:
967 calls += [
tandrii33a46ff2016-08-23 05:53:40 -0700968 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -0700969 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000970 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -0700971 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000972 ((['git', 'config', 'branch.master.gerritsquashhash',
973 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000974 ]
tandrii88189772016-09-29 04:29:57 -0700975 calls += [
976 ((['git', 'config', 'rietveld.cc'],), ''),
977 ((['AddReviewers', 'chromium-review.googlesource.com',
978 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -0700979 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -0700980 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000981 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000982 return calls
983
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000984 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000985 self,
986 upload_args,
987 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000988 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -0700989 squash=True,
990 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000991 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000992 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000993 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000994 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -0700995 issue=None,
996 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000997 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -0700998 if squash_mode is None:
999 if '--no-squash' in upload_args:
1000 squash_mode = 'nosquash'
1001 elif '--squash' in upload_args:
1002 squash_mode = 'squash'
1003 else:
1004 squash_mode = 'default'
1005
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001006 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001007 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001008 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001009 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001010 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001011 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1012 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001013 self.mock(git_cl.gclient_utils, 'RunEditor',
1014 lambda *_, **__: self._mocked_call(['RunEditor']))
1015 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001016 self.mock(git_cl.gerrit_util, 'AddReviewers',
1017 lambda h, i, add, is_reviewer: self._mocked_call(
1018 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001019
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001020 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001021 self.calls += self._gerrit_upload_calls(
1022 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001023 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001024 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001025 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001026 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001027 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001028 # Uncomment when debugging.
1029 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001030 git_cl.main(['upload'] + upload_args)
1031
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001032 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001033 self._run_gerrit_upload_test(
1034 ['--no-squash'],
1035 'desc\n\nBUG=\n',
1036 [],
1037 squash=False,
1038 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1039
1040 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001041 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001042 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001043 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001044 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001045 [],
tandriia60502f2016-06-20 02:01:53 -07001046 squash=False,
1047 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001048 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001049
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001050 def test_gerrit_no_reviewer(self):
1051 self._run_gerrit_upload_test(
1052 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001053 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001054 [],
1055 squash=False,
1056 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001057
tandriieefe8322016-08-17 10:12:24 -07001058 def test_gerrit_patch_bad_chars(self):
1059 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001060 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001061 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001062 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001063 squash=False,
1064 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001065 ref_suffix='%m=Dont_put_bad_chars')
1066 self.assertIn(
1067 'WARNING: Patchset title may only contain alphanumeric chars '
1068 'and spaces. Cleaned up title:\nDont put bad chars\n',
1069 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001070
ukai@chromium.orge8077812012-02-03 03:41:46 +00001071 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001072 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001073 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001074 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001075 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001076 squash=False,
1077 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001078 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001079
1080 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001081 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001082 [],
bradnelsond975b302016-10-23 12:20:23 -07001083 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1084 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001085 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001086 ['reviewer@example.com', 'another@example.com'],
1087 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001088 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001089 ref_suffix='%l=Code-Review+1',
1090 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001091
1092 def test_gerrit_upload_squash_first_is_default(self):
1093 # Mock Gerrit CL description to indicate the first upload.
1094 self.mock(git_cl.Changelist, 'GetDescription',
1095 lambda *_: None)
1096 self._run_gerrit_upload_test(
1097 [],
1098 'desc\nBUG=\n\nChange-Id: 123456789',
1099 [],
1100 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001101
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001102 def test_gerrit_upload_squash_first(self):
1103 # Mock Gerrit CL description to indicate the first upload.
1104 self.mock(git_cl.Changelist, 'GetDescription',
1105 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001106 self._run_gerrit_upload_test(
1107 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001108 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001109 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001110 squash=True,
1111 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001112
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001113 def test_gerrit_upload_squash_reupload(self):
1114 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1115 # Mock Gerrit CL description to indicate re-upload.
1116 self.mock(git_cl.Changelist, 'GetDescription',
1117 lambda *args: description)
1118 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1119 lambda *args: 1)
1120 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1121 lambda *args: {'change_id': '123456789'})
1122 self._run_gerrit_upload_test(
1123 ['--squash'],
1124 description,
1125 [],
1126 squash=True,
1127 expected_upstream_ref='origin/master',
1128 issue=123456)
1129
rmistry@google.com2dd99862015-06-22 12:22:18 +00001130 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001131 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001132 def mock_run_git(*args, **_kwargs):
1133 if args[0] == ['for-each-ref',
1134 '--format=%(refname:short) %(upstream:short)',
1135 'refs/heads']:
1136 # Create a local branch dependency tree that looks like this:
1137 # test1 -> test2 -> test3 -> test4 -> test5
1138 # -> test3.1
1139 # test6 -> test0
1140 branch_deps = [
1141 'test2 test1', # test1 -> test2
1142 'test3 test2', # test2 -> test3
1143 'test3.1 test2', # test2 -> test3.1
1144 'test4 test3', # test3 -> test4
1145 'test5 test4', # test4 -> test5
1146 'test6 test0', # test0 -> test6
1147 'test7', # test7
1148 ]
1149 return '\n'.join(branch_deps)
1150 self.mock(git_cl, 'RunGit', mock_run_git)
1151
1152 class RecordCalls:
1153 times_called = 0
1154 record_calls = RecordCalls()
1155 def mock_CMDupload(*args, **_kwargs):
1156 record_calls.times_called += 1
1157 return 0
1158 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1159
1160 self.calls = [
1161 (('[Press enter to continue or ctrl-C to quit]',), ''),
1162 ]
1163
1164 class MockChangelist():
1165 def __init__(self):
1166 pass
1167 def GetBranch(self):
1168 return 'test1'
1169 def GetIssue(self):
1170 return '123'
1171 def GetPatchset(self):
1172 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001173 def IsGerrit(self):
1174 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001175
1176 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1177 # CMDupload should have been called 5 times because of 5 dependent branches.
1178 self.assertEquals(5, record_calls.times_called)
1179 self.assertEquals(0, ret)
1180
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001181 def test_gerrit_change_id(self):
1182 self.calls = [
1183 ((['git', 'write-tree'], ),
1184 'hashtree'),
1185 ((['git', 'rev-parse', 'HEAD~0'], ),
1186 'branch-parent'),
1187 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1188 'A B <a@b.org> 1456848326 +0100'),
1189 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1190 'C D <c@d.org> 1456858326 +0100'),
1191 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1192 'hashchange'),
1193 ]
1194 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1195 self.assertEqual(change_id, 'Ihashchange')
1196
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001197 def test_desecription_append_footer(self):
1198 for init_desc, footer_line, expected_desc in [
1199 # Use unique desc first lines for easy test failure identification.
1200 ('foo', 'R=one', 'foo\n\nR=one'),
1201 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1202 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1203 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1204 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1205 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1206 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1207 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1208 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1209 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1210 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1211 ]:
1212 desc = git_cl.ChangeDescription(init_desc)
1213 desc.append_footer(footer_line)
1214 self.assertEqual(desc.description, expected_desc)
1215
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001216 def test_update_reviewers(self):
1217 data = [
1218 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001219 ('foo\nR=xx', [], 'foo\nR=xx'),
1220 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001221 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001222 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1223 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1224 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001225 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001226 ('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 +00001227 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001228 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1229 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1230 # Same as the line before, but full of whitespaces.
1231 (
1232 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1233 'foo\nBar\n\nR=c@c\n BUG =',
1234 ),
1235 # Whitespaces aren't interpreted as new lines.
1236 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001237 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001238 expected = [i[2] for i in data]
1239 actual = []
1240 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001241 obj = git_cl.ChangeDescription(orig)
1242 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001243 actual.append(obj.description)
1244 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001245
wittman@chromium.org455dc922015-01-26 20:15:50 +00001246 def test_get_target_ref(self):
1247 # Check remote or remote branch not present.
1248 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1249 self.assertEqual(None, git_cl.GetTargetRef(None,
1250 'refs/remotes/origin/master',
1251 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001252
wittman@chromium.org455dc922015-01-26 20:15:50 +00001253 # Check default target refs for branches.
1254 self.assertEqual('refs/heads/master',
1255 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1256 None, None))
1257 self.assertEqual('refs/heads/master',
1258 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1259 None, None))
1260 self.assertEqual('refs/heads/master',
1261 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1262 None, None))
1263 self.assertEqual('refs/branch-heads/123',
1264 git_cl.GetTargetRef('origin',
1265 'refs/remotes/branch-heads/123',
1266 None, None))
1267 self.assertEqual('refs/diff/test',
1268 git_cl.GetTargetRef('origin',
1269 'refs/remotes/origin/refs/diff/test',
1270 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001271 self.assertEqual('refs/heads/chrome/m42',
1272 git_cl.GetTargetRef('origin',
1273 'refs/remotes/origin/chrome/m42',
1274 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001275
1276 # Check target refs for user-specified target branch.
1277 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1278 'refs/remotes/branch-heads/123'):
1279 self.assertEqual('refs/branch-heads/123',
1280 git_cl.GetTargetRef('origin',
1281 'refs/remotes/origin/master',
1282 branch, None))
1283 for branch in ('origin/master', 'remotes/origin/master',
1284 'refs/remotes/origin/master'):
1285 self.assertEqual('refs/heads/master',
1286 git_cl.GetTargetRef('origin',
1287 'refs/remotes/branch-heads/123',
1288 branch, None))
1289 for branch in ('master', 'heads/master', 'refs/heads/master'):
1290 self.assertEqual('refs/heads/master',
1291 git_cl.GetTargetRef('origin',
1292 'refs/remotes/branch-heads/123',
1293 branch, None))
1294
1295 # Check target refs for pending prefix.
1296 self.assertEqual('prefix/heads/master',
1297 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1298 None, 'prefix/'))
1299
wychen@chromium.orga872e752015-04-28 23:42:18 +00001300 def test_patch_when_dirty(self):
1301 # Patch when local tree is dirty
1302 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1303 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1304
1305 def test_diff_when_dirty(self):
1306 # Do 'git cl diff' when local tree is dirty
1307 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1308 self.assertNotEqual(git_cl.main(['diff']), 0)
1309
tandriidf09a462016-08-18 16:23:55 -07001310 def _patch_common(self, is_gerrit=False, force_codereview=False,
1311 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001312 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001313 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1314 lambda x: '60001')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001315 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1316 lambda *args: {
1317 'current_revision': '7777777777',
1318 'revisions': {
1319 '1111111111': {
1320 '_number': 1,
1321 'fetch': {'http': {
1322 'url': 'https://chromium.googlesource.com/my/repo',
1323 'ref': 'refs/changes/56/123456/1',
1324 }},
1325 },
1326 '7777777777': {
1327 '_number': 7,
1328 'fetch': {'http': {
1329 'url': 'https://chromium.googlesource.com/my/repo',
1330 'ref': 'refs/changes/56/123456/7',
1331 }},
1332 },
1333 },
1334 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001335 self.mock(git_cl.Changelist, 'GetDescription',
1336 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001337 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1338
tandriidf09a462016-08-18 16:23:55 -07001339 if new_branch:
1340 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1341 else:
1342 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001343 if not force_codereview:
1344 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001345 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001346 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001347 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1348 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001349 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001350 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001351
1352 if is_gerrit:
1353 if not force_codereview:
1354 self.calls += [
1355 ((['git', 'config', 'gerrit.host'],), 'true'),
1356 ]
1357 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001358 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001359 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001360 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001361 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001362 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001363 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001364
tandriidf09a462016-08-18 16:23:55 -07001365 def _common_patch_successful(self, new_branch=False):
1366 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001367 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001368 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001369 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001370 'patch from issue 123456 at patchset 60001 ' +
1371 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001372 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001373 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001374 ((['git', 'config', 'branch.master.rietveldserver',
1375 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001376 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001377 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001378 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001379
1380 def test_patch_successful(self):
1381 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001382 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1383
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001384 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001385 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001386 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1387
wychen@chromium.orga872e752015-04-28 23:42:18 +00001388 def test_patch_conflict(self):
1389 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001390 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001391 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001392
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001393 def test_gerrit_patch_successful(self):
1394 self._patch_common(is_gerrit=True)
1395 self.calls += [
1396 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1397 'refs/changes/56/123456/7'],), ''),
1398 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001399 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001400 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001401 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1402 ((['git', 'config', 'branch.master.merge'],), 'master'),
1403 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1404 ((['git', 'config', 'remote.origin.url'],),
1405 'https://chromium.googlesource.com/my/repo'),
1406 ((['git', 'config', 'branch.master.gerritserver',
1407 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001408 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001409 ]
1410 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1411
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001412 def test_patch_force_codereview(self):
1413 self._patch_common(is_gerrit=True, force_codereview=True)
1414 self.calls += [
1415 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1416 'refs/changes/56/123456/7'],), ''),
1417 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1418 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001419 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001420 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001421 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1422 ((['git', 'config', 'branch.master.merge'],), 'master'),
1423 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1424 ((['git', 'config', 'remote.origin.url'],),
1425 'https://chromium.googlesource.com/my/repo'),
1426 ((['git', 'config', 'branch.master.gerritserver',
1427 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001428 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001429 ]
1430 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1431
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001432 def test_gerrit_patch_url_successful(self):
1433 self._patch_common(is_gerrit=True)
1434 self.calls += [
1435 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1436 'refs/changes/56/123456/1'],), ''),
1437 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001438 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001439 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001440 ((['git', 'config', 'branch.master.gerritserver',
1441 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001442 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001443 ]
1444 self.assertEqual(git_cl.main(
1445 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1446
1447 def test_gerrit_patch_conflict(self):
1448 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001449 self.calls += [
1450 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1451 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001452 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1453 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1454 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001455 ]
1456 with self.assertRaises(SystemExitMock):
1457 git_cl.main(['patch',
1458 'https://chromium-review.googlesource.com/#/c/123456/1'])
1459
tandriic2405f52016-10-10 08:13:15 -07001460 def test_gerrit_patch_not_exists(self):
1461 url = 'https://chromium-review.googlesource.com'
1462 self.mock(git_cl.gerrit_util, 'GetChangeDetail', lambda _, __, ___: None)
1463 self.calls = [
1464 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1465 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1466 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1467 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1468 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1469 ((['git', 'config', 'gerrit.host'],), 'true'),
1470 ((['DieWithError', 'issue 123456 at ' + url + ' does not exist '
1471 'or you have no access to it'],), SystemExitMock()),
1472 ]
1473 with self.assertRaises(SystemExitMock):
1474 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1475
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001476 def _checkout_calls(self):
1477 return [
1478 ((['git', 'config', '--local', '--get-regexp',
1479 'branch\\..*\\.rietveldissue'], ),
1480 ('branch.retrying.rietveldissue 1111111111\n'
1481 'branch.some-fix.rietveldissue 2222222222\n')),
1482 ((['git', 'config', '--local', '--get-regexp',
1483 'branch\\..*\\.gerritissue'], ),
1484 ('branch.ger-branch.gerritissue 123456\n'
1485 'branch.gbranch654.gerritissue 654321\n')),
1486 ]
1487
1488 def test_checkout_gerrit(self):
1489 """Tests git cl checkout <issue>."""
1490 self.calls = self._checkout_calls()
1491 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1492 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1493
1494 def test_checkout_rietveld(self):
1495 """Tests git cl checkout <issue>."""
1496 self.calls = self._checkout_calls()
1497 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1498 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1499
1500 def test_checkout_not_found(self):
1501 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001502 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001503 self.calls = self._checkout_calls()
1504 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1505
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001506 def test_checkout_no_branch_issues(self):
1507 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001508 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001509 self.calls = [
1510 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001511 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001512 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001513 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001514 ]
1515 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1516
tandrii@chromium.org28253532016-04-14 13:46:56 +00001517 def _test_gerrit_ensure_authenticated_common(self, auth,
1518 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001519 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1520 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1521 self.mock(git_cl, 'DieWithError',
1522 lambda msg: self._mocked_call(['DieWithError', msg]))
1523 self.mock(git_cl, 'ask_for_data',
1524 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001525 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001526 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001527 cl.branch = 'master'
1528 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001529 cl.lookedup_issue = True
1530 return cl
1531
1532 def test_gerrit_ensure_authenticated_missing(self):
1533 cl = self._test_gerrit_ensure_authenticated_common(auth={
1534 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1535 })
1536 self.calls.append(
1537 ((['DieWithError',
1538 'Credentials for the following hosts are required:\n'
1539 ' chromium-review.googlesource.com\n'
1540 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1541 'You can (re)generate your credentails by visiting '
1542 'https://chromium-review.googlesource.com/new-password'],), ''),)
1543 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1544
1545 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001546 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001547 cl = self._test_gerrit_ensure_authenticated_common(auth={
1548 'chromium.googlesource.com': 'one',
1549 'chromium-review.googlesource.com': 'other',
1550 })
1551 self.calls.append(
1552 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001553 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001554 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1555
1556 def test_gerrit_ensure_authenticated_ok(self):
1557 cl = self._test_gerrit_ensure_authenticated_common(auth={
1558 'chromium.googlesource.com': 'same',
1559 'chromium-review.googlesource.com': 'same',
1560 })
1561 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1562
tandrii@chromium.org28253532016-04-14 13:46:56 +00001563 def test_gerrit_ensure_authenticated_skipped(self):
1564 cl = self._test_gerrit_ensure_authenticated_common(
1565 auth={}, skip_auth_check=True)
1566 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1567
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001568 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001569 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1570 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001571 self.calls = [
1572 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001573 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001574 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1575 ((['git', 'config', 'rietveld.server'],), ''),
1576 ((['git', 'config', 'rietveld.server'],), ''),
1577 ((['git', 'config', 'branch.feature.rietveldserver'],),
1578 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001579 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001580 ]
1581 self.assertEqual(0, git_cl.main(['set-commit']))
1582
tandriid9e5ce52016-07-13 02:32:59 -07001583 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001584 self.mock(git_cl.gerrit_util, 'SetReview',
1585 lambda h, i, labels: self._mocked_call(
1586 ['SetReview', h, i, labels]))
1587 self.calls = [
1588 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001589 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1590 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001591 ((['git', 'config', 'branch.feature.gerritserver'],),
1592 'https://chromium-review.googlesource.com'),
1593 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001594 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001595 ]
tandriid9e5ce52016-07-13 02:32:59 -07001596
1597 def test_cmd_set_commit_gerrit_clear(self):
1598 self._cmd_set_commit_gerrit_common(0)
1599 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1600
1601 def test_cmd_set_commit_gerrit_dry(self):
1602 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001603 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1604
tandriid9e5ce52016-07-13 02:32:59 -07001605 def test_cmd_set_commit_gerrit(self):
1606 self._cmd_set_commit_gerrit_common(2)
1607 self.assertEqual(0, git_cl.main(['set-commit']))
1608
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001609 def test_description_display(self):
1610 out = StringIO.StringIO()
1611 self.mock(git_cl.sys, 'stdout', out)
1612
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001613 self.mock(git_cl, 'Changelist', ChangelistMock)
1614 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001615
1616 self.assertEqual(0, git_cl.main(['description', '-d']))
1617 self.assertEqual('foo\n', out.getvalue())
1618
1619 def test_description_rietveld(self):
1620 out = StringIO.StringIO()
1621 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001622 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001623
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001624 self.assertEqual(0, git_cl.main([
1625 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1626 self.assertEqual('foobar\n', out.getvalue())
1627
iannucci3c972b92016-08-17 13:24:10 -07001628 def test_StatusFieldOverrideIssueMissingArgs(self):
1629 out = StringIO.StringIO()
1630 self.mock(git_cl.sys, 'stderr', out)
1631
1632 try:
1633 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1634 except SystemExit as ex:
1635 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001636 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001637
1638 out = StringIO.StringIO()
1639 self.mock(git_cl.sys, 'stderr', out)
1640
1641 try:
1642 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1643 except SystemExit as ex:
1644 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001645 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001646
1647 def test_StatusFieldOverrideIssue(self):
1648 out = StringIO.StringIO()
1649 self.mock(git_cl.sys, 'stdout', out)
1650
1651 def assertIssue(cl_self, *_args):
1652 self.assertEquals(cl_self.issue, 1)
1653 return 'foobar'
1654
1655 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1656 self.calls = [
1657 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1658 ((['git', 'config', 'rietveld.server'],), ''),
1659 ((['git', 'config', 'rietveld.server'],), ''),
1660 ]
iannuccie53c9352016-08-17 14:40:40 -07001661 self.assertEqual(
1662 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1663 0)
iannucci3c972b92016-08-17 13:24:10 -07001664 self.assertEqual(out.getvalue(), 'foobar\n')
1665
iannuccie53c9352016-08-17 14:40:40 -07001666 def test_SetCloseOverrideIssue(self):
1667 def assertIssue(cl_self, *_args):
1668 self.assertEquals(cl_self.issue, 1)
1669 return 'foobar'
1670
1671 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1672 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1673 self.calls = [
1674 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1675 ((['git', 'config', 'rietveld.server'],), ''),
1676 ((['git', 'config', 'rietveld.server'],), ''),
1677 ]
1678 self.assertEqual(
1679 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1680
1681 def test_SetCommitOverrideIssue(self):
1682 def assertIssue(cl_self, *_args):
1683 self.assertEquals(cl_self.issue, 1)
1684 return 'foobar'
1685
1686 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1687 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1688 self.calls = [
1689 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1690 ((['git', 'config', 'rietveld.server'],), ''),
1691 ((['git', 'config', 'rietveld.server'],), ''),
1692 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1693 ((['git', 'config', 'rietveld.server'],), ''),
1694 ((['git', 'config', 'rietveld.server'],), ''),
1695 ]
1696 self.assertEqual(
1697 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1698
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001699 def test_description_gerrit(self):
1700 out = StringIO.StringIO()
1701 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001702 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001703
1704 self.assertEqual(0, git_cl.main([
1705 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1706 self.assertEqual('foobar\n', out.getvalue())
1707
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001708 def test_description_set_raw(self):
1709 out = StringIO.StringIO()
1710 self.mock(git_cl.sys, 'stdout', out)
1711
1712 self.mock(git_cl, 'Changelist', ChangelistMock)
1713 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1714
1715 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1716 self.assertEqual('hihi', ChangelistMock.desc)
1717
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001718 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001719 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001720
1721 def RunEditor(desc, _, **kwargs):
1722 self.assertEquals(
1723 '# Enter a description of the change.\n'
1724 '# This will be displayed on the codereview site.\n'
1725 '# The first line will also be used as the subject of the review.\n'
1726 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001727 '--------------------\n'
1728 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001729 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001730 # Simulate user changing something.
1731 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001732
dsansomee2d6fd92016-09-08 00:10:47 -07001733 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001734 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001735
1736 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1737 self.mock(git_cl.Changelist, 'GetDescription',
1738 lambda *args: current_desc)
1739 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1740 UpdateDescriptionRemote)
1741 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1742
1743 self.calls = [
1744 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001745 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001746 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1747 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001748 ((['git', 'config', 'core.editor'],), 'vi'),
1749 ]
1750 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1751
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001752 def test_description_set_stdin(self):
1753 out = StringIO.StringIO()
1754 self.mock(git_cl.sys, 'stdout', out)
1755
1756 self.mock(git_cl, 'Changelist', ChangelistMock)
1757 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1758
1759 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1760 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1761
kmarshall3bff56b2016-06-06 18:31:47 -07001762 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001763 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1764
kmarshall3bff56b2016-06-06 18:31:47 -07001765 self.calls = \
1766 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1767 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07001768 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001769 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1770 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07001771 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1772 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1773 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001774 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1775 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1776 ((['git', 'branch', '-D', 'foo'],), '')]
1777
kmarshall3bff56b2016-06-06 18:31:47 -07001778 self.mock(git_cl, 'get_cl_statuses',
1779 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001780 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1781 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1782 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001783
1784 self.assertEqual(0, git_cl.main(['archive', '-f']))
1785
1786 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001787 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001788 self.calls = \
1789 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1790 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07001791 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001792 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1793 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001794 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1795
kmarshall9249e012016-08-23 12:02:16 -07001796 self.mock(git_cl, 'get_cl_statuses',
1797 lambda branches, fine_grained, max_processes:
1798 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
1799
1800 self.assertEqual(1, git_cl.main(['archive', '-f']))
1801
1802 def test_archive_dry_run(self):
1803 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1804
1805 self.calls = \
1806 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1807 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1808 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1809 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1810 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1811 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1812 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1813 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1814 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07001815
1816 self.mock(git_cl, 'get_cl_statuses',
1817 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001818 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1819 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1820 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001821
kmarshall9249e012016-08-23 12:02:16 -07001822 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
1823
1824 def test_archive_no_tags(self):
1825 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1826
1827 self.calls = \
1828 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1829 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1830 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1831 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1832 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1833 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1834 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1835 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1836 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1837 ((['git', 'branch', '-D', 'foo'],), '')]
1838
1839 self.mock(git_cl, 'get_cl_statuses',
1840 lambda branches, fine_grained, max_processes:
1841 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1842 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1843 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
1844
1845 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07001846
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001847 def test_cmd_issue_erase_existing(self):
1848 out = StringIO.StringIO()
1849 self.mock(git_cl.sys, 'stdout', out)
1850 self.calls = [
1851 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001852 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1853 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001854 # Let this command raise exception (retcode=1) - it should be ignored.
1855 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07001856 CERR1),
1857 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1858 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001859 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1860 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1861 ''),
1862 ]
1863 self.assertEqual(0, git_cl.main(['issue', '0']))
1864
phajdan.jre328cf92016-08-22 04:12:17 -07001865 def test_cmd_issue_json(self):
1866 out = StringIO.StringIO()
1867 self.mock(git_cl.sys, 'stdout', out)
1868 self.calls = [
1869 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001870 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07001871 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1872 ((['git', 'config', 'rietveld.server'],),
1873 'https://codereview.chromium.org'),
1874 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1875 (('write_json', 'output.json',
1876 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
1877 ''),
1878 ]
1879 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
1880
tandriide281ae2016-10-12 06:02:30 -07001881 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07001882 self.mock(git_cl.Changelist, 'GetChange',
1883 lambda _, *a: (
1884 self._mocked_call(['GetChange']+list(a))))
1885 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1886 lambda *_, **__: (
1887 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07001888 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
1889 lambda _, s: self._mocked_call(['SetCQState', s]))
1890 self.calls = [
1891 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001892 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07001893 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1894 ((['git', 'config', 'rietveld.server'],),
1895 'https://codereview.chromium.org'),
1896 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1897 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1898 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1899 ((['get_or_create_merge_base', 'feature', 'feature'],),
1900 'fake_ancestor_sha'),
1901 ((['GetChange', 'fake_ancestor_sha', None], ),
1902 git_cl.presubmit_support.GitChange(
1903 '', '', '', '', '', '', '', '')),
1904 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1905 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07001906 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1907 ]
1908 out = StringIO.StringIO()
1909 self.mock(git_cl.sys, 'stdout', out)
1910 self.assertEqual(0, git_cl.main(['try']))
1911 self.assertEqual(
1912 out.getvalue(),
1913 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
1914
tandriide281ae2016-10-12 06:02:30 -07001915 def test_git_cl_try_buildbucket_with_properties(self):
1916 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
1917 self.mock(git_cl.Changelist, 'GetIssueOwner', lambda _: 'owner@e.mail')
1918 self.mock(git_cl.Changelist, 'GetIssueProject', lambda _: 'depot_tools')
1919 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
1920 self.calls = [
1921 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1922 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1923 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1924 ((['git', 'config', 'rietveld.server'],),
1925 'https://codereview.chromium.org'),
1926 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
1927 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1928 ]
1929
1930 def _buildbucket_retry(*_, **kw):
1931 # self.maxDiff = 10000
1932 body = json.loads(kw['body'])
1933 self.assertEqual(len(body['builds']), 1)
1934 build = body['builds'][0]
1935 params = json.loads(build.pop('parameters_json'))
1936 self.assertEqual(params, {
1937 u'builder_name': u'win',
1938 u'changes': [{u'author': {u'email': u'owner@e.mail'},
1939 u'revision': None}],
1940 u'properties': {
1941 u'category': u'git_cl_try',
1942 u'issue': 123,
1943 u'key': u'val',
1944 u'json': [{u'a': 1}, None],
1945 u'master': u'tryserver.chromium',
1946 u'patch_project': u'depot_tools',
1947 u'patch_storage': u'rietveld',
1948 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07001949 u'rietveld': u'https://codereview.chromium.org',
1950 }
1951 })
1952 self.assertEqual(build, {
1953 u'bucket': u'master.tryserver.chromium',
1954 u'client_operation_id': u'uuid4',
1955 u'tags': [u'builder:win',
1956 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07001957 u'user_agent:git_cl_try',
1958 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07001959 })
1960
1961 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
1962
1963 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1964 self.assertEqual(0, git_cl.main([
1965 'try', '-m', 'tryserver.chromium', '-b', 'win',
1966 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
1967 self.assertRegexpMatches(
1968 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07001969 'Tried jobs on:\nBucket: master.tryserver.chromium')
1970
1971 def test_git_cl_try_buildbucket_bucket_flag(self):
1972 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
1973 self.mock(git_cl.Changelist, 'GetIssueOwner', lambda _: 'owner@e.mail')
1974 self.mock(git_cl.Changelist, 'GetIssueProject', lambda _: 'depot_tools')
1975 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
1976 self.calls = [
1977 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1978 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1979 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1980 ((['git', 'config', 'rietveld.server'],),
1981 'https://codereview.chromium.org'),
1982 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
1983 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1984 ]
1985
1986 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07001987 body = json.loads(kw['body'])
1988 self.assertEqual(len(body['builds']), 1)
1989 build = body['builds'][0]
1990 params = json.loads(build.pop('parameters_json'))
1991 self.assertEqual(params, {
1992 u'builder_name': u'win',
1993 u'changes': [{u'author': {u'email': u'owner@e.mail'},
1994 u'revision': None}],
1995 u'properties': {
1996 u'category': u'git_cl_try',
1997 u'issue': 123,
1998 u'patch_project': u'depot_tools',
1999 u'patch_storage': u'rietveld',
2000 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002001 u'rietveld': u'https://codereview.chromium.org',
2002 }
2003 })
2004 self.assertEqual(build, {
2005 u'bucket': u'test.bucket',
2006 u'client_operation_id': u'uuid4',
2007 u'tags': [u'builder:win',
2008 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2009 u'user_agent:git_cl_try'],
2010 })
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', '-B', 'test.bucket', '-b', 'win']))
2017 self.assertRegexpMatches(
2018 git_cl.sys.stdout.getvalue(),
2019 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002020
qyearsley123a4682016-10-26 09:12:17 -07002021 def test_git_cl_try_bots_on_multiple_masters(self):
2022 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2023 self.calls = [
2024 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2025 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2026 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2027 ((['git', 'config', 'rietveld.server'],),
2028 'https://codereview.chromium.org'),
2029 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2030 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2031 ]
2032
2033 def _buildbucket_retry(*_, **kw):
2034 body = json.loads(kw['body'])
2035 self.assertEqual(len(body['builds']), 2)
2036
2037 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2038 self.assertEqual(first_build_params['builder_name'], 'builder1')
2039 self.assertEqual(first_build_params['properties']['master'], 'master1')
2040
2041 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2042 self.assertEqual(first_build_params['builder_name'], 'builder2')
2043 self.assertEqual(first_build_params['properties']['master'], 'master2')
2044
2045 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2046
2047 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2048 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2049
2050 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2051 self.assertEqual(
2052 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2053 self.assertEqual(
2054 git_cl.sys.stdout.getvalue(),
2055 'Tried jobs on:\n'
2056 'Bucket: master.master1\n'
2057 ' builder1: []\n'
2058 'Bucket: master.master2\n'
2059 ' builder2: []\n'
2060 'To see results here, run: git cl try-results\n'
2061 'To see results in browser, run: git cl web\n')
2062
tandrii16e0b4e2016-06-07 10:34:28 -07002063 def _common_GerritCommitMsgHookCheck(self):
2064 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2065 self.mock(git_cl.os.path, 'abspath',
2066 lambda path: self._mocked_call(['abspath', path]))
2067 self.mock(git_cl.os.path, 'exists',
2068 lambda path: self._mocked_call(['exists', path]))
2069 self.mock(git_cl.gclient_utils, 'FileRead',
2070 lambda path: self._mocked_call(['FileRead', path]))
2071 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2072 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2073 self.calls = [
2074 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2075 ((['abspath', '../'],), '/abs/git_repo_root'),
2076 ]
2077 return git_cl.Changelist(codereview='gerrit', issue=123)
2078
2079 def test_GerritCommitMsgHookCheck_custom_hook(self):
2080 cl = self._common_GerritCommitMsgHookCheck()
2081 self.calls += [
2082 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2083 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2084 '#!/bin/sh\necho "custom hook"')
2085 ]
2086 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2087
2088 def test_GerritCommitMsgHookCheck_not_exists(self):
2089 cl = self._common_GerritCommitMsgHookCheck()
2090 self.calls += [
2091 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2092 ]
2093 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2094
2095 def test_GerritCommitMsgHookCheck(self):
2096 cl = self._common_GerritCommitMsgHookCheck()
2097 self.calls += [
2098 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2099 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2100 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2101 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2102 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2103 ''),
2104 ]
2105 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2106
tandriic4344b52016-08-29 06:04:54 -07002107 def test_GerritCmdLand(self):
2108 self.calls += [
2109 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2110 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2111 'deadbeaf'),
2112 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2113 ((['git', 'config', 'branch.feature.gerritserver'],),
2114 'chromium-review.googlesource.com'),
2115 ]
2116 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2117 cl._codereview_impl._GetChangeDetail = lambda _: {
2118 'labels': {},
2119 'current_revision': 'deadbeaf',
2120 }
agable32978d92016-11-01 12:55:02 -07002121 cl._codereview_impl._GetChangeCommit = lambda: {
2122 'commit': 'deadbeef',
2123 'web_links': [{'name': 'gerrit',
2124 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2125 }
tandriic4344b52016-08-29 06:04:54 -07002126 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002127 out = StringIO.StringIO()
2128 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002129 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002130 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002131 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002132
tandrii221ab252016-10-06 08:12:04 -07002133 BUILDBUCKET_BUILDS_MAP = {
2134 '9000': {
2135 'id': '9000',
2136 'status': 'STARTED',
2137 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2138 'result_details_json': '{"properties": {}}',
2139 'bucket': 'master.x.y',
2140 'created_by': 'user:someone@chromium.org',
2141 'created_ts': '147200002222000',
2142 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2143 },
2144 '8000': {
2145 'id': '8000',
2146 'status': 'COMPLETED',
2147 'result': 'FAILURE',
2148 'failure_reason': 'BUILD_FAILURE',
2149 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2150 'result_details_json': '{"properties": {}}',
2151 'bucket': 'master.x.y',
2152 'created_by': 'user:someone@chromium.org',
2153 'created_ts': '147200001111000',
2154 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2155 },
2156 }
2157
2158 def test_write_try_results_json(self):
2159 expected_output = [
2160 {
2161 'buildbucket_id': '8000',
2162 'bucket': 'master.x.y',
2163 'builder_name': 'my-builder',
2164 'status': 'COMPLETED',
2165 'result': 'FAILURE',
2166 'failure_reason': 'BUILD_FAILURE',
2167 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2168 },
2169 {
2170 'buildbucket_id': '9000',
2171 'bucket': 'master.x.y',
2172 'builder_name': 'my-builder',
2173 'status': 'STARTED',
2174 'result': None,
2175 'failure_reason': None,
2176 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2177 }
2178 ]
2179 self.calls = [(('write_json', 'output.json', expected_output), '')]
2180 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2181
tandrii45b2a582016-10-11 03:14:16 -07002182 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002183 out = StringIO.StringIO()
2184 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002185 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2186 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002187 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2188 self._mocked_call(['get_authenticator_for_host', host]))
2189 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2190 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002191
2192 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2193 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002194 self.calls += [
2195 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2196 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2197 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2198 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2199 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2200 ((['git', 'config', 'branch.feature.rietveldserver'],),
2201 'codereview.example.com'),
2202 ((['get_authenticator_for_host', 'codereview.example.com'],),
2203 AuthenticatorMock()),
2204 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2205
2206 def test_fetch_try_jobs_none_rietveld(self):
2207 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002208 # Simulate that user isn't logged in.
2209 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002210 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002211 self.assertRegexpMatches(sys.stdout.getvalue(),
2212 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002213 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2214
2215 def test_fetch_try_jobs_some_rietveld(self):
2216 self._setup_fetch_try_jobs_rietveld({
2217 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2218 })
2219 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002220 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2221 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2222 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2223
2224 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2225 self._setup_fetch_try_jobs(most_recent_patchset=13)
2226 self.calls += [
2227 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2228 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2229 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
2230 # Simulate that Gerrit has more patchsets than local.
2231 ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
2232 ((['git', 'config', 'branch.feature.gerritserver'],),
2233 'https://x-review.googlesource.com'),
2234 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2235 AuthenticatorMock()),
2236 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2237
2238 def test_fetch_try_jobs_none_gerrit(self):
2239 self._setup_fetch_try_jobs_gerrit({})
2240 self.assertEqual(0, git_cl.main(['try-results']))
2241 self.assertRegexpMatches(
2242 sys.stdout.getvalue(),
2243 r'Warning: Codereview server has newer patchsets \(13\)')
2244 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2245
2246 def test_fetch_try_jobs_some_gerrit(self):
2247 self._setup_fetch_try_jobs_gerrit({
2248 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2249 })
2250 # Explicit --patchset means actual local patchset doesn't matter.
2251 self.calls.remove(
2252 ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
2253 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2254
2255 # ... and doesn't result in warning.
2256 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2257 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002258 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2259 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2260
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002261
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002262if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002263 git_cl.logging.basicConfig(
2264 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002265 unittest.main()