blob: 2985d36c6e1eb6c5a96d7600814ff5d1ee472967 [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
8import os
maruel@chromium.orga3353652011-11-30 14:26:57 +00009import StringIO
ukai@chromium.org78c4b982012-02-14 02:20:26 +000010import stat
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
100
101
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000102def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
103 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
104
105 Usage:
106 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
107 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
108
109 OR
110 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
111 CookiesAuthenticatorMockFactory(cookie='cookie'))
112 """
113 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
114 def __init__(self): # pylint: disable=W0231
115 # Intentionally not calling super() because it reads actual cookie files.
116 pass
117 @classmethod
118 def get_gitcookies_path(cls):
119 return '~/.gitcookies'
120 @classmethod
121 def get_netrc_path(cls):
122 return '~/.netrc'
123 def get_auth_header(self, host):
124 if same_cookie:
125 return same_cookie
126 return (hosts_with_creds or {}).get(host)
127 return CookiesAuthenticatorMock
128
kmarshall9249e012016-08-23 12:02:16 -0700129class MockChangelistWithBranchAndIssue():
130 def __init__(self, branch, issue):
131 self.branch = branch
132 self.issue = issue
133 def GetBranch(self):
134 return self.branch
135 def GetIssue(self):
136 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000137
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000138class TestGitClBasic(unittest.TestCase):
139 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
140 parsed = urlparse.urlparse(url)
141 result = func(parsed)
142 if fail:
143 self.assertIsNone(result)
144 return None
145 self.assertIsNotNone(result)
146 self.assertEqual(result.issue, issue)
147 self.assertEqual(result.patchset, patchset)
148 self.assertEqual(result.hostname, hostname)
149 return result
150
151 def test_ParseIssueURL_rietveld(self):
152 def test(url, issue=None, patchset=None, hostname=None, patch_url=None,
153 fail=None):
154 result = self._test_ParseIssueUrl(
155 git_cl._RietveldChangelistImpl.ParseIssueURL,
156 url, issue, patchset, hostname, fail)
157 if not fail:
158 self.assertEqual(result.patch_url, patch_url)
159
160 test('http://codereview.chromium.org/123',
161 123, None, 'codereview.chromium.org')
162 test('https://codereview.chromium.org/123',
163 123, None, 'codereview.chromium.org')
164 test('https://codereview.chromium.org/123/',
165 123, None, 'codereview.chromium.org')
166 test('https://codereview.chromium.org/123/whatever',
167 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700168 test('https://codereview.chromium.org/123/#ps20001',
169 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000170 test('http://codereview.chromium.org/download/issue123_4.diff',
171 123, 4, 'codereview.chromium.org',
172 patch_url='https://codereview.chromium.org/download/issue123_4.diff')
173 # This looks like bad Gerrit, but is actually valid Rietveld.
174 test('https://chrome-review.source.com/123/4/',
175 123, None, 'chrome-review.source.com')
176
177 test('https://codereview.chromium.org/deadbeaf', fail=True)
178 test('https://codereview.chromium.org/api/123', fail=True)
179 test('bad://codereview.chromium.org/123', fail=True)
180 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
181
182 def test_ParseIssueURL_gerrit(self):
183 def test(url, issue=None, patchset=None, hostname=None, fail=None):
184 self._test_ParseIssueUrl(
185 git_cl._GerritChangelistImpl.ParseIssueURL,
186 url, issue, patchset, hostname, fail)
187
188 test('http://chrome-review.source.com/c/123',
189 123, None, 'chrome-review.source.com')
190 test('https://chrome-review.source.com/c/123/',
191 123, None, 'chrome-review.source.com')
192 test('https://chrome-review.source.com/c/123/4',
193 123, 4, 'chrome-review.source.com')
194 test('https://chrome-review.source.com/#/c/123/4',
195 123, 4, 'chrome-review.source.com')
196 test('https://chrome-review.source.com/c/123/4',
197 123, 4, 'chrome-review.source.com')
198 test('https://chrome-review.source.com/123',
199 123, None, 'chrome-review.source.com')
200 test('https://chrome-review.source.com/123/4',
201 123, 4, 'chrome-review.source.com')
202
203 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
204 test('https://chrome-review.source.com/c/abc/', fail=True)
205 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
206
207 def test_ParseIssueNumberArgument(self):
208 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
209 result = git_cl.ParseIssueNumberArgument(arg)
210 self.assertIsNotNone(result)
211 if fail:
212 self.assertFalse(result.valid)
213 else:
214 self.assertEqual(result.issue, issue)
215 self.assertEqual(result.patchset, patchset)
216 self.assertEqual(result.hostname, hostname)
217
218 test('123', 123)
219 test('', fail=True)
220 test('abc', fail=True)
221 test('123/1', fail=True)
222 test('123a', fail=True)
223 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
224 # Rietveld.
225 test('https://codereview.source.com/123',
226 123, None, 'codereview.source.com')
227 test('https://codereview.source.com/www123', fail=True)
228 # Gerrrit.
229 test('https://chrome-review.source.com/c/123/4',
230 123, 4, 'chrome-review.source.com')
231 test('https://chrome-review.source.com/bad/123/4', fail=True)
232
tandriif9aefb72016-07-01 09:06:51 -0700233 def test_get_bug_line_values(self):
234 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
235 self.assertEqual(f('', ''), [])
236 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
237 self.assertEqual(f('v8', '456'), ['v8:456'])
238 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
239 # Not nice, but not worth carying.
240 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
241 ['v8:456', 'chromium:123', 'v8:123'])
242
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000243
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000244class TestGitCl(TestCase):
245 def setUp(self):
246 super(TestGitCl, self).setUp()
247 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700248 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000249 self.mock(subprocess2, 'call', self._mocked_call)
250 self.mock(subprocess2, 'check_call', self._mocked_call)
251 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700252 self.mock(subprocess2, 'communicate',
253 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000254 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000255 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000256 self.mock(git_common, 'get_or_create_merge_base',
257 lambda *a: (
258 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000259 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000260 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000261 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700262 self.mock(git_cl, 'write_json', lambda path, contents:
263 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000264 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000265 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000266 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000267 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000268 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000269 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000270 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
271 classmethod(lambda _: False))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000272 # It's important to reset settings to not have inter-tests interference.
273 git_cl.settings = None
274
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000275
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000276 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000277 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000278 # Note: has_failed returns True if at least 1 test ran so far, current
279 # included, has failed. That means current test may have actually ran
280 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000281 if not self.has_failed():
282 self.assertEquals([], self.calls)
283 finally:
284 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000285
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000286 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000287 self.assertTrue(
288 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700289 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000290 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000291 expected_args, result = top
292
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000293 # Also logs otherwise it could get caught in a try/finally and be hard to
294 # diagnose.
295 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700296 N = 5
297 prior_calls = '\n '.join(
298 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
299 for i, c in enumerate(self._calls_done[-N:]))
300 following_calls = '\n '.join(
301 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
302 for i, c in enumerate(self.calls[:N]))
303 extended_msg = (
304 'A few prior calls:\n %s\n\n'
305 'This (expected):\n @%d: %r\n'
306 'This (actual):\n @%d: %r\n\n'
307 'A few following expected calls:\n %s' %
308 (prior_calls, len(self._calls_done), expected_args,
309 len(self._calls_done), args, following_calls))
310 git_cl.logging.error(extended_msg)
311
tandrii99a72f22016-08-17 14:33:24 -0700312 self.fail('@%d\n'
313 ' Expected: %r\n'
314 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700315 len(self._calls_done), expected_args, args))
316
317 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700318 if isinstance(result, Exception):
319 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000320 return result
321
maruel@chromium.orga3353652011-11-30 14:26:57 +0000322 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000323 def _is_gerrit_calls(cls, gerrit=False):
324 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
325 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
326
327 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000328 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000329 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000330 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000331
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000332 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000333 def _upload_no_rev_calls(cls, similarity, find_copies):
334 return (cls._git_base_calls(similarity, find_copies) +
335 cls._git_upload_no_rev_calls())
336
337 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000338 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000339 if similarity is None:
340 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700341 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700342 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000343 else:
tandrii33a46ff2016-08-23 05:53:40 -0700344 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700345 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000346
347 if find_copies is None:
348 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700349 find_copies_call = ((['git', 'config', '--bool',
350 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000351 else:
tandrii5d48c322016-08-18 16:19:37 -0700352 val = str(find_copies).lower()
353 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000354 'branch.master.git-find-copies', val],), '')
355
356 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000357 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000358 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000359 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000360 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000361 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000362 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000363
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000364 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000365 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000366 similarity_call,
367 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
368 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000369 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000370 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700371 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
372 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000373 ((['git', 'config', 'rietveld.server'],),
374 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000375 ((['git', 'config', 'branch.master.merge'],), 'master'),
376 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000377 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000378 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000379 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000380 ((['git', 'rev-parse', '--show-cdup'],), ''),
381 ((['git', 'rev-parse', 'HEAD'],), '12345'),
382 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000383 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000384 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700385 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000386 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000387 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000388 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000389 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000390 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000391 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000392 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000393 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000394 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000395 ]
396
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000397 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000398 def _git_upload_no_rev_calls(cls):
399 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000400 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000401 ]
402
403 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000404 def _git_upload_calls(cls, private):
405 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000406 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000407 private_call = []
408 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000409 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000410 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000411 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000412
maruel@chromium.orga3353652011-11-30 14:26:57 +0000413 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000414 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000415 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000416 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000417 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000418 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000419 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
420 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000421 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000422 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000423 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700424 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000425 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000426 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000427 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700428 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000429 ] + cls._git_post_upload_calls()
430
431 @classmethod
432 def _git_post_upload_calls(cls):
433 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000434 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
435 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
436 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000437 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000438 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000439 ]
440
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000441 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000442 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000443 fake_ancestor = 'fake_ancestor'
444 fake_cl = 'fake_cl_for_patch'
445 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000446 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000447 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000448 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000449 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000450 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000451 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000452 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000453 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700454 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000455 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000456 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000457 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000458 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000459 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000460 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000461 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000462 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000463 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000464 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000465 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000466
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000467 @classmethod
468 def _dcommit_calls_1(cls):
469 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000470 ((['git', 'config', 'rietveld.autoupdate'],),
471 ''),
472 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
473 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000474 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000475 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000476 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
477 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
478 None),
479 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000480 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700481 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700482 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000483 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700484 ((['git', 'config', '--bool',
485 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000486 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
487 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700488 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000489 ((['git',
490 'config', 'rietveld.server'],), 'codereview.example.com'),
491 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000492 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000493 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000494 ((['git', 'config', 'branch.working.merge'],),
495 'refs/heads/master'),
496 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000497 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000498 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000499 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000500 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000501 'refs/remotes/origin/master'],),
502 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000503 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000504 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000505 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000506 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000507 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000508 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000509 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000510 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000511 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000512 ]
513
514 @classmethod
515 def _dcommit_calls_normal(cls):
516 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000517 ((['git', 'rev-parse', '--show-cdup'],), ''),
518 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000519 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000520 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000521 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000522 '.'],),
523 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000524 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700525 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000526 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000527 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000528 ((['git', 'config', 'user.email'],), 'author@example.com'),
529 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000530 ]
531
532 @classmethod
533 def _dcommit_calls_bypassed(cls):
534 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000535 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000536 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000537 ]
538
539 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000540 def _dcommit_calls_3(cls):
541 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000542 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000543 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000544 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000545 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000546 (' PRESUBMIT.py | 2 +-\n'
547 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000548 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700549 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000550 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
551 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700552 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000553 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000554 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
555 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
556 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000557 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000558 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000559 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000560 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000561 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000562 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000563 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000564 ((['git', 'checkout', '-q', 'working'],), ''),
565 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000566 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000567
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000568 @staticmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000569 def _cmd_line(description, args, similarity, find_copies, private):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000570 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000571 return [
572 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000573 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000574 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000575 ] + args + [
576 '--cc', 'joe@example.com',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000577 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000578 '--git_similarity', similarity or '50'
579 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000580 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000581 ]
582
583 def _run_reviewer_test(
584 self,
585 upload_args,
586 expected_description,
587 returned_description,
588 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000589 reviewers,
590 private=False):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000591 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000592 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000593 try:
594 similarity = upload_args[upload_args.index('--similarity')+1]
595 except ValueError:
596 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000597
598 if '--find-copies' in upload_args:
599 find_copies = True
600 elif '--no-find-copies' in upload_args:
601 find_copies = False
602 else:
603 find_copies = None
604
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000605 private = '--private' in upload_args
606
607 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000608
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000609 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000610 self.assertEquals(
611 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000612 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000613 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000614 '#--------------------This line is 72 characters long'
615 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000616 expected_description,
617 desc)
618 return returned_description
619 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000620
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000621 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000622 cmd_line = self._cmd_line(final_description, reviewers, similarity,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000623 find_copies, private)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000624 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000625 return 1, 2
626 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000627
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000628 git_cl.main(['upload'] + upload_args)
629
630 def test_no_reviewer(self):
631 self._run_reviewer_test(
632 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000633 'desc\n\nBUG=',
634 '# Blah blah comment.\ndesc\n\nBUG=',
635 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000636 [])
637
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000638 def test_keep_similarity(self):
639 self._run_reviewer_test(
640 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000641 'desc\n\nBUG=',
642 '# Blah blah comment.\ndesc\n\nBUG=',
643 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000644 [])
645
iannucci@chromium.org79540052012-10-19 23:15:26 +0000646 def test_keep_find_copies(self):
647 self._run_reviewer_test(
648 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000649 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000650 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000651 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000652 [])
653
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000654 def test_private(self):
655 self._run_reviewer_test(
656 ['--private'],
657 'desc\n\nBUG=',
658 '# Blah blah comment.\ndesc\n\nBUG=\n',
659 'desc\n\nBUG=',
660 [])
661
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000662 def test_reviewers_cmd_line(self):
663 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000664 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000665 self._run_reviewer_test(
666 ['-r' 'foo@example.com'],
667 description,
668 '\n%s\n' % description,
669 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000670 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000671
672 def test_reviewer_tbr_overriden(self):
673 # Reviewer is overriden with TBR
674 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000675 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000676 self._run_reviewer_test(
677 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000678 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000679 description.strip('\n'),
680 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000681 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000682
683 def test_reviewer_multiple(self):
684 # Handles multiple R= or TBR= lines.
685 description = (
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000686 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000687 self._run_reviewer_test(
688 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000689 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000690 description,
691 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000692 ['--reviewers=another@example.com,reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000693
maruel@chromium.orga3353652011-11-30 14:26:57 +0000694 def test_reviewer_send_mail(self):
695 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000696 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000697 self._run_reviewer_test(
698 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000699 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000700 description.strip('\n'),
701 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000702 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000703
704 def test_reviewer_send_mail_no_rev(self):
705 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000706 stdout = StringIO.StringIO()
707 stderr = StringIO.StringIO()
maruel@chromium.orga3353652011-11-30 14:26:57 +0000708 try:
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000709 self.calls = self._upload_no_rev_calls(None, None)
710 def RunEditor(desc, _, **kwargs):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000711 return desc
712 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000713 self.mock(sys, 'stdout', stdout)
714 self.mock(sys, 'stderr', stderr)
maruel@chromium.orga3353652011-11-30 14:26:57 +0000715 git_cl.main(['upload', '--send-mail'])
716 self.fail()
717 except SystemExit:
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000718 self.assertEqual(
719 'Using 50% similarity for rename/copy detection. Override with '
720 '--similarity.\n',
721 stdout.getvalue())
722 self.assertEqual(
723 'Must specify reviewers to send email.\n', stderr.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000724
tandriif9aefb72016-07-01 09:06:51 -0700725 def test_bug_on_cmd(self):
726 self._run_reviewer_test(
727 ['--bug=500658,proj:123'],
728 'desc\n\nBUG=500658\nBUG=proj:123',
729 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
730 'desc\n\nBUG=500658\nBUG=proj:1234',
731 [])
732
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000733 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000734 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000735 self.calls = (
736 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000737 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000738 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000739 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000740 git_cl.main(['dcommit'])
741
742 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000743 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000744 self.calls = (
745 self._dcommit_calls_1() +
746 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000747 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000748 git_cl.main(['dcommit', '--bypass-hooks'])
749
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000750
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000751 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000752 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000753 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000754 if skip_auth_check:
755 return [((cmd, ), 'true')]
756
tandrii5d48c322016-08-18 16:19:37 -0700757 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000758 if issue:
759 calls.extend([
760 ((['git', 'config', 'branch.master.gerritserver'],), ''),
761 ])
762 calls.extend([
763 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
764 ((['git', 'config', 'branch.master.remote'],), 'origin'),
765 ((['git', 'config', 'remote.origin.url'],),
766 'https://chromium.googlesource.com/my/repo'),
767 ((['git', 'config', 'remote.origin.url'],),
768 'https://chromium.googlesource.com/my/repo'),
769 ])
770 return calls
771
772 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000773 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000774 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000775 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700776 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -0700777 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000778 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700779 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
780 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000781 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000782 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700783 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
784 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -0700785 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000786 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000787 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000788 ((['get_or_create_merge_base', 'master',
789 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000790 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000791 # Calls to verify branch point is ancestor
792 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
793 cls._git_sanity_checks('fake_ancestor_sha', 'master',
794 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000795 ((['git', 'rev-parse', '--show-cdup'],), ''),
796 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000797
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000798 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000799 'diff', '--name-status', '--no-renames', '-r',
800 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000801 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700802 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000803 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000804 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000805 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000806 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000807 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000808 ((['git', 'config', 'user.email'],), 'me@example.com'),
809 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000810 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000811 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000812 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000813 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000814
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000815 @classmethod
816 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700817 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000818 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000819 ref_suffix='', notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000820 post_amend_description=None, issue=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000821 if post_amend_description is None:
822 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -0700823 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000824
tandriia60502f2016-06-20 02:01:53 -0700825 if squash_mode == 'default':
826 calls.extend([
827 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
828 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
829 ])
830 elif squash_mode in ('override_squash', 'override_nosquash'):
831 calls.extend([
832 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
833 'true' if squash_mode == 'override_squash' else 'false'),
834 ])
835 else:
836 assert squash_mode in ('squash', 'nosquash')
837
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000838 # If issue is given, then description is fetched from Gerrit instead.
839 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000840 calls += [
841 ((['git', 'log', '--pretty=format:%s\n\n%b',
842 'fake_ancestor_sha..HEAD'],),
843 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000844 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000845 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000846 # DownloadGerritHook(False)
847 ((False, ),
848 ''),
849 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000850 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000851 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000852 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000853 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000854 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000855 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000856 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000857 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000858 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000859 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000860 if not issue:
861 # Prompting to edit description on first upload.
862 calls += [
863 ((['git', 'config', 'core.editor'],), ''),
864 ((['RunEditor'],), description),
865 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000866 ref_to_push = 'abcdef0123456789'
867 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000868 ((['git', 'config', 'branch.master.merge'],),
869 'refs/heads/master'),
870 ((['git', 'config', 'branch.master.remote'],),
871 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000872 ((['get_or_create_merge_base', 'master',
873 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000874 'origin/master'),
875 ((['git', 'rev-parse', 'HEAD:'],),
876 '0123456789abcdef'),
877 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000878 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000879 ref_to_push),
880 ]
881 else:
882 ref_to_push = 'HEAD'
883
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000884 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000885 ((['git', 'rev-list',
886 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000887 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000888
889 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
890 if ref_suffix:
891 ref_suffix += ',' + notify_suffix
892 else:
893 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000894
ukai@chromium.orge8077812012-02-03 03:41:46 +0000895 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000896 ref_suffix += ',' + ','.join('r=%s' % email
897 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000898 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000899 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000900 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000901 ('remote:\n'
902 'remote: Processing changes: (\)\n'
903 'remote: Processing changes: (|)\n'
904 'remote: Processing changes: (/)\n'
905 'remote: Processing changes: (-)\n'
906 'remote: Processing changes: new: 1 (/)\n'
907 'remote: Processing changes: new: 1, done\n'
908 'remote:\n'
909 'remote: New Changes:\n'
910 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
911 'remote:\n'
912 'To https://chromium.googlesource.com/yyy/zzz\n'
913 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000914 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000915 if squash:
916 calls += [
tandrii33a46ff2016-08-23 05:53:40 -0700917 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -0700918 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000919 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -0700920 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000921 ((['git', 'config', 'branch.master.gerritsquashhash',
922 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000923 ]
tandrii88189772016-09-29 04:29:57 -0700924 calls += [
925 ((['git', 'config', 'rietveld.cc'],), ''),
926 ((['AddReviewers', 'chromium-review.googlesource.com',
927 123456 if squash else None,
928 ['joe@example.com'], False],), ''),
929 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000930 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000931 return calls
932
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000933 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000934 self,
935 upload_args,
936 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000937 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -0700938 squash=True,
939 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000940 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000941 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000942 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000943 post_amend_description=None,
944 issue=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000945 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -0700946 if squash_mode is None:
947 if '--no-squash' in upload_args:
948 squash_mode = 'nosquash'
949 elif '--squash' in upload_args:
950 squash_mode = 'squash'
951 else:
952 squash_mode = 'default'
953
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000954 reviewers = reviewers or []
tandrii@chromium.org28253532016-04-14 13:46:56 +0000955 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -0700956 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000957 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -0700958 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
959 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -0700960 self.mock(git_cl.gclient_utils, 'RunEditor',
961 lambda *_, **__: self._mocked_call(['RunEditor']))
962 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -0700963 self.mock(git_cl.gerrit_util, 'AddReviewers',
964 lambda h, i, add, is_reviewer: self._mocked_call(
965 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -0700966
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000967 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +0000968 self.calls += self._gerrit_upload_calls(
969 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700970 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000971 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000972 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000973 post_amend_description=post_amend_description,
974 issue=issue)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000975 # Uncomment when debugging.
976 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000977 git_cl.main(['upload'] + upload_args)
978
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000979 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -0700980 self._run_gerrit_upload_test(
981 ['--no-squash'],
982 'desc\n\nBUG=\n',
983 [],
984 squash=False,
985 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
986
987 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000988 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000989 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000990 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +0000991 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000992 [],
tandriia60502f2016-06-20 02:01:53 -0700993 squash=False,
994 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000995 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000996
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000997 def test_gerrit_no_reviewer(self):
998 self._run_gerrit_upload_test(
999 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001000 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001001 [],
1002 squash=False,
1003 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001004
tandriieefe8322016-08-17 10:12:24 -07001005 def test_gerrit_patch_bad_chars(self):
1006 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001007 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001008 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001009 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001010 squash=False,
1011 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001012 ref_suffix='%m=Dont_put_bad_chars')
1013 self.assertIn(
1014 'WARNING: Patchset title may only contain alphanumeric chars '
1015 'and spaces. Cleaned up title:\nDont put bad chars\n',
1016 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001017
ukai@chromium.orge8077812012-02-03 03:41:46 +00001018 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001019 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001020 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001021 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001022 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001023 squash=False,
1024 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001025 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001026
1027 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001028 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001029 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001030 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
1031 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001032 ['reviewer@example.com', 'another@example.com'],
1033 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001034 squash_mode='override_nosquash',
1035 ref_suffix='%l=Code-Review+1')
tandriia60502f2016-06-20 02:01:53 -07001036
1037 def test_gerrit_upload_squash_first_is_default(self):
1038 # Mock Gerrit CL description to indicate the first upload.
1039 self.mock(git_cl.Changelist, 'GetDescription',
1040 lambda *_: None)
1041 self._run_gerrit_upload_test(
1042 [],
1043 'desc\nBUG=\n\nChange-Id: 123456789',
1044 [],
1045 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001046
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001047 def test_gerrit_upload_squash_first(self):
1048 # Mock Gerrit CL description to indicate the first upload.
1049 self.mock(git_cl.Changelist, 'GetDescription',
1050 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001051 self._run_gerrit_upload_test(
1052 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001053 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001054 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001055 squash=True,
1056 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001057
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001058 def test_gerrit_upload_squash_reupload(self):
1059 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1060 # Mock Gerrit CL description to indicate re-upload.
1061 self.mock(git_cl.Changelist, 'GetDescription',
1062 lambda *args: description)
1063 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1064 lambda *args: 1)
1065 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1066 lambda *args: {'change_id': '123456789'})
1067 self._run_gerrit_upload_test(
1068 ['--squash'],
1069 description,
1070 [],
1071 squash=True,
1072 expected_upstream_ref='origin/master',
1073 issue=123456)
1074
rmistry@google.com2dd99862015-06-22 12:22:18 +00001075 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001076 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001077 def mock_run_git(*args, **_kwargs):
1078 if args[0] == ['for-each-ref',
1079 '--format=%(refname:short) %(upstream:short)',
1080 'refs/heads']:
1081 # Create a local branch dependency tree that looks like this:
1082 # test1 -> test2 -> test3 -> test4 -> test5
1083 # -> test3.1
1084 # test6 -> test0
1085 branch_deps = [
1086 'test2 test1', # test1 -> test2
1087 'test3 test2', # test2 -> test3
1088 'test3.1 test2', # test2 -> test3.1
1089 'test4 test3', # test3 -> test4
1090 'test5 test4', # test4 -> test5
1091 'test6 test0', # test0 -> test6
1092 'test7', # test7
1093 ]
1094 return '\n'.join(branch_deps)
1095 self.mock(git_cl, 'RunGit', mock_run_git)
1096
1097 class RecordCalls:
1098 times_called = 0
1099 record_calls = RecordCalls()
1100 def mock_CMDupload(*args, **_kwargs):
1101 record_calls.times_called += 1
1102 return 0
1103 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1104
1105 self.calls = [
1106 (('[Press enter to continue or ctrl-C to quit]',), ''),
1107 ]
1108
1109 class MockChangelist():
1110 def __init__(self):
1111 pass
1112 def GetBranch(self):
1113 return 'test1'
1114 def GetIssue(self):
1115 return '123'
1116 def GetPatchset(self):
1117 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001118 def IsGerrit(self):
1119 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001120
1121 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1122 # CMDupload should have been called 5 times because of 5 dependent branches.
1123 self.assertEquals(5, record_calls.times_called)
1124 self.assertEquals(0, ret)
1125
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001126 def test_gerrit_change_id(self):
1127 self.calls = [
1128 ((['git', 'write-tree'], ),
1129 'hashtree'),
1130 ((['git', 'rev-parse', 'HEAD~0'], ),
1131 'branch-parent'),
1132 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1133 'A B <a@b.org> 1456848326 +0100'),
1134 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1135 'C D <c@d.org> 1456858326 +0100'),
1136 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1137 'hashchange'),
1138 ]
1139 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1140 self.assertEqual(change_id, 'Ihashchange')
1141
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001142 def test_desecription_append_footer(self):
1143 for init_desc, footer_line, expected_desc in [
1144 # Use unique desc first lines for easy test failure identification.
1145 ('foo', 'R=one', 'foo\n\nR=one'),
1146 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1147 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1148 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1149 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1150 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1151 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1152 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1153 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1154 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1155 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1156 ]:
1157 desc = git_cl.ChangeDescription(init_desc)
1158 desc.append_footer(footer_line)
1159 self.assertEqual(desc.description, expected_desc)
1160
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001161 def test_update_reviewers(self):
1162 data = [
1163 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001164 ('foo\nR=xx', [], 'foo\nR=xx'),
1165 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001166 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001167 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1168 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1169 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001170 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001171 ('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 +00001172 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001173 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1174 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1175 # Same as the line before, but full of whitespaces.
1176 (
1177 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1178 'foo\nBar\n\nR=c@c\n BUG =',
1179 ),
1180 # Whitespaces aren't interpreted as new lines.
1181 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001182 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001183 expected = [i[2] for i in data]
1184 actual = []
1185 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001186 obj = git_cl.ChangeDescription(orig)
1187 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001188 actual.append(obj.description)
1189 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001190
wittman@chromium.org455dc922015-01-26 20:15:50 +00001191 def test_get_target_ref(self):
1192 # Check remote or remote branch not present.
1193 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1194 self.assertEqual(None, git_cl.GetTargetRef(None,
1195 'refs/remotes/origin/master',
1196 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001197
wittman@chromium.org455dc922015-01-26 20:15:50 +00001198 # Check default target refs for branches.
1199 self.assertEqual('refs/heads/master',
1200 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1201 None, None))
1202 self.assertEqual('refs/heads/master',
1203 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1204 None, None))
1205 self.assertEqual('refs/heads/master',
1206 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1207 None, None))
1208 self.assertEqual('refs/branch-heads/123',
1209 git_cl.GetTargetRef('origin',
1210 'refs/remotes/branch-heads/123',
1211 None, None))
1212 self.assertEqual('refs/diff/test',
1213 git_cl.GetTargetRef('origin',
1214 'refs/remotes/origin/refs/diff/test',
1215 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001216 self.assertEqual('refs/heads/chrome/m42',
1217 git_cl.GetTargetRef('origin',
1218 'refs/remotes/origin/chrome/m42',
1219 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001220
1221 # Check target refs for user-specified target branch.
1222 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1223 'refs/remotes/branch-heads/123'):
1224 self.assertEqual('refs/branch-heads/123',
1225 git_cl.GetTargetRef('origin',
1226 'refs/remotes/origin/master',
1227 branch, None))
1228 for branch in ('origin/master', 'remotes/origin/master',
1229 'refs/remotes/origin/master'):
1230 self.assertEqual('refs/heads/master',
1231 git_cl.GetTargetRef('origin',
1232 'refs/remotes/branch-heads/123',
1233 branch, None))
1234 for branch in ('master', 'heads/master', 'refs/heads/master'):
1235 self.assertEqual('refs/heads/master',
1236 git_cl.GetTargetRef('origin',
1237 'refs/remotes/branch-heads/123',
1238 branch, None))
1239
1240 # Check target refs for pending prefix.
1241 self.assertEqual('prefix/heads/master',
1242 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1243 None, 'prefix/'))
1244
wychen@chromium.orga872e752015-04-28 23:42:18 +00001245 def test_patch_when_dirty(self):
1246 # Patch when local tree is dirty
1247 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1248 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1249
1250 def test_diff_when_dirty(self):
1251 # Do 'git cl diff' when local tree is dirty
1252 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1253 self.assertNotEqual(git_cl.main(['diff']), 0)
1254
tandriidf09a462016-08-18 16:23:55 -07001255 def _patch_common(self, is_gerrit=False, force_codereview=False,
1256 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001257 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001258 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1259 lambda x: '60001')
1260 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
1261 lambda *args: None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001262 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1263 lambda *args: {
1264 'current_revision': '7777777777',
1265 'revisions': {
1266 '1111111111': {
1267 '_number': 1,
1268 'fetch': {'http': {
1269 'url': 'https://chromium.googlesource.com/my/repo',
1270 'ref': 'refs/changes/56/123456/1',
1271 }},
1272 },
1273 '7777777777': {
1274 '_number': 7,
1275 'fetch': {'http': {
1276 'url': 'https://chromium.googlesource.com/my/repo',
1277 'ref': 'refs/changes/56/123456/7',
1278 }},
1279 },
1280 },
1281 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001282 self.mock(git_cl.Changelist, 'GetDescription',
1283 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001284 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1285
tandriidf09a462016-08-18 16:23:55 -07001286 if new_branch:
1287 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1288 else:
1289 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001290 if not force_codereview:
1291 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001292 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001293 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001294 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1295 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001296 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001297 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001298
1299 if is_gerrit:
1300 if not force_codereview:
1301 self.calls += [
1302 ((['git', 'config', 'gerrit.host'],), 'true'),
1303 ]
1304 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001305 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001306 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001307 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1308 ((['git', 'rev-parse', '--show-cdup'],), ''),
1309 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
1310 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001311
tandriidf09a462016-08-18 16:23:55 -07001312 def _common_patch_successful(self, new_branch=False):
1313 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001314 self.calls += [
1315 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
1316 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001317 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001318 'patch from issue 123456 at patchset 60001 ' +
1319 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001320 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001321 ''),
1322 ((['git', 'config', 'branch.master.rietveldserver'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001323 ((['git', 'config', 'branch.master.rietveldserver',
1324 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001325 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001326 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001327 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001328
1329 def test_patch_successful(self):
1330 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001331 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1332
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001333 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001334 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001335 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1336
wychen@chromium.orga872e752015-04-28 23:42:18 +00001337 def test_patch_conflict(self):
1338 self._patch_common()
1339 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001340 ((['git', 'apply', '--index', '-p0', '--3way'],), CERR1),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001341 ]
1342 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001343
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001344 def test_gerrit_patch_successful(self):
1345 self._patch_common(is_gerrit=True)
1346 self.calls += [
1347 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1348 'refs/changes/56/123456/7'],), ''),
1349 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001350 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001351 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001352 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1353 ((['git', 'config', 'branch.master.merge'],), 'master'),
1354 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1355 ((['git', 'config', 'remote.origin.url'],),
1356 'https://chromium.googlesource.com/my/repo'),
1357 ((['git', 'config', 'branch.master.gerritserver',
1358 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001359 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001360 ]
1361 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1362
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001363 def test_patch_force_codereview(self):
1364 self._patch_common(is_gerrit=True, force_codereview=True)
1365 self.calls += [
1366 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1367 'refs/changes/56/123456/7'],), ''),
1368 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1369 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001370 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001371 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001372 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1373 ((['git', 'config', 'branch.master.merge'],), 'master'),
1374 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1375 ((['git', 'config', 'remote.origin.url'],),
1376 'https://chromium.googlesource.com/my/repo'),
1377 ((['git', 'config', 'branch.master.gerritserver',
1378 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001379 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001380 ]
1381 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1382
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001383 def test_gerrit_patch_url_successful(self):
1384 self._patch_common(is_gerrit=True)
1385 self.calls += [
1386 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1387 'refs/changes/56/123456/1'],), ''),
1388 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001389 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001390 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001391 ((['git', 'config', 'branch.master.gerritserver',
1392 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001393 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001394 ]
1395 self.assertEqual(git_cl.main(
1396 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1397
1398 def test_gerrit_patch_conflict(self):
1399 self._patch_common(is_gerrit=True)
1400 self.mock(git_cl, 'DieWithError',
1401 lambda msg: self._mocked_call(['DieWithError', msg]))
1402 class SystemExitMock(Exception):
1403 pass
1404 self.calls += [
1405 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1406 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001407 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1408 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1409 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001410 ]
1411 with self.assertRaises(SystemExitMock):
1412 git_cl.main(['patch',
1413 'https://chromium-review.googlesource.com/#/c/123456/1'])
1414
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001415 def _checkout_calls(self):
1416 return [
1417 ((['git', 'config', '--local', '--get-regexp',
1418 'branch\\..*\\.rietveldissue'], ),
1419 ('branch.retrying.rietveldissue 1111111111\n'
1420 'branch.some-fix.rietveldissue 2222222222\n')),
1421 ((['git', 'config', '--local', '--get-regexp',
1422 'branch\\..*\\.gerritissue'], ),
1423 ('branch.ger-branch.gerritissue 123456\n'
1424 'branch.gbranch654.gerritissue 654321\n')),
1425 ]
1426
1427 def test_checkout_gerrit(self):
1428 """Tests git cl checkout <issue>."""
1429 self.calls = self._checkout_calls()
1430 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1431 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1432
1433 def test_checkout_rietveld(self):
1434 """Tests git cl checkout <issue>."""
1435 self.calls = self._checkout_calls()
1436 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1437 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1438
1439 def test_checkout_not_found(self):
1440 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001441 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001442 self.calls = self._checkout_calls()
1443 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1444
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001445 def test_checkout_no_branch_issues(self):
1446 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001447 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001448 self.calls = [
1449 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001450 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001451 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001452 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001453 ]
1454 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1455
tandrii@chromium.org28253532016-04-14 13:46:56 +00001456 def _test_gerrit_ensure_authenticated_common(self, auth,
1457 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001458 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1459 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1460 self.mock(git_cl, 'DieWithError',
1461 lambda msg: self._mocked_call(['DieWithError', msg]))
1462 self.mock(git_cl, 'ask_for_data',
1463 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001464 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001465 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001466 cl.branch = 'master'
1467 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001468 cl.lookedup_issue = True
1469 return cl
1470
1471 def test_gerrit_ensure_authenticated_missing(self):
1472 cl = self._test_gerrit_ensure_authenticated_common(auth={
1473 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1474 })
1475 self.calls.append(
1476 ((['DieWithError',
1477 'Credentials for the following hosts are required:\n'
1478 ' chromium-review.googlesource.com\n'
1479 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1480 'You can (re)generate your credentails by visiting '
1481 'https://chromium-review.googlesource.com/new-password'],), ''),)
1482 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1483
1484 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001485 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001486 cl = self._test_gerrit_ensure_authenticated_common(auth={
1487 'chromium.googlesource.com': 'one',
1488 'chromium-review.googlesource.com': 'other',
1489 })
1490 self.calls.append(
1491 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001492 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001493 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1494
1495 def test_gerrit_ensure_authenticated_ok(self):
1496 cl = self._test_gerrit_ensure_authenticated_common(auth={
1497 'chromium.googlesource.com': 'same',
1498 'chromium-review.googlesource.com': 'same',
1499 })
1500 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1501
tandrii@chromium.org28253532016-04-14 13:46:56 +00001502 def test_gerrit_ensure_authenticated_skipped(self):
1503 cl = self._test_gerrit_ensure_authenticated_common(
1504 auth={}, skip_auth_check=True)
1505 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1506
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001507 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001508 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1509 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001510 self.calls = [
1511 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001512 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001513 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1514 ((['git', 'config', 'rietveld.server'],), ''),
1515 ((['git', 'config', 'rietveld.server'],), ''),
1516 ((['git', 'config', 'branch.feature.rietveldserver'],),
1517 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001518 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001519 ]
1520 self.assertEqual(0, git_cl.main(['set-commit']))
1521
tandriid9e5ce52016-07-13 02:32:59 -07001522 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001523 self.mock(git_cl.gerrit_util, 'SetReview',
1524 lambda h, i, labels: self._mocked_call(
1525 ['SetReview', h, i, labels]))
1526 self.calls = [
1527 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001528 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1529 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001530 ((['git', 'config', 'branch.feature.gerritserver'],),
1531 'https://chromium-review.googlesource.com'),
1532 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001533 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001534 ]
tandriid9e5ce52016-07-13 02:32:59 -07001535
1536 def test_cmd_set_commit_gerrit_clear(self):
1537 self._cmd_set_commit_gerrit_common(0)
1538 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1539
1540 def test_cmd_set_commit_gerrit_dry(self):
1541 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001542 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1543
tandriid9e5ce52016-07-13 02:32:59 -07001544 def test_cmd_set_commit_gerrit(self):
1545 self._cmd_set_commit_gerrit_common(2)
1546 self.assertEqual(0, git_cl.main(['set-commit']))
1547
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001548 def test_description_display(self):
1549 out = StringIO.StringIO()
1550 self.mock(git_cl.sys, 'stdout', out)
1551
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001552 self.mock(git_cl, 'Changelist', ChangelistMock)
1553 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001554
1555 self.assertEqual(0, git_cl.main(['description', '-d']))
1556 self.assertEqual('foo\n', out.getvalue())
1557
1558 def test_description_rietveld(self):
1559 out = StringIO.StringIO()
1560 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001561 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001562
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001563 self.assertEqual(0, git_cl.main([
1564 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1565 self.assertEqual('foobar\n', out.getvalue())
1566
iannucci3c972b92016-08-17 13:24:10 -07001567 def test_StatusFieldOverrideIssueMissingArgs(self):
1568 out = StringIO.StringIO()
1569 self.mock(git_cl.sys, 'stderr', out)
1570
1571 try:
1572 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1573 except SystemExit as ex:
1574 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001575 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001576
1577 out = StringIO.StringIO()
1578 self.mock(git_cl.sys, 'stderr', out)
1579
1580 try:
1581 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1582 except SystemExit as ex:
1583 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001584 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001585
1586 def test_StatusFieldOverrideIssue(self):
1587 out = StringIO.StringIO()
1588 self.mock(git_cl.sys, 'stdout', out)
1589
1590 def assertIssue(cl_self, *_args):
1591 self.assertEquals(cl_self.issue, 1)
1592 return 'foobar'
1593
1594 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1595 self.calls = [
1596 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1597 ((['git', 'config', 'rietveld.server'],), ''),
1598 ((['git', 'config', 'rietveld.server'],), ''),
1599 ]
iannuccie53c9352016-08-17 14:40:40 -07001600 self.assertEqual(
1601 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1602 0)
iannucci3c972b92016-08-17 13:24:10 -07001603 self.assertEqual(out.getvalue(), 'foobar\n')
1604
iannuccie53c9352016-08-17 14:40:40 -07001605 def test_SetCloseOverrideIssue(self):
1606 def assertIssue(cl_self, *_args):
1607 self.assertEquals(cl_self.issue, 1)
1608 return 'foobar'
1609
1610 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1611 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1612 self.calls = [
1613 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1614 ((['git', 'config', 'rietveld.server'],), ''),
1615 ((['git', 'config', 'rietveld.server'],), ''),
1616 ]
1617 self.assertEqual(
1618 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1619
1620 def test_SetCommitOverrideIssue(self):
1621 def assertIssue(cl_self, *_args):
1622 self.assertEquals(cl_self.issue, 1)
1623 return 'foobar'
1624
1625 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1626 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1627 self.calls = [
1628 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1629 ((['git', 'config', 'rietveld.server'],), ''),
1630 ((['git', 'config', 'rietveld.server'],), ''),
1631 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1632 ((['git', 'config', 'rietveld.server'],), ''),
1633 ((['git', 'config', 'rietveld.server'],), ''),
1634 ]
1635 self.assertEqual(
1636 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1637
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001638 def test_description_gerrit(self):
1639 out = StringIO.StringIO()
1640 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001641 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001642
1643 self.assertEqual(0, git_cl.main([
1644 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1645 self.assertEqual('foobar\n', out.getvalue())
1646
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001647 def test_description_set_raw(self):
1648 out = StringIO.StringIO()
1649 self.mock(git_cl.sys, 'stdout', out)
1650
1651 self.mock(git_cl, 'Changelist', ChangelistMock)
1652 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1653
1654 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1655 self.assertEqual('hihi', ChangelistMock.desc)
1656
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001657 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001658 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001659
1660 def RunEditor(desc, _, **kwargs):
1661 self.assertEquals(
1662 '# Enter a description of the change.\n'
1663 '# This will be displayed on the codereview site.\n'
1664 '# The first line will also be used as the subject of the review.\n'
1665 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001666 '--------------------\n'
1667 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001668 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001669 # Simulate user changing something.
1670 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001671
dsansomee2d6fd92016-09-08 00:10:47 -07001672 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001673 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001674
1675 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1676 self.mock(git_cl.Changelist, 'GetDescription',
1677 lambda *args: current_desc)
1678 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1679 UpdateDescriptionRemote)
1680 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1681
1682 self.calls = [
1683 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001684 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001685 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1686 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001687 ((['git', 'config', 'core.editor'],), 'vi'),
1688 ]
1689 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1690
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001691 def test_description_set_stdin(self):
1692 out = StringIO.StringIO()
1693 self.mock(git_cl.sys, 'stdout', out)
1694
1695 self.mock(git_cl, 'Changelist', ChangelistMock)
1696 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1697
1698 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1699 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1700
kmarshall3bff56b2016-06-06 18:31:47 -07001701 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001702 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1703
kmarshall3bff56b2016-06-06 18:31:47 -07001704 self.calls = \
1705 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1706 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07001707 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001708 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1709 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07001710 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1711 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1712 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001713 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1714 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1715 ((['git', 'branch', '-D', 'foo'],), '')]
1716
kmarshall3bff56b2016-06-06 18:31:47 -07001717 self.mock(git_cl, 'get_cl_statuses',
1718 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001719 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1720 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1721 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001722
1723 self.assertEqual(0, git_cl.main(['archive', '-f']))
1724
1725 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001726 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001727 self.calls = \
1728 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1729 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07001730 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001731 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1732 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001733 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1734
kmarshall9249e012016-08-23 12:02:16 -07001735 self.mock(git_cl, 'get_cl_statuses',
1736 lambda branches, fine_grained, max_processes:
1737 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
1738
1739 self.assertEqual(1, git_cl.main(['archive', '-f']))
1740
1741 def test_archive_dry_run(self):
1742 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1743
1744 self.calls = \
1745 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1746 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1747 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1748 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1749 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1750 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1751 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1752 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1753 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07001754
1755 self.mock(git_cl, 'get_cl_statuses',
1756 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001757 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1758 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1759 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001760
kmarshall9249e012016-08-23 12:02:16 -07001761 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
1762
1763 def test_archive_no_tags(self):
1764 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1765
1766 self.calls = \
1767 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1768 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1769 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1770 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1771 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1772 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1773 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1774 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1775 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1776 ((['git', 'branch', '-D', 'foo'],), '')]
1777
1778 self.mock(git_cl, 'get_cl_statuses',
1779 lambda branches, fine_grained, max_processes:
1780 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1781 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1782 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
1783
1784 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07001785
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001786 def test_cmd_issue_erase_existing(self):
1787 out = StringIO.StringIO()
1788 self.mock(git_cl.sys, 'stdout', out)
1789 self.calls = [
1790 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001791 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1792 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001793 # Let this command raise exception (retcode=1) - it should be ignored.
1794 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07001795 CERR1),
1796 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1797 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001798 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1799 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1800 ''),
1801 ]
1802 self.assertEqual(0, git_cl.main(['issue', '0']))
1803
phajdan.jre328cf92016-08-22 04:12:17 -07001804 def test_cmd_issue_json(self):
1805 out = StringIO.StringIO()
1806 self.mock(git_cl.sys, 'stdout', out)
1807 self.calls = [
1808 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001809 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07001810 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1811 ((['git', 'config', 'rietveld.server'],),
1812 'https://codereview.chromium.org'),
1813 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1814 (('write_json', 'output.json',
1815 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
1816 ''),
1817 ]
1818 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
1819
tandrii9de9ec62016-07-13 03:01:59 -07001820 def test_git_cl_try_default(self):
1821 self.mock(git_cl.Changelist, 'GetChange',
1822 lambda _, *a: (
1823 self._mocked_call(['GetChange']+list(a))))
1824 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1825 lambda *_, **__: (
1826 self._mocked_call(['DoGetTryMasters'])))
1827 self.mock(git_cl.presubmit_support, 'DoGetTrySlaves',
1828 lambda *_, **__: (
1829 self._mocked_call(['DoGetTrySlaves'])))
1830 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
1831 lambda _, s: self._mocked_call(['SetCQState', s]))
1832 self.calls = [
1833 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001834 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07001835 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1836 ((['git', 'config', 'rietveld.server'],),
1837 'https://codereview.chromium.org'),
1838 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1839 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1840 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1841 ((['get_or_create_merge_base', 'feature', 'feature'],),
1842 'fake_ancestor_sha'),
1843 ((['GetChange', 'fake_ancestor_sha', None], ),
1844 git_cl.presubmit_support.GitChange(
1845 '', '', '', '', '', '', '', '')),
1846 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1847 ((['DoGetTryMasters'], ), None),
1848 ((['DoGetTrySlaves'], ), None),
1849 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1850 ]
1851 out = StringIO.StringIO()
1852 self.mock(git_cl.sys, 'stdout', out)
1853 self.assertEqual(0, git_cl.main(['try']))
1854 self.assertEqual(
1855 out.getvalue(),
1856 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
1857
qyearsley53f48a12016-09-01 10:45:13 -07001858 def test_write_try_results_json(self):
1859 builds = {
1860 '9000': {
1861 'id': '9000',
1862 'status': 'STARTED',
1863 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
1864 'result_details_json': '{"properties": {}}',
1865 'bucket': 'master.x.y',
1866 'created_by': 'user:someone@chromium.org',
1867 'created_ts': '147200002222000',
1868 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
1869 },
1870 '8000': {
1871 'id': '8000',
1872 'status': 'COMPLETED',
1873 'result': 'FAILURE',
1874 'failure_reason': 'BUILD_FAILURE',
1875 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
1876 'result_details_json': '{"properties": {}}',
1877 'bucket': 'master.x.y',
1878 'created_by': 'user:someone@chromium.org',
1879 'created_ts': '147200001111000',
1880 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
1881 },
1882 }
1883 expected_output = [
1884 {
1885 'buildbucket_id': '8000',
1886 'bucket': 'master.x.y',
1887 'builder_name': 'my-builder',
1888 'status': 'COMPLETED',
1889 'result': 'FAILURE',
1890 'failure_reason': 'BUILD_FAILURE',
1891 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
1892 },
1893 {
1894 'buildbucket_id': '9000',
1895 'bucket': 'master.x.y',
1896 'builder_name': 'my-builder',
1897 'status': 'STARTED',
1898 'result': None,
1899 'failure_reason': None,
1900 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
1901 }
1902 ]
1903 self.calls = [(('write_json', 'output.json', expected_output), '')]
1904 git_cl.write_try_results_json('output.json', builds)
1905
tandrii16e0b4e2016-06-07 10:34:28 -07001906 def _common_GerritCommitMsgHookCheck(self):
1907 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1908 self.mock(git_cl.os.path, 'abspath',
1909 lambda path: self._mocked_call(['abspath', path]))
1910 self.mock(git_cl.os.path, 'exists',
1911 lambda path: self._mocked_call(['exists', path]))
1912 self.mock(git_cl.gclient_utils, 'FileRead',
1913 lambda path: self._mocked_call(['FileRead', path]))
1914 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
1915 lambda path: self._mocked_call(['rm_file_or_tree', path]))
1916 self.calls = [
1917 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1918 ((['abspath', '../'],), '/abs/git_repo_root'),
1919 ]
1920 return git_cl.Changelist(codereview='gerrit', issue=123)
1921
1922 def test_GerritCommitMsgHookCheck_custom_hook(self):
1923 cl = self._common_GerritCommitMsgHookCheck()
1924 self.calls += [
1925 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1926 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1927 '#!/bin/sh\necho "custom hook"')
1928 ]
1929 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1930
1931 def test_GerritCommitMsgHookCheck_not_exists(self):
1932 cl = self._common_GerritCommitMsgHookCheck()
1933 self.calls += [
1934 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
1935 ]
1936 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1937
1938 def test_GerritCommitMsgHookCheck(self):
1939 cl = self._common_GerritCommitMsgHookCheck()
1940 self.calls += [
1941 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1942 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1943 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
1944 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
1945 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1946 ''),
1947 ]
1948 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1949
tandriic4344b52016-08-29 06:04:54 -07001950 def test_GerritCmdLand(self):
1951 self.calls += [
1952 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1953 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
1954 'deadbeaf'),
1955 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
1956 ((['git', 'config', 'branch.feature.gerritserver'],),
1957 'chromium-review.googlesource.com'),
1958 ]
1959 cl = git_cl.Changelist(issue=123, codereview='gerrit')
1960 cl._codereview_impl._GetChangeDetail = lambda _: {
1961 'labels': {},
1962 'current_revision': 'deadbeaf',
1963 }
1964 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07001965 out = StringIO.StringIO()
1966 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07001967 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07001968 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
tandriic4344b52016-08-29 06:04:54 -07001969
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001970
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001971if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001972 git_cl.logging.basicConfig(
1973 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001974 unittest.main()