blob: b613853960be569944ce631ec9569995a753a9cf [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
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000077
78class WatchlistsMock(object):
79 def __init__(self, _):
80 pass
81 @staticmethod
82 def GetWatchersForPaths(_):
83 return ['joe@example.com']
84
85
ukai@chromium.org78c4b982012-02-14 02:20:26 +000086class CodereviewSettingsFileMock(object):
87 def __init__(self):
88 pass
89 # pylint: disable=R0201
90 def read(self):
91 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +000092 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +000093
94
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +000095class AuthenticatorMock(object):
96 def __init__(self, *_args):
97 pass
98 def has_cached_credentials(self):
99 return True
tandrii221ab252016-10-06 08:12:04 -0700100 def authorize(self, http):
101 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000102
103
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000104def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
105 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
106
107 Usage:
108 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
109 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
110
111 OR
112 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
113 CookiesAuthenticatorMockFactory(cookie='cookie'))
114 """
115 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
116 def __init__(self): # pylint: disable=W0231
117 # Intentionally not calling super() because it reads actual cookie files.
118 pass
119 @classmethod
120 def get_gitcookies_path(cls):
121 return '~/.gitcookies'
122 @classmethod
123 def get_netrc_path(cls):
124 return '~/.netrc'
125 def get_auth_header(self, host):
126 if same_cookie:
127 return same_cookie
128 return (hosts_with_creds or {}).get(host)
129 return CookiesAuthenticatorMock
130
kmarshall9249e012016-08-23 12:02:16 -0700131class MockChangelistWithBranchAndIssue():
132 def __init__(self, branch, issue):
133 self.branch = branch
134 self.issue = issue
135 def GetBranch(self):
136 return self.branch
137 def GetIssue(self):
138 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000139
tandriic2405f52016-10-10 08:13:15 -0700140
141class SystemExitMock(Exception):
142 pass
143
144
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000145class TestGitClBasic(unittest.TestCase):
146 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
147 parsed = urlparse.urlparse(url)
148 result = func(parsed)
149 if fail:
150 self.assertIsNone(result)
151 return None
152 self.assertIsNotNone(result)
153 self.assertEqual(result.issue, issue)
154 self.assertEqual(result.patchset, patchset)
155 self.assertEqual(result.hostname, hostname)
156 return result
157
158 def test_ParseIssueURL_rietveld(self):
159 def test(url, issue=None, patchset=None, hostname=None, patch_url=None,
160 fail=None):
161 result = self._test_ParseIssueUrl(
162 git_cl._RietveldChangelistImpl.ParseIssueURL,
163 url, issue, patchset, hostname, fail)
164 if not fail:
165 self.assertEqual(result.patch_url, patch_url)
166
167 test('http://codereview.chromium.org/123',
168 123, None, 'codereview.chromium.org')
169 test('https://codereview.chromium.org/123',
170 123, None, 'codereview.chromium.org')
171 test('https://codereview.chromium.org/123/',
172 123, None, 'codereview.chromium.org')
173 test('https://codereview.chromium.org/123/whatever',
174 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700175 test('https://codereview.chromium.org/123/#ps20001',
176 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000177 test('http://codereview.chromium.org/download/issue123_4.diff',
178 123, 4, 'codereview.chromium.org',
179 patch_url='https://codereview.chromium.org/download/issue123_4.diff')
180 # This looks like bad Gerrit, but is actually valid Rietveld.
181 test('https://chrome-review.source.com/123/4/',
182 123, None, 'chrome-review.source.com')
183
184 test('https://codereview.chromium.org/deadbeaf', fail=True)
185 test('https://codereview.chromium.org/api/123', fail=True)
186 test('bad://codereview.chromium.org/123', fail=True)
187 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
188
189 def test_ParseIssueURL_gerrit(self):
190 def test(url, issue=None, patchset=None, hostname=None, fail=None):
191 self._test_ParseIssueUrl(
192 git_cl._GerritChangelistImpl.ParseIssueURL,
193 url, issue, patchset, hostname, fail)
194
195 test('http://chrome-review.source.com/c/123',
196 123, None, 'chrome-review.source.com')
197 test('https://chrome-review.source.com/c/123/',
198 123, None, 'chrome-review.source.com')
199 test('https://chrome-review.source.com/c/123/4',
200 123, 4, 'chrome-review.source.com')
201 test('https://chrome-review.source.com/#/c/123/4',
202 123, 4, 'chrome-review.source.com')
203 test('https://chrome-review.source.com/c/123/4',
204 123, 4, 'chrome-review.source.com')
205 test('https://chrome-review.source.com/123',
206 123, None, 'chrome-review.source.com')
207 test('https://chrome-review.source.com/123/4',
208 123, 4, 'chrome-review.source.com')
209
210 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
211 test('https://chrome-review.source.com/c/abc/', fail=True)
212 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
213
214 def test_ParseIssueNumberArgument(self):
215 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
216 result = git_cl.ParseIssueNumberArgument(arg)
217 self.assertIsNotNone(result)
218 if fail:
219 self.assertFalse(result.valid)
220 else:
221 self.assertEqual(result.issue, issue)
222 self.assertEqual(result.patchset, patchset)
223 self.assertEqual(result.hostname, hostname)
224
225 test('123', 123)
226 test('', fail=True)
227 test('abc', fail=True)
228 test('123/1', fail=True)
229 test('123a', fail=True)
230 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
231 # Rietveld.
232 test('https://codereview.source.com/123',
233 123, None, 'codereview.source.com')
234 test('https://codereview.source.com/www123', fail=True)
235 # Gerrrit.
236 test('https://chrome-review.source.com/c/123/4',
237 123, 4, 'chrome-review.source.com')
238 test('https://chrome-review.source.com/bad/123/4', fail=True)
239
tandriif9aefb72016-07-01 09:06:51 -0700240 def test_get_bug_line_values(self):
241 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
242 self.assertEqual(f('', ''), [])
243 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
244 self.assertEqual(f('v8', '456'), ['v8:456'])
245 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
246 # Not nice, but not worth carying.
247 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
248 ['v8:456', 'chromium:123', 'v8:123'])
249
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000250
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000251class TestGitCl(TestCase):
252 def setUp(self):
253 super(TestGitCl, self).setUp()
254 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700255 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000256 self.mock(subprocess2, 'call', self._mocked_call)
257 self.mock(subprocess2, 'check_call', self._mocked_call)
258 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700259 self.mock(subprocess2, 'communicate',
260 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000261 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000262 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000263 self.mock(git_common, 'get_or_create_merge_base',
264 lambda *a: (
265 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000266 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000267 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000268 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700269 self.mock(git_cl, 'write_json', lambda path, contents:
270 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000271 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000272 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000273 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000274 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000275 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000276 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000277 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
278 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700279 self.mock(git_cl, 'DieWithError',
280 lambda msg: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000281 # It's important to reset settings to not have inter-tests interference.
282 git_cl.settings = None
283
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000284
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000285 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000286 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000287 # Note: has_failed returns True if at least 1 test ran so far, current
288 # included, has failed. That means current test may have actually ran
289 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000290 if not self.has_failed():
291 self.assertEquals([], self.calls)
292 finally:
293 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000294
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000295 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000296 self.assertTrue(
297 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700298 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000299 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000300 expected_args, result = top
301
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000302 # Also logs otherwise it could get caught in a try/finally and be hard to
303 # diagnose.
304 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700305 N = 5
306 prior_calls = '\n '.join(
307 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
308 for i, c in enumerate(self._calls_done[-N:]))
309 following_calls = '\n '.join(
310 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
311 for i, c in enumerate(self.calls[:N]))
312 extended_msg = (
313 'A few prior calls:\n %s\n\n'
314 'This (expected):\n @%d: %r\n'
315 'This (actual):\n @%d: %r\n\n'
316 'A few following expected calls:\n %s' %
317 (prior_calls, len(self._calls_done), expected_args,
318 len(self._calls_done), args, following_calls))
319 git_cl.logging.error(extended_msg)
320
tandrii99a72f22016-08-17 14:33:24 -0700321 self.fail('@%d\n'
322 ' Expected: %r\n'
323 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700324 len(self._calls_done), expected_args, args))
325
326 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700327 if isinstance(result, Exception):
328 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000329 return result
330
tandrii48df5812016-10-17 03:55:37 -0700331 def test_LoadCodereviewSettingsFromFile_gerrit(self):
332 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
333 self.calls = [
334 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
335 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
336 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
337 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
338 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
339 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
340 ((['git', 'config', '--unset-all', 'rietveld.force-https-commit-url'],),
341 CERR1),
342 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
343 CERR1),
344 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
345 ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],),
346 CERR1),
347 ((['git', 'config', '--unset-all', 'rietveld.git-number-footer'],),
348 CERR1),
349 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
350 CERR1),
351 ((['git', 'config', 'gerrit.host', 'true'],), ''),
352 ]
353 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
354
maruel@chromium.orga3353652011-11-30 14:26:57 +0000355 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000356 def _is_gerrit_calls(cls, gerrit=False):
357 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
358 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
359
360 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000361 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000362 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000363 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000364
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000365 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000366 def _upload_no_rev_calls(cls, similarity, find_copies):
367 return (cls._git_base_calls(similarity, find_copies) +
368 cls._git_upload_no_rev_calls())
369
370 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000371 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000372 if similarity is None:
373 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700374 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700375 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000376 else:
tandrii33a46ff2016-08-23 05:53:40 -0700377 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700378 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000379
380 if find_copies is None:
381 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700382 find_copies_call = ((['git', 'config', '--bool',
383 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000384 else:
tandrii5d48c322016-08-18 16:19:37 -0700385 val = str(find_copies).lower()
386 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000387 'branch.master.git-find-copies', val],), '')
388
389 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000390 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000391 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000392 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000393 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000394 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000395 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000396
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000397 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000398 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000399 similarity_call,
400 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
401 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000402 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000403 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700404 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
405 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000406 ((['git', 'config', 'rietveld.server'],),
407 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000408 ((['git', 'config', 'branch.master.merge'],), 'master'),
409 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000410 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000411 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000412 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000413 ((['git', 'rev-parse', '--show-cdup'],), ''),
414 ((['git', 'rev-parse', 'HEAD'],), '12345'),
415 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000416 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000417 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700418 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000419 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000420 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000421 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000422 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000423 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000424 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000425 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000426 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000427 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000428 ]
429
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000430 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000431 def _git_upload_no_rev_calls(cls):
432 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000433 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000434 ]
435
436 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000437 def _git_upload_calls(cls, private):
438 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000439 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000440 private_call = []
441 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000442 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000443 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000444 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000445
maruel@chromium.orga3353652011-11-30 14:26:57 +0000446 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000447 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000448 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000449 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000450 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000451 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000452 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
453 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000454 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000455 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000456 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700457 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000458 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000459 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000460 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700461 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000462 ] + cls._git_post_upload_calls()
463
464 @classmethod
465 def _git_post_upload_calls(cls):
466 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000467 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
468 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
469 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000470 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000471 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000472 ]
473
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000474 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000475 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000476 fake_ancestor = 'fake_ancestor'
477 fake_cl = 'fake_cl_for_patch'
478 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000479 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000480 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000481 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000482 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000483 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000484 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000485 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000486 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700487 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000488 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000489 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000490 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000491 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000492 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000493 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000494 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000495 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000496 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000497 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000498 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000499
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000500 @classmethod
501 def _dcommit_calls_1(cls):
502 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000503 ((['git', 'config', 'rietveld.autoupdate'],),
504 ''),
505 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
506 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000507 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000508 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000509 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
510 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
511 None),
512 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000513 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700514 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700515 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000516 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700517 ((['git', 'config', '--bool',
518 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000519 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
520 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700521 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000522 ((['git',
523 'config', 'rietveld.server'],), 'codereview.example.com'),
524 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000525 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000526 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000527 ((['git', 'config', 'branch.working.merge'],),
528 'refs/heads/master'),
529 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000530 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000531 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000532 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000533 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000534 'refs/remotes/origin/master'],),
535 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000536 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000537 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000538 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000539 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000540 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000541 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000542 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000543 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000544 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000545 ]
546
547 @classmethod
548 def _dcommit_calls_normal(cls):
549 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000550 ((['git', 'rev-parse', '--show-cdup'],), ''),
551 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000552 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000553 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000554 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000555 '.'],),
556 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000557 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700558 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000559 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000560 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000561 ((['git', 'config', 'user.email'],), 'author@example.com'),
562 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000563 ]
564
565 @classmethod
566 def _dcommit_calls_bypassed(cls):
567 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000568 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000569 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000570 ]
571
572 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000573 def _dcommit_calls_3(cls):
574 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000575 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000576 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000577 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000578 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000579 (' PRESUBMIT.py | 2 +-\n'
580 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000581 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700582 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000583 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
584 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700585 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000586 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000587 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
588 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
589 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000590 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000591 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000592 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000593 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000594 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000595 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000596 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000597 ((['git', 'checkout', '-q', 'working'],), ''),
598 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000599 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000600
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000601 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700602 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000603 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000604 return [
605 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000606 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000607 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000608 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700609 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000610 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000611 '--git_similarity', similarity or '50'
612 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000613 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000614 ]
615
616 def _run_reviewer_test(
617 self,
618 upload_args,
619 expected_description,
620 returned_description,
621 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000622 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700623 private=False,
624 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000625 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000626 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000627 try:
628 similarity = upload_args[upload_args.index('--similarity')+1]
629 except ValueError:
630 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000631
632 if '--find-copies' in upload_args:
633 find_copies = True
634 elif '--no-find-copies' in upload_args:
635 find_copies = False
636 else:
637 find_copies = None
638
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000639 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700640 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000641
642 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000643
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000644 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000645 self.assertEquals(
646 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000647 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000648 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000649 '#--------------------This line is 72 characters long'
650 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651 expected_description,
652 desc)
653 return returned_description
654 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000655
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000656 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000657 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700658 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000659 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000660 return 1, 2
661 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000662
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000663 git_cl.main(['upload'] + upload_args)
664
665 def test_no_reviewer(self):
666 self._run_reviewer_test(
667 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000668 'desc\n\nBUG=',
669 '# Blah blah comment.\ndesc\n\nBUG=',
670 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000671 [])
672
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000673 def test_keep_similarity(self):
674 self._run_reviewer_test(
675 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000676 'desc\n\nBUG=',
677 '# Blah blah comment.\ndesc\n\nBUG=',
678 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000679 [])
680
iannucci@chromium.org79540052012-10-19 23:15:26 +0000681 def test_keep_find_copies(self):
682 self._run_reviewer_test(
683 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000684 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000685 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000686 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000687 [])
688
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000689 def test_private(self):
690 self._run_reviewer_test(
691 ['--private'],
692 'desc\n\nBUG=',
693 '# Blah blah comment.\ndesc\n\nBUG=\n',
694 'desc\n\nBUG=',
695 [])
696
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000697 def test_reviewers_cmd_line(self):
698 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000699 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000700 self._run_reviewer_test(
701 ['-r' 'foo@example.com'],
702 description,
703 '\n%s\n' % description,
704 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000705 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000706
707 def test_reviewer_tbr_overriden(self):
708 # Reviewer is overriden with TBR
709 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000710 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000711 self._run_reviewer_test(
712 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000713 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000714 description.strip('\n'),
715 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000716 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000717
718 def test_reviewer_multiple(self):
719 # Handles multiple R= or TBR= lines.
720 description = (
bradnelsond975b302016-10-23 12:20:23 -0700721 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
722 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000723 self._run_reviewer_test(
724 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000725 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000726 description,
727 description,
bradnelsond975b302016-10-23 12:20:23 -0700728 ['--reviewers=another@example.com,reviewer@example.com'],
729 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000730
maruel@chromium.orga3353652011-11-30 14:26:57 +0000731 def test_reviewer_send_mail(self):
732 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000733 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000734 self._run_reviewer_test(
735 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000736 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000737 description.strip('\n'),
738 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000739 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000740
741 def test_reviewer_send_mail_no_rev(self):
742 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000743 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700744 self.calls = self._upload_no_rev_calls(None, None) + [
745 ((['DieWithError', 'Must specify reviewers to send email.'],),
746 SystemExitMock())
747 ]
748
749 def RunEditor(desc, _, **kwargs):
750 return desc
751 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
752 self.mock(sys, 'stdout', stdout)
753 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000754 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700755 self.assertEqual(
756 'Using 50% similarity for rename/copy detection. Override with '
757 '--similarity.\n',
758 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000759
tandriif9aefb72016-07-01 09:06:51 -0700760 def test_bug_on_cmd(self):
761 self._run_reviewer_test(
762 ['--bug=500658,proj:123'],
763 'desc\n\nBUG=500658\nBUG=proj:123',
764 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
765 'desc\n\nBUG=500658\nBUG=proj:1234',
766 [])
767
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000768 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000769 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000770 self.calls = (
771 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000772 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000773 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000774 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000775 git_cl.main(['dcommit'])
776
777 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000778 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000779 self.calls = (
780 self._dcommit_calls_1() +
781 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000782 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000783 git_cl.main(['dcommit', '--bypass-hooks'])
784
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000785
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000786 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000787 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000788 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000789 if skip_auth_check:
790 return [((cmd, ), 'true')]
791
tandrii5d48c322016-08-18 16:19:37 -0700792 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000793 if issue:
794 calls.extend([
795 ((['git', 'config', 'branch.master.gerritserver'],), ''),
796 ])
797 calls.extend([
798 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
799 ((['git', 'config', 'branch.master.remote'],), 'origin'),
800 ((['git', 'config', 'remote.origin.url'],),
801 'https://chromium.googlesource.com/my/repo'),
802 ((['git', 'config', 'remote.origin.url'],),
803 'https://chromium.googlesource.com/my/repo'),
804 ])
805 return calls
806
807 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000808 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000809 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000810 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700811 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -0700812 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000813 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700814 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
815 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000816 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000817 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700818 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
819 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -0700820 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000821 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000823 ((['get_or_create_merge_base', 'master',
824 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000825 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000826 # Calls to verify branch point is ancestor
827 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
828 cls._git_sanity_checks('fake_ancestor_sha', 'master',
829 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000830 ((['git', 'rev-parse', '--show-cdup'],), ''),
831 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000832
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000833 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000834 'diff', '--name-status', '--no-renames', '-r',
835 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000836 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700837 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000838 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000839 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000840 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000841 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000842 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git', 'config', 'user.email'],), 'me@example.com'),
844 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000845 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000846 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000847 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000848 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000849
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000850 @classmethod
851 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700852 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000853 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000854 ref_suffix='', notify=False,
bradnelsond975b302016-10-23 12:20:23 -0700855 post_amend_description=None, issue=None, cc=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000856 if post_amend_description is None:
857 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -0700858 calls = []
bradnelsond975b302016-10-23 12:20:23 -0700859 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000860
tandriia60502f2016-06-20 02:01:53 -0700861 if squash_mode == 'default':
862 calls.extend([
863 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
864 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
865 ])
866 elif squash_mode in ('override_squash', 'override_nosquash'):
867 calls.extend([
868 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
869 'true' if squash_mode == 'override_squash' else 'false'),
870 ])
871 else:
872 assert squash_mode in ('squash', 'nosquash')
873
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000874 # If issue is given, then description is fetched from Gerrit instead.
875 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000876 calls += [
877 ((['git', 'log', '--pretty=format:%s\n\n%b',
878 'fake_ancestor_sha..HEAD'],),
879 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000880 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000881 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000882 # DownloadGerritHook(False)
883 ((False, ),
884 ''),
885 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000886 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000887 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000888 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000889 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000890 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000891 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000892 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000893 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000894 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000895 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000896 if not issue:
897 # Prompting to edit description on first upload.
898 calls += [
899 ((['git', 'config', 'core.editor'],), ''),
900 ((['RunEditor'],), description),
901 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000902 ref_to_push = 'abcdef0123456789'
903 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000904 ((['git', 'config', 'branch.master.merge'],),
905 'refs/heads/master'),
906 ((['git', 'config', 'branch.master.remote'],),
907 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000908 ((['get_or_create_merge_base', 'master',
909 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000910 'origin/master'),
911 ((['git', 'rev-parse', 'HEAD:'],),
912 '0123456789abcdef'),
913 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000914 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000915 ref_to_push),
916 ]
917 else:
918 ref_to_push = 'HEAD'
919
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000920 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000921 ((['git', 'rev-list',
922 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000923 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000924
925 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
926 if ref_suffix:
927 ref_suffix += ',' + notify_suffix
928 else:
929 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000930
ukai@chromium.orge8077812012-02-03 03:41:46 +0000931 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000932 ref_suffix += ',' + ','.join('r=%s' % email
933 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000934 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000935 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000936 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000937 ('remote:\n'
938 'remote: Processing changes: (\)\n'
939 'remote: Processing changes: (|)\n'
940 'remote: Processing changes: (/)\n'
941 'remote: Processing changes: (-)\n'
942 'remote: Processing changes: new: 1 (/)\n'
943 'remote: Processing changes: new: 1, done\n'
944 'remote:\n'
945 'remote: New Changes:\n'
946 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
947 'remote:\n'
948 'To https://chromium.googlesource.com/yyy/zzz\n'
949 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000950 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000951 if squash:
952 calls += [
tandrii33a46ff2016-08-23 05:53:40 -0700953 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -0700954 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000955 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -0700956 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000957 ((['git', 'config', 'branch.master.gerritsquashhash',
958 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000959 ]
tandrii88189772016-09-29 04:29:57 -0700960 calls += [
961 ((['git', 'config', 'rietveld.cc'],), ''),
962 ((['AddReviewers', 'chromium-review.googlesource.com',
963 123456 if squash else None,
bradnelsond975b302016-10-23 12:20:23 -0700964 ['joe@example.com'] + cc, False],), ''),
tandrii88189772016-09-29 04:29:57 -0700965 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000966 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000967 return calls
968
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000969 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000970 self,
971 upload_args,
972 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000973 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -0700974 squash=True,
975 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000976 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000977 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000978 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000979 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -0700980 issue=None,
981 cc=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000982 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -0700983 if squash_mode is None:
984 if '--no-squash' in upload_args:
985 squash_mode = 'nosquash'
986 elif '--squash' in upload_args:
987 squash_mode = 'squash'
988 else:
989 squash_mode = 'default'
990
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000991 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -0700992 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +0000993 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -0700994 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000995 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -0700996 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
997 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -0700998 self.mock(git_cl.gclient_utils, 'RunEditor',
999 lambda *_, **__: self._mocked_call(['RunEditor']))
1000 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -07001001 self.mock(git_cl.gerrit_util, 'AddReviewers',
1002 lambda h, i, add, is_reviewer: self._mocked_call(
1003 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -07001004
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001005 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +00001006 self.calls += self._gerrit_upload_calls(
1007 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001008 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001009 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001010 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001011 post_amend_description=post_amend_description,
bradnelsond975b302016-10-23 12:20:23 -07001012 issue=issue, cc=cc)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001013 # Uncomment when debugging.
1014 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001015 git_cl.main(['upload'] + upload_args)
1016
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001017 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001018 self._run_gerrit_upload_test(
1019 ['--no-squash'],
1020 'desc\n\nBUG=\n',
1021 [],
1022 squash=False,
1023 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1024
1025 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001026 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001027 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001028 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001029 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001030 [],
tandriia60502f2016-06-20 02:01:53 -07001031 squash=False,
1032 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001033 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001034
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001035 def test_gerrit_no_reviewer(self):
1036 self._run_gerrit_upload_test(
1037 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001038 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001039 [],
1040 squash=False,
1041 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001042
tandriieefe8322016-08-17 10:12:24 -07001043 def test_gerrit_patch_bad_chars(self):
1044 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001045 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001046 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001047 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001048 squash=False,
1049 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001050 ref_suffix='%m=Dont_put_bad_chars')
1051 self.assertIn(
1052 'WARNING: Patchset title may only contain alphanumeric chars '
1053 'and spaces. Cleaned up title:\nDont put bad chars\n',
1054 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001055
ukai@chromium.orge8077812012-02-03 03:41:46 +00001056 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001057 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001058 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001059 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001060 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001061 squash=False,
1062 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001063 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001064
1065 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001066 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001067 [],
bradnelsond975b302016-10-23 12:20:23 -07001068 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1069 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001070 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001071 ['reviewer@example.com', 'another@example.com'],
1072 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001073 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001074 ref_suffix='%l=Code-Review+1',
1075 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001076
1077 def test_gerrit_upload_squash_first_is_default(self):
1078 # Mock Gerrit CL description to indicate the first upload.
1079 self.mock(git_cl.Changelist, 'GetDescription',
1080 lambda *_: None)
1081 self._run_gerrit_upload_test(
1082 [],
1083 'desc\nBUG=\n\nChange-Id: 123456789',
1084 [],
1085 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001086
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001087 def test_gerrit_upload_squash_first(self):
1088 # Mock Gerrit CL description to indicate the first upload.
1089 self.mock(git_cl.Changelist, 'GetDescription',
1090 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001091 self._run_gerrit_upload_test(
1092 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001093 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001094 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001095 squash=True,
1096 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001097
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001098 def test_gerrit_upload_squash_reupload(self):
1099 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1100 # Mock Gerrit CL description to indicate re-upload.
1101 self.mock(git_cl.Changelist, 'GetDescription',
1102 lambda *args: description)
1103 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1104 lambda *args: 1)
1105 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1106 lambda *args: {'change_id': '123456789'})
1107 self._run_gerrit_upload_test(
1108 ['--squash'],
1109 description,
1110 [],
1111 squash=True,
1112 expected_upstream_ref='origin/master',
1113 issue=123456)
1114
rmistry@google.com2dd99862015-06-22 12:22:18 +00001115 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001116 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001117 def mock_run_git(*args, **_kwargs):
1118 if args[0] == ['for-each-ref',
1119 '--format=%(refname:short) %(upstream:short)',
1120 'refs/heads']:
1121 # Create a local branch dependency tree that looks like this:
1122 # test1 -> test2 -> test3 -> test4 -> test5
1123 # -> test3.1
1124 # test6 -> test0
1125 branch_deps = [
1126 'test2 test1', # test1 -> test2
1127 'test3 test2', # test2 -> test3
1128 'test3.1 test2', # test2 -> test3.1
1129 'test4 test3', # test3 -> test4
1130 'test5 test4', # test4 -> test5
1131 'test6 test0', # test0 -> test6
1132 'test7', # test7
1133 ]
1134 return '\n'.join(branch_deps)
1135 self.mock(git_cl, 'RunGit', mock_run_git)
1136
1137 class RecordCalls:
1138 times_called = 0
1139 record_calls = RecordCalls()
1140 def mock_CMDupload(*args, **_kwargs):
1141 record_calls.times_called += 1
1142 return 0
1143 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1144
1145 self.calls = [
1146 (('[Press enter to continue or ctrl-C to quit]',), ''),
1147 ]
1148
1149 class MockChangelist():
1150 def __init__(self):
1151 pass
1152 def GetBranch(self):
1153 return 'test1'
1154 def GetIssue(self):
1155 return '123'
1156 def GetPatchset(self):
1157 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001158 def IsGerrit(self):
1159 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001160
1161 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1162 # CMDupload should have been called 5 times because of 5 dependent branches.
1163 self.assertEquals(5, record_calls.times_called)
1164 self.assertEquals(0, ret)
1165
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001166 def test_gerrit_change_id(self):
1167 self.calls = [
1168 ((['git', 'write-tree'], ),
1169 'hashtree'),
1170 ((['git', 'rev-parse', 'HEAD~0'], ),
1171 'branch-parent'),
1172 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1173 'A B <a@b.org> 1456848326 +0100'),
1174 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1175 'C D <c@d.org> 1456858326 +0100'),
1176 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1177 'hashchange'),
1178 ]
1179 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1180 self.assertEqual(change_id, 'Ihashchange')
1181
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001182 def test_desecription_append_footer(self):
1183 for init_desc, footer_line, expected_desc in [
1184 # Use unique desc first lines for easy test failure identification.
1185 ('foo', 'R=one', 'foo\n\nR=one'),
1186 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1187 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1188 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1189 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1190 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1191 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1192 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1193 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1194 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1195 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1196 ]:
1197 desc = git_cl.ChangeDescription(init_desc)
1198 desc.append_footer(footer_line)
1199 self.assertEqual(desc.description, expected_desc)
1200
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001201 def test_update_reviewers(self):
1202 data = [
1203 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001204 ('foo\nR=xx', [], 'foo\nR=xx'),
1205 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001206 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001207 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1208 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1209 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001210 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001211 ('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 +00001212 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001213 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1214 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1215 # Same as the line before, but full of whitespaces.
1216 (
1217 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1218 'foo\nBar\n\nR=c@c\n BUG =',
1219 ),
1220 # Whitespaces aren't interpreted as new lines.
1221 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001222 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001223 expected = [i[2] for i in data]
1224 actual = []
1225 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001226 obj = git_cl.ChangeDescription(orig)
1227 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001228 actual.append(obj.description)
1229 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001230
wittman@chromium.org455dc922015-01-26 20:15:50 +00001231 def test_get_target_ref(self):
1232 # Check remote or remote branch not present.
1233 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1234 self.assertEqual(None, git_cl.GetTargetRef(None,
1235 'refs/remotes/origin/master',
1236 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001237
wittman@chromium.org455dc922015-01-26 20:15:50 +00001238 # Check default target refs for branches.
1239 self.assertEqual('refs/heads/master',
1240 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1241 None, None))
1242 self.assertEqual('refs/heads/master',
1243 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1244 None, None))
1245 self.assertEqual('refs/heads/master',
1246 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1247 None, None))
1248 self.assertEqual('refs/branch-heads/123',
1249 git_cl.GetTargetRef('origin',
1250 'refs/remotes/branch-heads/123',
1251 None, None))
1252 self.assertEqual('refs/diff/test',
1253 git_cl.GetTargetRef('origin',
1254 'refs/remotes/origin/refs/diff/test',
1255 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001256 self.assertEqual('refs/heads/chrome/m42',
1257 git_cl.GetTargetRef('origin',
1258 'refs/remotes/origin/chrome/m42',
1259 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001260
1261 # Check target refs for user-specified target branch.
1262 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1263 'refs/remotes/branch-heads/123'):
1264 self.assertEqual('refs/branch-heads/123',
1265 git_cl.GetTargetRef('origin',
1266 'refs/remotes/origin/master',
1267 branch, None))
1268 for branch in ('origin/master', 'remotes/origin/master',
1269 'refs/remotes/origin/master'):
1270 self.assertEqual('refs/heads/master',
1271 git_cl.GetTargetRef('origin',
1272 'refs/remotes/branch-heads/123',
1273 branch, None))
1274 for branch in ('master', 'heads/master', 'refs/heads/master'):
1275 self.assertEqual('refs/heads/master',
1276 git_cl.GetTargetRef('origin',
1277 'refs/remotes/branch-heads/123',
1278 branch, None))
1279
1280 # Check target refs for pending prefix.
1281 self.assertEqual('prefix/heads/master',
1282 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1283 None, 'prefix/'))
1284
wychen@chromium.orga872e752015-04-28 23:42:18 +00001285 def test_patch_when_dirty(self):
1286 # Patch when local tree is dirty
1287 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1288 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1289
1290 def test_diff_when_dirty(self):
1291 # Do 'git cl diff' when local tree is dirty
1292 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1293 self.assertNotEqual(git_cl.main(['diff']), 0)
1294
tandriidf09a462016-08-18 16:23:55 -07001295 def _patch_common(self, is_gerrit=False, force_codereview=False,
1296 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001297 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001298 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1299 lambda x: '60001')
1300 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
1301 lambda *args: None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001302 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1303 lambda *args: {
1304 'current_revision': '7777777777',
1305 'revisions': {
1306 '1111111111': {
1307 '_number': 1,
1308 'fetch': {'http': {
1309 'url': 'https://chromium.googlesource.com/my/repo',
1310 'ref': 'refs/changes/56/123456/1',
1311 }},
1312 },
1313 '7777777777': {
1314 '_number': 7,
1315 'fetch': {'http': {
1316 'url': 'https://chromium.googlesource.com/my/repo',
1317 'ref': 'refs/changes/56/123456/7',
1318 }},
1319 },
1320 },
1321 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001322 self.mock(git_cl.Changelist, 'GetDescription',
1323 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001324 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1325
tandriidf09a462016-08-18 16:23:55 -07001326 if new_branch:
1327 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1328 else:
1329 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001330 if not force_codereview:
1331 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001332 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001333 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001334 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1335 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001336 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001337 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001338
1339 if is_gerrit:
1340 if not force_codereview:
1341 self.calls += [
1342 ((['git', 'config', 'gerrit.host'],), 'true'),
1343 ]
1344 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001345 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001346 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001347 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1348 ((['git', 'rev-parse', '--show-cdup'],), ''),
1349 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
1350 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001351
tandriidf09a462016-08-18 16:23:55 -07001352 def _common_patch_successful(self, new_branch=False):
1353 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001354 self.calls += [
1355 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
1356 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001357 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001358 'patch from issue 123456 at patchset 60001 ' +
1359 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001360 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001361 ''),
1362 ((['git', 'config', 'branch.master.rietveldserver'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001363 ((['git', 'config', 'branch.master.rietveldserver',
1364 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001365 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001366 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001367 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001368
1369 def test_patch_successful(self):
1370 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001371 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1372
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001373 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001374 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001375 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1376
wychen@chromium.orga872e752015-04-28 23:42:18 +00001377 def test_patch_conflict(self):
1378 self._patch_common()
1379 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001380 ((['git', 'apply', '--index', '-p0', '--3way'],), CERR1),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001381 ]
1382 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001383
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001384 def test_gerrit_patch_successful(self):
1385 self._patch_common(is_gerrit=True)
1386 self.calls += [
1387 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1388 'refs/changes/56/123456/7'],), ''),
1389 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001390 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001391 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001392 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1393 ((['git', 'config', 'branch.master.merge'],), 'master'),
1394 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1395 ((['git', 'config', 'remote.origin.url'],),
1396 'https://chromium.googlesource.com/my/repo'),
1397 ((['git', 'config', 'branch.master.gerritserver',
1398 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001399 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001400 ]
1401 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1402
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001403 def test_patch_force_codereview(self):
1404 self._patch_common(is_gerrit=True, force_codereview=True)
1405 self.calls += [
1406 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1407 'refs/changes/56/123456/7'],), ''),
1408 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1409 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001410 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001411 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001412 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1413 ((['git', 'config', 'branch.master.merge'],), 'master'),
1414 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1415 ((['git', 'config', 'remote.origin.url'],),
1416 'https://chromium.googlesource.com/my/repo'),
1417 ((['git', 'config', 'branch.master.gerritserver',
1418 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001419 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001420 ]
1421 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1422
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001423 def test_gerrit_patch_url_successful(self):
1424 self._patch_common(is_gerrit=True)
1425 self.calls += [
1426 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1427 'refs/changes/56/123456/1'],), ''),
1428 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001429 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001430 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001431 ((['git', 'config', 'branch.master.gerritserver',
1432 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001433 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001434 ]
1435 self.assertEqual(git_cl.main(
1436 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1437
1438 def test_gerrit_patch_conflict(self):
1439 self._patch_common(is_gerrit=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001440 self.calls += [
1441 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1442 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001443 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1444 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1445 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001446 ]
1447 with self.assertRaises(SystemExitMock):
1448 git_cl.main(['patch',
1449 'https://chromium-review.googlesource.com/#/c/123456/1'])
1450
tandriic2405f52016-10-10 08:13:15 -07001451 def test_gerrit_patch_not_exists(self):
1452 url = 'https://chromium-review.googlesource.com'
1453 self.mock(git_cl.gerrit_util, 'GetChangeDetail', lambda _, __, ___: None)
1454 self.calls = [
1455 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1456 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1457 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1458 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1459 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1460 ((['git', 'config', 'gerrit.host'],), 'true'),
1461 ((['DieWithError', 'issue 123456 at ' + url + ' does not exist '
1462 'or you have no access to it'],), SystemExitMock()),
1463 ]
1464 with self.assertRaises(SystemExitMock):
1465 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1466
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001467 def _checkout_calls(self):
1468 return [
1469 ((['git', 'config', '--local', '--get-regexp',
1470 'branch\\..*\\.rietveldissue'], ),
1471 ('branch.retrying.rietveldissue 1111111111\n'
1472 'branch.some-fix.rietveldissue 2222222222\n')),
1473 ((['git', 'config', '--local', '--get-regexp',
1474 'branch\\..*\\.gerritissue'], ),
1475 ('branch.ger-branch.gerritissue 123456\n'
1476 'branch.gbranch654.gerritissue 654321\n')),
1477 ]
1478
1479 def test_checkout_gerrit(self):
1480 """Tests git cl checkout <issue>."""
1481 self.calls = self._checkout_calls()
1482 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1483 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1484
1485 def test_checkout_rietveld(self):
1486 """Tests git cl checkout <issue>."""
1487 self.calls = self._checkout_calls()
1488 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1489 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1490
1491 def test_checkout_not_found(self):
1492 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001493 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001494 self.calls = self._checkout_calls()
1495 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1496
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001497 def test_checkout_no_branch_issues(self):
1498 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001499 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001500 self.calls = [
1501 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001502 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001503 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001504 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001505 ]
1506 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1507
tandrii@chromium.org28253532016-04-14 13:46:56 +00001508 def _test_gerrit_ensure_authenticated_common(self, auth,
1509 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001510 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1511 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1512 self.mock(git_cl, 'DieWithError',
1513 lambda msg: self._mocked_call(['DieWithError', msg]))
1514 self.mock(git_cl, 'ask_for_data',
1515 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001516 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001517 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001518 cl.branch = 'master'
1519 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001520 cl.lookedup_issue = True
1521 return cl
1522
1523 def test_gerrit_ensure_authenticated_missing(self):
1524 cl = self._test_gerrit_ensure_authenticated_common(auth={
1525 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1526 })
1527 self.calls.append(
1528 ((['DieWithError',
1529 'Credentials for the following hosts are required:\n'
1530 ' chromium-review.googlesource.com\n'
1531 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1532 'You can (re)generate your credentails by visiting '
1533 'https://chromium-review.googlesource.com/new-password'],), ''),)
1534 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1535
1536 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001537 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001538 cl = self._test_gerrit_ensure_authenticated_common(auth={
1539 'chromium.googlesource.com': 'one',
1540 'chromium-review.googlesource.com': 'other',
1541 })
1542 self.calls.append(
1543 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001544 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001545 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1546
1547 def test_gerrit_ensure_authenticated_ok(self):
1548 cl = self._test_gerrit_ensure_authenticated_common(auth={
1549 'chromium.googlesource.com': 'same',
1550 'chromium-review.googlesource.com': 'same',
1551 })
1552 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1553
tandrii@chromium.org28253532016-04-14 13:46:56 +00001554 def test_gerrit_ensure_authenticated_skipped(self):
1555 cl = self._test_gerrit_ensure_authenticated_common(
1556 auth={}, skip_auth_check=True)
1557 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1558
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001559 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001560 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1561 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001562 self.calls = [
1563 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001564 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001565 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1566 ((['git', 'config', 'rietveld.server'],), ''),
1567 ((['git', 'config', 'rietveld.server'],), ''),
1568 ((['git', 'config', 'branch.feature.rietveldserver'],),
1569 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001570 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001571 ]
1572 self.assertEqual(0, git_cl.main(['set-commit']))
1573
tandriid9e5ce52016-07-13 02:32:59 -07001574 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001575 self.mock(git_cl.gerrit_util, 'SetReview',
1576 lambda h, i, labels: self._mocked_call(
1577 ['SetReview', h, i, labels]))
1578 self.calls = [
1579 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001580 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1581 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001582 ((['git', 'config', 'branch.feature.gerritserver'],),
1583 'https://chromium-review.googlesource.com'),
1584 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001585 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001586 ]
tandriid9e5ce52016-07-13 02:32:59 -07001587
1588 def test_cmd_set_commit_gerrit_clear(self):
1589 self._cmd_set_commit_gerrit_common(0)
1590 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1591
1592 def test_cmd_set_commit_gerrit_dry(self):
1593 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001594 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1595
tandriid9e5ce52016-07-13 02:32:59 -07001596 def test_cmd_set_commit_gerrit(self):
1597 self._cmd_set_commit_gerrit_common(2)
1598 self.assertEqual(0, git_cl.main(['set-commit']))
1599
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001600 def test_description_display(self):
1601 out = StringIO.StringIO()
1602 self.mock(git_cl.sys, 'stdout', out)
1603
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001604 self.mock(git_cl, 'Changelist', ChangelistMock)
1605 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001606
1607 self.assertEqual(0, git_cl.main(['description', '-d']))
1608 self.assertEqual('foo\n', out.getvalue())
1609
1610 def test_description_rietveld(self):
1611 out = StringIO.StringIO()
1612 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001613 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001614
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001615 self.assertEqual(0, git_cl.main([
1616 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1617 self.assertEqual('foobar\n', out.getvalue())
1618
iannucci3c972b92016-08-17 13:24:10 -07001619 def test_StatusFieldOverrideIssueMissingArgs(self):
1620 out = StringIO.StringIO()
1621 self.mock(git_cl.sys, 'stderr', out)
1622
1623 try:
1624 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1625 except SystemExit as ex:
1626 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001627 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001628
1629 out = StringIO.StringIO()
1630 self.mock(git_cl.sys, 'stderr', out)
1631
1632 try:
1633 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1634 except SystemExit as ex:
1635 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001636 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001637
1638 def test_StatusFieldOverrideIssue(self):
1639 out = StringIO.StringIO()
1640 self.mock(git_cl.sys, 'stdout', out)
1641
1642 def assertIssue(cl_self, *_args):
1643 self.assertEquals(cl_self.issue, 1)
1644 return 'foobar'
1645
1646 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1647 self.calls = [
1648 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1649 ((['git', 'config', 'rietveld.server'],), ''),
1650 ((['git', 'config', 'rietveld.server'],), ''),
1651 ]
iannuccie53c9352016-08-17 14:40:40 -07001652 self.assertEqual(
1653 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1654 0)
iannucci3c972b92016-08-17 13:24:10 -07001655 self.assertEqual(out.getvalue(), 'foobar\n')
1656
iannuccie53c9352016-08-17 14:40:40 -07001657 def test_SetCloseOverrideIssue(self):
1658 def assertIssue(cl_self, *_args):
1659 self.assertEquals(cl_self.issue, 1)
1660 return 'foobar'
1661
1662 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1663 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1664 self.calls = [
1665 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1666 ((['git', 'config', 'rietveld.server'],), ''),
1667 ((['git', 'config', 'rietveld.server'],), ''),
1668 ]
1669 self.assertEqual(
1670 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1671
1672 def test_SetCommitOverrideIssue(self):
1673 def assertIssue(cl_self, *_args):
1674 self.assertEquals(cl_self.issue, 1)
1675 return 'foobar'
1676
1677 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1678 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1679 self.calls = [
1680 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1681 ((['git', 'config', 'rietveld.server'],), ''),
1682 ((['git', 'config', 'rietveld.server'],), ''),
1683 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1684 ((['git', 'config', 'rietveld.server'],), ''),
1685 ((['git', 'config', 'rietveld.server'],), ''),
1686 ]
1687 self.assertEqual(
1688 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1689
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001690 def test_description_gerrit(self):
1691 out = StringIO.StringIO()
1692 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001693 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001694
1695 self.assertEqual(0, git_cl.main([
1696 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1697 self.assertEqual('foobar\n', out.getvalue())
1698
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001699 def test_description_set_raw(self):
1700 out = StringIO.StringIO()
1701 self.mock(git_cl.sys, 'stdout', out)
1702
1703 self.mock(git_cl, 'Changelist', ChangelistMock)
1704 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1705
1706 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1707 self.assertEqual('hihi', ChangelistMock.desc)
1708
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001709 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001710 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001711
1712 def RunEditor(desc, _, **kwargs):
1713 self.assertEquals(
1714 '# Enter a description of the change.\n'
1715 '# This will be displayed on the codereview site.\n'
1716 '# The first line will also be used as the subject of the review.\n'
1717 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001718 '--------------------\n'
1719 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001720 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001721 # Simulate user changing something.
1722 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001723
dsansomee2d6fd92016-09-08 00:10:47 -07001724 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001725 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001726
1727 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1728 self.mock(git_cl.Changelist, 'GetDescription',
1729 lambda *args: current_desc)
1730 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1731 UpdateDescriptionRemote)
1732 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1733
1734 self.calls = [
1735 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001736 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001737 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1738 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001739 ((['git', 'config', 'core.editor'],), 'vi'),
1740 ]
1741 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1742
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001743 def test_description_set_stdin(self):
1744 out = StringIO.StringIO()
1745 self.mock(git_cl.sys, 'stdout', out)
1746
1747 self.mock(git_cl, 'Changelist', ChangelistMock)
1748 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1749
1750 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1751 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1752
kmarshall3bff56b2016-06-06 18:31:47 -07001753 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001754 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1755
kmarshall3bff56b2016-06-06 18:31:47 -07001756 self.calls = \
1757 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1758 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07001759 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001760 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1761 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07001762 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1763 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1764 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001765 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1766 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1767 ((['git', 'branch', '-D', 'foo'],), '')]
1768
kmarshall3bff56b2016-06-06 18:31:47 -07001769 self.mock(git_cl, 'get_cl_statuses',
1770 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001771 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1772 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1773 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001774
1775 self.assertEqual(0, git_cl.main(['archive', '-f']))
1776
1777 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001778 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001779 self.calls = \
1780 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1781 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07001782 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001783 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1784 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001785 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1786
kmarshall9249e012016-08-23 12:02:16 -07001787 self.mock(git_cl, 'get_cl_statuses',
1788 lambda branches, fine_grained, max_processes:
1789 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
1790
1791 self.assertEqual(1, git_cl.main(['archive', '-f']))
1792
1793 def test_archive_dry_run(self):
1794 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1795
1796 self.calls = \
1797 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1798 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1799 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1800 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1801 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1802 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1803 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1804 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1805 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07001806
1807 self.mock(git_cl, 'get_cl_statuses',
1808 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001809 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1810 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1811 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001812
kmarshall9249e012016-08-23 12:02:16 -07001813 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
1814
1815 def test_archive_no_tags(self):
1816 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1817
1818 self.calls = \
1819 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1820 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1821 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1822 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1823 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1824 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1825 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1826 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1827 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1828 ((['git', 'branch', '-D', 'foo'],), '')]
1829
1830 self.mock(git_cl, 'get_cl_statuses',
1831 lambda branches, fine_grained, max_processes:
1832 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1833 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1834 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
1835
1836 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07001837
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001838 def test_cmd_issue_erase_existing(self):
1839 out = StringIO.StringIO()
1840 self.mock(git_cl.sys, 'stdout', out)
1841 self.calls = [
1842 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001843 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1844 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001845 # Let this command raise exception (retcode=1) - it should be ignored.
1846 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07001847 CERR1),
1848 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1849 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001850 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1851 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1852 ''),
1853 ]
1854 self.assertEqual(0, git_cl.main(['issue', '0']))
1855
phajdan.jre328cf92016-08-22 04:12:17 -07001856 def test_cmd_issue_json(self):
1857 out = StringIO.StringIO()
1858 self.mock(git_cl.sys, 'stdout', out)
1859 self.calls = [
1860 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001861 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07001862 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1863 ((['git', 'config', 'rietveld.server'],),
1864 'https://codereview.chromium.org'),
1865 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1866 (('write_json', 'output.json',
1867 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
1868 ''),
1869 ]
1870 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
1871
tandriide281ae2016-10-12 06:02:30 -07001872 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07001873 self.mock(git_cl.Changelist, 'GetChange',
1874 lambda _, *a: (
1875 self._mocked_call(['GetChange']+list(a))))
1876 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1877 lambda *_, **__: (
1878 self._mocked_call(['DoGetTryMasters'])))
1879 self.mock(git_cl.presubmit_support, 'DoGetTrySlaves',
1880 lambda *_, **__: (
1881 self._mocked_call(['DoGetTrySlaves'])))
1882 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
1883 lambda _, s: self._mocked_call(['SetCQState', s]))
1884 self.calls = [
1885 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001886 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07001887 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1888 ((['git', 'config', 'rietveld.server'],),
1889 'https://codereview.chromium.org'),
1890 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1891 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1892 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1893 ((['get_or_create_merge_base', 'feature', 'feature'],),
1894 'fake_ancestor_sha'),
1895 ((['GetChange', 'fake_ancestor_sha', None], ),
1896 git_cl.presubmit_support.GitChange(
1897 '', '', '', '', '', '', '', '')),
1898 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1899 ((['DoGetTryMasters'], ), None),
1900 ((['DoGetTrySlaves'], ), None),
1901 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1902 ]
1903 out = StringIO.StringIO()
1904 self.mock(git_cl.sys, 'stdout', out)
1905 self.assertEqual(0, git_cl.main(['try']))
1906 self.assertEqual(
1907 out.getvalue(),
1908 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
1909
tandriide281ae2016-10-12 06:02:30 -07001910 def test_git_cl_try_buildbucket_with_properties(self):
1911 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
1912 self.mock(git_cl.Changelist, 'GetIssueOwner', lambda _: 'owner@e.mail')
1913 self.mock(git_cl.Changelist, 'GetIssueProject', lambda _: 'depot_tools')
1914 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
1915 self.calls = [
1916 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1917 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1918 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1919 ((['git', 'config', 'rietveld.server'],),
1920 'https://codereview.chromium.org'),
1921 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
1922 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1923 ]
1924
1925 def _buildbucket_retry(*_, **kw):
1926 # self.maxDiff = 10000
1927 body = json.loads(kw['body'])
1928 self.assertEqual(len(body['builds']), 1)
1929 build = body['builds'][0]
1930 params = json.loads(build.pop('parameters_json'))
1931 self.assertEqual(params, {
1932 u'builder_name': u'win',
1933 u'changes': [{u'author': {u'email': u'owner@e.mail'},
1934 u'revision': None}],
1935 u'properties': {
1936 u'category': u'git_cl_try',
1937 u'issue': 123,
1938 u'key': u'val',
1939 u'json': [{u'a': 1}, None],
1940 u'master': u'tryserver.chromium',
1941 u'patch_project': u'depot_tools',
1942 u'patch_storage': u'rietveld',
1943 u'patchset': 20001,
1944 u'reason': u'feature', # This is a branch name, but why?
1945 u'rietveld': u'https://codereview.chromium.org',
1946 }
1947 })
1948 self.assertEqual(build, {
1949 u'bucket': u'master.tryserver.chromium',
1950 u'client_operation_id': u'uuid4',
1951 u'tags': [u'builder:win',
1952 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07001953 u'user_agent:git_cl_try',
1954 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07001955 })
1956
1957 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
1958
1959 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1960 self.assertEqual(0, git_cl.main([
1961 'try', '-m', 'tryserver.chromium', '-b', 'win',
1962 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
1963 self.assertRegexpMatches(
1964 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07001965 'Tried jobs on:\nBucket: master.tryserver.chromium')
1966
1967 def test_git_cl_try_buildbucket_bucket_flag(self):
1968 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
1969 self.mock(git_cl.Changelist, 'GetIssueOwner', lambda _: 'owner@e.mail')
1970 self.mock(git_cl.Changelist, 'GetIssueProject', lambda _: 'depot_tools')
1971 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
1972 self.calls = [
1973 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1974 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1975 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1976 ((['git', 'config', 'rietveld.server'],),
1977 'https://codereview.chromium.org'),
1978 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
1979 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1980 ]
1981
1982 def _buildbucket_retry(*_, **kw):
1983 # self.maxDiff = 10000
1984 body = json.loads(kw['body'])
1985 self.assertEqual(len(body['builds']), 1)
1986 build = body['builds'][0]
1987 params = json.loads(build.pop('parameters_json'))
1988 self.assertEqual(params, {
1989 u'builder_name': u'win',
1990 u'changes': [{u'author': {u'email': u'owner@e.mail'},
1991 u'revision': None}],
1992 u'properties': {
1993 u'category': u'git_cl_try',
1994 u'issue': 123,
1995 u'patch_project': u'depot_tools',
1996 u'patch_storage': u'rietveld',
1997 u'patchset': 20001,
1998 u'reason': u'feature', # This is a branch name, but why?
1999 u'rietveld': u'https://codereview.chromium.org',
2000 }
2001 })
2002 self.assertEqual(build, {
2003 u'bucket': u'test.bucket',
2004 u'client_operation_id': u'uuid4',
2005 u'tags': [u'builder:win',
2006 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2007 u'user_agent:git_cl_try'],
2008 })
2009
2010 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2011
2012 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2013 self.assertEqual(0, git_cl.main([
2014 'try', '-B', 'test.bucket', '-b', 'win']))
2015 self.assertRegexpMatches(
2016 git_cl.sys.stdout.getvalue(),
2017 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002018
tandrii16e0b4e2016-06-07 10:34:28 -07002019 def _common_GerritCommitMsgHookCheck(self):
2020 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2021 self.mock(git_cl.os.path, 'abspath',
2022 lambda path: self._mocked_call(['abspath', path]))
2023 self.mock(git_cl.os.path, 'exists',
2024 lambda path: self._mocked_call(['exists', path]))
2025 self.mock(git_cl.gclient_utils, 'FileRead',
2026 lambda path: self._mocked_call(['FileRead', path]))
2027 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2028 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2029 self.calls = [
2030 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2031 ((['abspath', '../'],), '/abs/git_repo_root'),
2032 ]
2033 return git_cl.Changelist(codereview='gerrit', issue=123)
2034
2035 def test_GerritCommitMsgHookCheck_custom_hook(self):
2036 cl = self._common_GerritCommitMsgHookCheck()
2037 self.calls += [
2038 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2039 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2040 '#!/bin/sh\necho "custom hook"')
2041 ]
2042 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2043
2044 def test_GerritCommitMsgHookCheck_not_exists(self):
2045 cl = self._common_GerritCommitMsgHookCheck()
2046 self.calls += [
2047 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2048 ]
2049 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2050
2051 def test_GerritCommitMsgHookCheck(self):
2052 cl = self._common_GerritCommitMsgHookCheck()
2053 self.calls += [
2054 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2055 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2056 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2057 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2058 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2059 ''),
2060 ]
2061 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2062
tandriic4344b52016-08-29 06:04:54 -07002063 def test_GerritCmdLand(self):
2064 self.calls += [
2065 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2066 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2067 'deadbeaf'),
2068 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2069 ((['git', 'config', 'branch.feature.gerritserver'],),
2070 'chromium-review.googlesource.com'),
2071 ]
2072 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2073 cl._codereview_impl._GetChangeDetail = lambda _: {
2074 'labels': {},
2075 'current_revision': 'deadbeaf',
2076 }
2077 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002078 out = StringIO.StringIO()
2079 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002080 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002081 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
tandriic4344b52016-08-29 06:04:54 -07002082
tandrii221ab252016-10-06 08:12:04 -07002083 BUILDBUCKET_BUILDS_MAP = {
2084 '9000': {
2085 'id': '9000',
2086 'status': 'STARTED',
2087 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2088 'result_details_json': '{"properties": {}}',
2089 'bucket': 'master.x.y',
2090 'created_by': 'user:someone@chromium.org',
2091 'created_ts': '147200002222000',
2092 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2093 },
2094 '8000': {
2095 'id': '8000',
2096 'status': 'COMPLETED',
2097 'result': 'FAILURE',
2098 'failure_reason': 'BUILD_FAILURE',
2099 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2100 'result_details_json': '{"properties": {}}',
2101 'bucket': 'master.x.y',
2102 'created_by': 'user:someone@chromium.org',
2103 'created_ts': '147200001111000',
2104 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2105 },
2106 }
2107
2108 def test_write_try_results_json(self):
2109 expected_output = [
2110 {
2111 'buildbucket_id': '8000',
2112 'bucket': 'master.x.y',
2113 'builder_name': 'my-builder',
2114 'status': 'COMPLETED',
2115 'result': 'FAILURE',
2116 'failure_reason': 'BUILD_FAILURE',
2117 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2118 },
2119 {
2120 'buildbucket_id': '9000',
2121 'bucket': 'master.x.y',
2122 'builder_name': 'my-builder',
2123 'status': 'STARTED',
2124 'result': None,
2125 'failure_reason': None,
2126 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2127 }
2128 ]
2129 self.calls = [(('write_json', 'output.json', expected_output), '')]
2130 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2131
tandrii45b2a582016-10-11 03:14:16 -07002132 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002133 out = StringIO.StringIO()
2134 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002135 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2136 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002137 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2138 self._mocked_call(['get_authenticator_for_host', host]))
2139 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2140 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002141
2142 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2143 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002144 self.calls += [
2145 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2146 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2147 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2148 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2149 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2150 ((['git', 'config', 'branch.feature.rietveldserver'],),
2151 'codereview.example.com'),
2152 ((['get_authenticator_for_host', 'codereview.example.com'],),
2153 AuthenticatorMock()),
2154 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2155
2156 def test_fetch_try_jobs_none_rietveld(self):
2157 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002158 # Simulate that user isn't logged in.
2159 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002160 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002161 self.assertRegexpMatches(sys.stdout.getvalue(),
2162 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002163 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2164
2165 def test_fetch_try_jobs_some_rietveld(self):
2166 self._setup_fetch_try_jobs_rietveld({
2167 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2168 })
2169 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002170 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2171 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2172 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2173
2174 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2175 self._setup_fetch_try_jobs(most_recent_patchset=13)
2176 self.calls += [
2177 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2178 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2179 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
2180 # Simulate that Gerrit has more patchsets than local.
2181 ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
2182 ((['git', 'config', 'branch.feature.gerritserver'],),
2183 'https://x-review.googlesource.com'),
2184 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2185 AuthenticatorMock()),
2186 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2187
2188 def test_fetch_try_jobs_none_gerrit(self):
2189 self._setup_fetch_try_jobs_gerrit({})
2190 self.assertEqual(0, git_cl.main(['try-results']))
2191 self.assertRegexpMatches(
2192 sys.stdout.getvalue(),
2193 r'Warning: Codereview server has newer patchsets \(13\)')
2194 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2195
2196 def test_fetch_try_jobs_some_gerrit(self):
2197 self._setup_fetch_try_jobs_gerrit({
2198 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2199 })
2200 # Explicit --patchset means actual local patchset doesn't matter.
2201 self.calls.remove(
2202 ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
2203 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2204
2205 # ... and doesn't result in warning.
2206 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2207 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002208 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2209 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2210
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002211
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002212if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002213 git_cl.logging.basicConfig(
2214 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002215 unittest.main()