blob: 987b478a0ec519d500a9c15397d76f57b4924b49 [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
tandrii221ab252016-10-06 08:12:04 -0700100 def authorize(self, http):
101 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000102
103
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000104def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
105 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
106
107 Usage:
108 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
109 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
110
111 OR
112 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
113 CookiesAuthenticatorMockFactory(cookie='cookie'))
114 """
115 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
116 def __init__(self): # pylint: disable=W0231
117 # Intentionally not calling super() because it reads actual cookie files.
118 pass
119 @classmethod
120 def get_gitcookies_path(cls):
121 return '~/.gitcookies'
122 @classmethod
123 def get_netrc_path(cls):
124 return '~/.netrc'
125 def get_auth_header(self, host):
126 if same_cookie:
127 return same_cookie
128 return (hosts_with_creds or {}).get(host)
129 return CookiesAuthenticatorMock
130
kmarshall9249e012016-08-23 12:02:16 -0700131class MockChangelistWithBranchAndIssue():
132 def __init__(self, branch, issue):
133 self.branch = branch
134 self.issue = issue
135 def GetBranch(self):
136 return self.branch
137 def GetIssue(self):
138 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000139
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000140class TestGitClBasic(unittest.TestCase):
141 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
142 parsed = urlparse.urlparse(url)
143 result = func(parsed)
144 if fail:
145 self.assertIsNone(result)
146 return None
147 self.assertIsNotNone(result)
148 self.assertEqual(result.issue, issue)
149 self.assertEqual(result.patchset, patchset)
150 self.assertEqual(result.hostname, hostname)
151 return result
152
153 def test_ParseIssueURL_rietveld(self):
154 def test(url, issue=None, patchset=None, hostname=None, patch_url=None,
155 fail=None):
156 result = self._test_ParseIssueUrl(
157 git_cl._RietveldChangelistImpl.ParseIssueURL,
158 url, issue, patchset, hostname, fail)
159 if not fail:
160 self.assertEqual(result.patch_url, patch_url)
161
162 test('http://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/',
167 123, None, 'codereview.chromium.org')
168 test('https://codereview.chromium.org/123/whatever',
169 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700170 test('https://codereview.chromium.org/123/#ps20001',
171 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000172 test('http://codereview.chromium.org/download/issue123_4.diff',
173 123, 4, 'codereview.chromium.org',
174 patch_url='https://codereview.chromium.org/download/issue123_4.diff')
175 # This looks like bad Gerrit, but is actually valid Rietveld.
176 test('https://chrome-review.source.com/123/4/',
177 123, None, 'chrome-review.source.com')
178
179 test('https://codereview.chromium.org/deadbeaf', fail=True)
180 test('https://codereview.chromium.org/api/123', fail=True)
181 test('bad://codereview.chromium.org/123', fail=True)
182 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
183
184 def test_ParseIssueURL_gerrit(self):
185 def test(url, issue=None, patchset=None, hostname=None, fail=None):
186 self._test_ParseIssueUrl(
187 git_cl._GerritChangelistImpl.ParseIssueURL,
188 url, issue, patchset, hostname, fail)
189
190 test('http://chrome-review.source.com/c/123',
191 123, None, 'chrome-review.source.com')
192 test('https://chrome-review.source.com/c/123/',
193 123, None, '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/c/123/4',
199 123, 4, 'chrome-review.source.com')
200 test('https://chrome-review.source.com/123',
201 123, None, 'chrome-review.source.com')
202 test('https://chrome-review.source.com/123/4',
203 123, 4, 'chrome-review.source.com')
204
205 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
206 test('https://chrome-review.source.com/c/abc/', fail=True)
207 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
208
209 def test_ParseIssueNumberArgument(self):
210 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
211 result = git_cl.ParseIssueNumberArgument(arg)
212 self.assertIsNotNone(result)
213 if fail:
214 self.assertFalse(result.valid)
215 else:
216 self.assertEqual(result.issue, issue)
217 self.assertEqual(result.patchset, patchset)
218 self.assertEqual(result.hostname, hostname)
219
220 test('123', 123)
221 test('', fail=True)
222 test('abc', fail=True)
223 test('123/1', fail=True)
224 test('123a', fail=True)
225 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
226 # Rietveld.
227 test('https://codereview.source.com/123',
228 123, None, 'codereview.source.com')
229 test('https://codereview.source.com/www123', fail=True)
230 # Gerrrit.
231 test('https://chrome-review.source.com/c/123/4',
232 123, 4, 'chrome-review.source.com')
233 test('https://chrome-review.source.com/bad/123/4', fail=True)
234
tandriif9aefb72016-07-01 09:06:51 -0700235 def test_get_bug_line_values(self):
236 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
237 self.assertEqual(f('', ''), [])
238 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
239 self.assertEqual(f('v8', '456'), ['v8:456'])
240 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
241 # Not nice, but not worth carying.
242 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
243 ['v8:456', 'chromium:123', 'v8:123'])
244
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000245
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000246class TestGitCl(TestCase):
247 def setUp(self):
248 super(TestGitCl, self).setUp()
249 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700250 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000251 self.mock(subprocess2, 'call', self._mocked_call)
252 self.mock(subprocess2, 'check_call', self._mocked_call)
253 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700254 self.mock(subprocess2, 'communicate',
255 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000256 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000257 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000258 self.mock(git_common, 'get_or_create_merge_base',
259 lambda *a: (
260 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000261 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000262 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000263 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700264 self.mock(git_cl, 'write_json', lambda path, contents:
265 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000266 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000267 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000268 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000269 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000270 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000271 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000272 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
273 classmethod(lambda _: False))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000274 # It's important to reset settings to not have inter-tests interference.
275 git_cl.settings = None
276
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000277
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000278 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000279 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000280 # Note: has_failed returns True if at least 1 test ran so far, current
281 # included, has failed. That means current test may have actually ran
282 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000283 if not self.has_failed():
284 self.assertEquals([], self.calls)
285 finally:
286 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000287
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000288 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000289 self.assertTrue(
290 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700291 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000292 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000293 expected_args, result = top
294
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000295 # Also logs otherwise it could get caught in a try/finally and be hard to
296 # diagnose.
297 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700298 N = 5
299 prior_calls = '\n '.join(
300 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
301 for i, c in enumerate(self._calls_done[-N:]))
302 following_calls = '\n '.join(
303 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
304 for i, c in enumerate(self.calls[:N]))
305 extended_msg = (
306 'A few prior calls:\n %s\n\n'
307 'This (expected):\n @%d: %r\n'
308 'This (actual):\n @%d: %r\n\n'
309 'A few following expected calls:\n %s' %
310 (prior_calls, len(self._calls_done), expected_args,
311 len(self._calls_done), args, following_calls))
312 git_cl.logging.error(extended_msg)
313
tandrii99a72f22016-08-17 14:33:24 -0700314 self.fail('@%d\n'
315 ' Expected: %r\n'
316 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700317 len(self._calls_done), expected_args, args))
318
319 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700320 if isinstance(result, Exception):
321 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000322 return result
323
maruel@chromium.orga3353652011-11-30 14:26:57 +0000324 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000325 def _is_gerrit_calls(cls, gerrit=False):
326 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
327 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
328
329 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000330 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000331 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000332 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000333
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000334 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000335 def _upload_no_rev_calls(cls, similarity, find_copies):
336 return (cls._git_base_calls(similarity, find_copies) +
337 cls._git_upload_no_rev_calls())
338
339 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000340 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000341 if similarity is None:
342 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700343 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700344 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000345 else:
tandrii33a46ff2016-08-23 05:53:40 -0700346 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700347 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000348
349 if find_copies is None:
350 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700351 find_copies_call = ((['git', 'config', '--bool',
352 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000353 else:
tandrii5d48c322016-08-18 16:19:37 -0700354 val = str(find_copies).lower()
355 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000356 'branch.master.git-find-copies', val],), '')
357
358 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000359 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000360 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000361 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000362 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000363 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000364 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000365
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000366 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000367 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000368 similarity_call,
369 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
370 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000371 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000372 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700373 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
374 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000375 ((['git', 'config', 'rietveld.server'],),
376 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000377 ((['git', 'config', 'branch.master.merge'],), 'master'),
378 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000379 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000380 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000381 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000382 ((['git', 'rev-parse', '--show-cdup'],), ''),
383 ((['git', 'rev-parse', 'HEAD'],), '12345'),
384 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000385 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000386 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700387 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000388 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000389 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000390 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000391 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000392 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000393 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000394 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000395 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000396 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000397 ]
398
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000399 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000400 def _git_upload_no_rev_calls(cls):
401 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000402 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000403 ]
404
405 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000406 def _git_upload_calls(cls, private):
407 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000408 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000409 private_call = []
410 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000411 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000412 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000413 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000414
maruel@chromium.orga3353652011-11-30 14:26:57 +0000415 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000416 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000417 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000418 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000419 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000420 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000421 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
422 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000423 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000424 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000425 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700426 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000427 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000428 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000429 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700430 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000431 ] + cls._git_post_upload_calls()
432
433 @classmethod
434 def _git_post_upload_calls(cls):
435 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000436 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
437 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
438 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000439 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000440 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000441 ]
442
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000443 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000444 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000445 fake_ancestor = 'fake_ancestor'
446 fake_cl = 'fake_cl_for_patch'
447 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000448 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000449 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000450 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000451 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000452 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000453 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000454 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000455 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700456 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000457 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000458 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000459 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000460 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000461 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000462 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000463 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000464 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000465 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000466 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000467 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000468
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000469 @classmethod
470 def _dcommit_calls_1(cls):
471 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000472 ((['git', 'config', 'rietveld.autoupdate'],),
473 ''),
474 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
475 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000476 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000477 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000478 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
479 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
480 None),
481 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000482 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700483 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700484 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000485 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700486 ((['git', 'config', '--bool',
487 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000488 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
489 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700490 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000491 ((['git',
492 'config', 'rietveld.server'],), 'codereview.example.com'),
493 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000494 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000495 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000496 ((['git', 'config', 'branch.working.merge'],),
497 'refs/heads/master'),
498 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000499 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000500 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000501 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000502 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000503 'refs/remotes/origin/master'],),
504 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000505 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000506 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000507 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000508 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000509 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000510 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000511 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000512 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000513 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000514 ]
515
516 @classmethod
517 def _dcommit_calls_normal(cls):
518 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000519 ((['git', 'rev-parse', '--show-cdup'],), ''),
520 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000521 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000522 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000523 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000524 '.'],),
525 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000526 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700527 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000528 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000529 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000530 ((['git', 'config', 'user.email'],), 'author@example.com'),
531 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000532 ]
533
534 @classmethod
535 def _dcommit_calls_bypassed(cls):
536 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000537 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000538 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000539 ]
540
541 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000542 def _dcommit_calls_3(cls):
543 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000544 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000545 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000546 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000547 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000548 (' PRESUBMIT.py | 2 +-\n'
549 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000550 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700551 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000552 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
553 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700554 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000555 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000556 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
557 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
558 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000559 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000560 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000561 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000562 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000563 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000564 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000565 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000566 ((['git', 'checkout', '-q', 'working'],), ''),
567 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000568 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000569
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000570 @staticmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000571 def _cmd_line(description, args, similarity, find_copies, private):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000572 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000573 return [
574 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000575 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000576 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000577 ] + args + [
578 '--cc', 'joe@example.com',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000579 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000580 '--git_similarity', similarity or '50'
581 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000582 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000583 ]
584
585 def _run_reviewer_test(
586 self,
587 upload_args,
588 expected_description,
589 returned_description,
590 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000591 reviewers,
592 private=False):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000593 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000594 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000595 try:
596 similarity = upload_args[upload_args.index('--similarity')+1]
597 except ValueError:
598 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000599
600 if '--find-copies' in upload_args:
601 find_copies = True
602 elif '--no-find-copies' in upload_args:
603 find_copies = False
604 else:
605 find_copies = None
606
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000607 private = '--private' in upload_args
608
609 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000610
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000611 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000612 self.assertEquals(
613 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000614 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000615 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000616 '#--------------------This line is 72 characters long'
617 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000618 expected_description,
619 desc)
620 return returned_description
621 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000622
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000623 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000624 cmd_line = self._cmd_line(final_description, reviewers, similarity,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000625 find_copies, private)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000626 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000627 return 1, 2
628 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000629
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000630 git_cl.main(['upload'] + upload_args)
631
632 def test_no_reviewer(self):
633 self._run_reviewer_test(
634 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000635 'desc\n\nBUG=',
636 '# Blah blah comment.\ndesc\n\nBUG=',
637 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000638 [])
639
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000640 def test_keep_similarity(self):
641 self._run_reviewer_test(
642 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000643 'desc\n\nBUG=',
644 '# Blah blah comment.\ndesc\n\nBUG=',
645 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000646 [])
647
iannucci@chromium.org79540052012-10-19 23:15:26 +0000648 def test_keep_find_copies(self):
649 self._run_reviewer_test(
650 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000651 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000652 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000653 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000654 [])
655
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000656 def test_private(self):
657 self._run_reviewer_test(
658 ['--private'],
659 'desc\n\nBUG=',
660 '# Blah blah comment.\ndesc\n\nBUG=\n',
661 'desc\n\nBUG=',
662 [])
663
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000664 def test_reviewers_cmd_line(self):
665 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000666 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000667 self._run_reviewer_test(
668 ['-r' 'foo@example.com'],
669 description,
670 '\n%s\n' % description,
671 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000672 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000673
674 def test_reviewer_tbr_overriden(self):
675 # Reviewer is overriden with TBR
676 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000677 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000678 self._run_reviewer_test(
679 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000680 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000681 description.strip('\n'),
682 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000683 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000684
685 def test_reviewer_multiple(self):
686 # Handles multiple R= or TBR= lines.
687 description = (
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000688 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000689 self._run_reviewer_test(
690 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000691 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000692 description,
693 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000694 ['--reviewers=another@example.com,reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000695
maruel@chromium.orga3353652011-11-30 14:26:57 +0000696 def test_reviewer_send_mail(self):
697 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000698 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000699 self._run_reviewer_test(
700 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000701 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000702 description.strip('\n'),
703 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000704 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000705
706 def test_reviewer_send_mail_no_rev(self):
707 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000708 stdout = StringIO.StringIO()
709 stderr = StringIO.StringIO()
maruel@chromium.orga3353652011-11-30 14:26:57 +0000710 try:
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000711 self.calls = self._upload_no_rev_calls(None, None)
712 def RunEditor(desc, _, **kwargs):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000713 return desc
714 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000715 self.mock(sys, 'stdout', stdout)
716 self.mock(sys, 'stderr', stderr)
maruel@chromium.orga3353652011-11-30 14:26:57 +0000717 git_cl.main(['upload', '--send-mail'])
718 self.fail()
719 except SystemExit:
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000720 self.assertEqual(
721 'Using 50% similarity for rename/copy detection. Override with '
722 '--similarity.\n',
723 stdout.getvalue())
724 self.assertEqual(
725 'Must specify reviewers to send email.\n', stderr.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000726
tandriif9aefb72016-07-01 09:06:51 -0700727 def test_bug_on_cmd(self):
728 self._run_reviewer_test(
729 ['--bug=500658,proj:123'],
730 'desc\n\nBUG=500658\nBUG=proj:123',
731 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
732 'desc\n\nBUG=500658\nBUG=proj:1234',
733 [])
734
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000735 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000736 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000737 self.calls = (
738 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000739 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000740 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000741 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000742 git_cl.main(['dcommit'])
743
744 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000745 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000746 self.calls = (
747 self._dcommit_calls_1() +
748 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000749 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000750 git_cl.main(['dcommit', '--bypass-hooks'])
751
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000752
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000753 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000754 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000755 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000756 if skip_auth_check:
757 return [((cmd, ), 'true')]
758
tandrii5d48c322016-08-18 16:19:37 -0700759 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000760 if issue:
761 calls.extend([
762 ((['git', 'config', 'branch.master.gerritserver'],), ''),
763 ])
764 calls.extend([
765 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
766 ((['git', 'config', 'branch.master.remote'],), 'origin'),
767 ((['git', 'config', 'remote.origin.url'],),
768 'https://chromium.googlesource.com/my/repo'),
769 ((['git', 'config', 'remote.origin.url'],),
770 'https://chromium.googlesource.com/my/repo'),
771 ])
772 return calls
773
774 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000775 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000776 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000777 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700778 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -0700779 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000780 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700781 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
782 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000783 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000784 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700785 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
786 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -0700787 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000788 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000789 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000790 ((['get_or_create_merge_base', 'master',
791 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000792 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000793 # Calls to verify branch point is ancestor
794 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
795 cls._git_sanity_checks('fake_ancestor_sha', 'master',
796 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000797 ((['git', 'rev-parse', '--show-cdup'],), ''),
798 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000799
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000800 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000801 'diff', '--name-status', '--no-renames', '-r',
802 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000803 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700804 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000805 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000806 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000807 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000808 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000809 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000810 ((['git', 'config', 'user.email'],), 'me@example.com'),
811 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000812 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000813 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000814 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000815 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000816
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000817 @classmethod
818 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700819 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000820 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000821 ref_suffix='', notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000822 post_amend_description=None, issue=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000823 if post_amend_description is None:
824 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -0700825 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000826
tandriia60502f2016-06-20 02:01:53 -0700827 if squash_mode == 'default':
828 calls.extend([
829 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
830 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
831 ])
832 elif squash_mode in ('override_squash', 'override_nosquash'):
833 calls.extend([
834 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
835 'true' if squash_mode == 'override_squash' else 'false'),
836 ])
837 else:
838 assert squash_mode in ('squash', 'nosquash')
839
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000840 # If issue is given, then description is fetched from Gerrit instead.
841 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000842 calls += [
843 ((['git', 'log', '--pretty=format:%s\n\n%b',
844 'fake_ancestor_sha..HEAD'],),
845 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000846 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000847 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000848 # DownloadGerritHook(False)
849 ((False, ),
850 ''),
851 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000852 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000853 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000854 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000855 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000856 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000857 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000858 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000859 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000860 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000861 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000862 if not issue:
863 # Prompting to edit description on first upload.
864 calls += [
865 ((['git', 'config', 'core.editor'],), ''),
866 ((['RunEditor'],), description),
867 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000868 ref_to_push = 'abcdef0123456789'
869 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000870 ((['git', 'config', 'branch.master.merge'],),
871 'refs/heads/master'),
872 ((['git', 'config', 'branch.master.remote'],),
873 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000874 ((['get_or_create_merge_base', 'master',
875 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000876 'origin/master'),
877 ((['git', 'rev-parse', 'HEAD:'],),
878 '0123456789abcdef'),
879 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000880 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000881 ref_to_push),
882 ]
883 else:
884 ref_to_push = 'HEAD'
885
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000886 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000887 ((['git', 'rev-list',
888 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000889 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000890
891 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
892 if ref_suffix:
893 ref_suffix += ',' + notify_suffix
894 else:
895 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000896
ukai@chromium.orge8077812012-02-03 03:41:46 +0000897 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000898 ref_suffix += ',' + ','.join('r=%s' % email
899 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000900 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000901 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000902 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000903 ('remote:\n'
904 'remote: Processing changes: (\)\n'
905 'remote: Processing changes: (|)\n'
906 'remote: Processing changes: (/)\n'
907 'remote: Processing changes: (-)\n'
908 'remote: Processing changes: new: 1 (/)\n'
909 'remote: Processing changes: new: 1, done\n'
910 'remote:\n'
911 'remote: New Changes:\n'
912 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
913 'remote:\n'
914 'To https://chromium.googlesource.com/yyy/zzz\n'
915 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000916 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000917 if squash:
918 calls += [
tandrii33a46ff2016-08-23 05:53:40 -0700919 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -0700920 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000921 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -0700922 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000923 ((['git', 'config', 'branch.master.gerritsquashhash',
924 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000925 ]
tandrii88189772016-09-29 04:29:57 -0700926 calls += [
927 ((['git', 'config', 'rietveld.cc'],), ''),
928 ((['AddReviewers', 'chromium-review.googlesource.com',
929 123456 if squash else None,
930 ['joe@example.com'], False],), ''),
931 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000932 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000933 return calls
934
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000935 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000936 self,
937 upload_args,
938 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000939 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -0700940 squash=True,
941 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000942 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000943 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000944 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000945 post_amend_description=None,
946 issue=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000947 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -0700948 if squash_mode is None:
949 if '--no-squash' in upload_args:
950 squash_mode = 'nosquash'
951 elif '--squash' in upload_args:
952 squash_mode = 'squash'
953 else:
954 squash_mode = 'default'
955
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000956 reviewers = reviewers or []
tandrii@chromium.org28253532016-04-14 13:46:56 +0000957 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -0700958 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000959 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -0700960 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
961 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -0700962 self.mock(git_cl.gclient_utils, 'RunEditor',
963 lambda *_, **__: self._mocked_call(['RunEditor']))
964 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
tandrii88189772016-09-29 04:29:57 -0700965 self.mock(git_cl.gerrit_util, 'AddReviewers',
966 lambda h, i, add, is_reviewer: self._mocked_call(
967 ['AddReviewers', h, i, add, is_reviewer]))
tandriia60502f2016-06-20 02:01:53 -0700968
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000969 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +0000970 self.calls += self._gerrit_upload_calls(
971 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700972 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000973 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000974 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000975 post_amend_description=post_amend_description,
976 issue=issue)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000977 # Uncomment when debugging.
978 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000979 git_cl.main(['upload'] + upload_args)
980
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000981 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -0700982 self._run_gerrit_upload_test(
983 ['--no-squash'],
984 'desc\n\nBUG=\n',
985 [],
986 squash=False,
987 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
988
989 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000990 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000991 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000992 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +0000993 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000994 [],
tandriia60502f2016-06-20 02:01:53 -0700995 squash=False,
996 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000997 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000998
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000999 def test_gerrit_no_reviewer(self):
1000 self._run_gerrit_upload_test(
1001 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001002 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001003 [],
1004 squash=False,
1005 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001006
tandriieefe8322016-08-17 10:12:24 -07001007 def test_gerrit_patch_bad_chars(self):
1008 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001009 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001010 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001011 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001012 squash=False,
1013 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -07001014 ref_suffix='%m=Dont_put_bad_chars')
1015 self.assertIn(
1016 'WARNING: Patchset title may only contain alphanumeric chars '
1017 'and spaces. Cleaned up title:\nDont put bad chars\n',
1018 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001019
ukai@chromium.orge8077812012-02-03 03:41:46 +00001020 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001021 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001022 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001023 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001024 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001025 squash=False,
1026 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001027 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001028
1029 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001030 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001031 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001032 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
1033 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001034 ['reviewer@example.com', 'another@example.com'],
1035 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001036 squash_mode='override_nosquash',
1037 ref_suffix='%l=Code-Review+1')
tandriia60502f2016-06-20 02:01:53 -07001038
1039 def test_gerrit_upload_squash_first_is_default(self):
1040 # Mock Gerrit CL description to indicate the first upload.
1041 self.mock(git_cl.Changelist, 'GetDescription',
1042 lambda *_: None)
1043 self._run_gerrit_upload_test(
1044 [],
1045 'desc\nBUG=\n\nChange-Id: 123456789',
1046 [],
1047 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001048
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001049 def test_gerrit_upload_squash_first(self):
1050 # Mock Gerrit CL description to indicate the first upload.
1051 self.mock(git_cl.Changelist, 'GetDescription',
1052 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001053 self._run_gerrit_upload_test(
1054 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001055 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001056 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001057 squash=True,
1058 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001059
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001060 def test_gerrit_upload_squash_reupload(self):
1061 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1062 # Mock Gerrit CL description to indicate re-upload.
1063 self.mock(git_cl.Changelist, 'GetDescription',
1064 lambda *args: description)
1065 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1066 lambda *args: 1)
1067 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1068 lambda *args: {'change_id': '123456789'})
1069 self._run_gerrit_upload_test(
1070 ['--squash'],
1071 description,
1072 [],
1073 squash=True,
1074 expected_upstream_ref='origin/master',
1075 issue=123456)
1076
rmistry@google.com2dd99862015-06-22 12:22:18 +00001077 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001078 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001079 def mock_run_git(*args, **_kwargs):
1080 if args[0] == ['for-each-ref',
1081 '--format=%(refname:short) %(upstream:short)',
1082 'refs/heads']:
1083 # Create a local branch dependency tree that looks like this:
1084 # test1 -> test2 -> test3 -> test4 -> test5
1085 # -> test3.1
1086 # test6 -> test0
1087 branch_deps = [
1088 'test2 test1', # test1 -> test2
1089 'test3 test2', # test2 -> test3
1090 'test3.1 test2', # test2 -> test3.1
1091 'test4 test3', # test3 -> test4
1092 'test5 test4', # test4 -> test5
1093 'test6 test0', # test0 -> test6
1094 'test7', # test7
1095 ]
1096 return '\n'.join(branch_deps)
1097 self.mock(git_cl, 'RunGit', mock_run_git)
1098
1099 class RecordCalls:
1100 times_called = 0
1101 record_calls = RecordCalls()
1102 def mock_CMDupload(*args, **_kwargs):
1103 record_calls.times_called += 1
1104 return 0
1105 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1106
1107 self.calls = [
1108 (('[Press enter to continue or ctrl-C to quit]',), ''),
1109 ]
1110
1111 class MockChangelist():
1112 def __init__(self):
1113 pass
1114 def GetBranch(self):
1115 return 'test1'
1116 def GetIssue(self):
1117 return '123'
1118 def GetPatchset(self):
1119 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001120 def IsGerrit(self):
1121 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001122
1123 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1124 # CMDupload should have been called 5 times because of 5 dependent branches.
1125 self.assertEquals(5, record_calls.times_called)
1126 self.assertEquals(0, ret)
1127
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001128 def test_gerrit_change_id(self):
1129 self.calls = [
1130 ((['git', 'write-tree'], ),
1131 'hashtree'),
1132 ((['git', 'rev-parse', 'HEAD~0'], ),
1133 'branch-parent'),
1134 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1135 'A B <a@b.org> 1456848326 +0100'),
1136 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1137 'C D <c@d.org> 1456858326 +0100'),
1138 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1139 'hashchange'),
1140 ]
1141 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1142 self.assertEqual(change_id, 'Ihashchange')
1143
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001144 def test_desecription_append_footer(self):
1145 for init_desc, footer_line, expected_desc in [
1146 # Use unique desc first lines for easy test failure identification.
1147 ('foo', 'R=one', 'foo\n\nR=one'),
1148 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1149 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1150 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1151 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1152 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1153 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1154 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1155 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1156 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1157 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1158 ]:
1159 desc = git_cl.ChangeDescription(init_desc)
1160 desc.append_footer(footer_line)
1161 self.assertEqual(desc.description, expected_desc)
1162
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001163 def test_update_reviewers(self):
1164 data = [
1165 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001166 ('foo\nR=xx', [], 'foo\nR=xx'),
1167 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001168 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001169 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1170 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1171 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001172 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001173 ('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 +00001174 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001175 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1176 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1177 # Same as the line before, but full of whitespaces.
1178 (
1179 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1180 'foo\nBar\n\nR=c@c\n BUG =',
1181 ),
1182 # Whitespaces aren't interpreted as new lines.
1183 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001184 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001185 expected = [i[2] for i in data]
1186 actual = []
1187 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001188 obj = git_cl.ChangeDescription(orig)
1189 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001190 actual.append(obj.description)
1191 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001192
wittman@chromium.org455dc922015-01-26 20:15:50 +00001193 def test_get_target_ref(self):
1194 # Check remote or remote branch not present.
1195 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1196 self.assertEqual(None, git_cl.GetTargetRef(None,
1197 'refs/remotes/origin/master',
1198 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001199
wittman@chromium.org455dc922015-01-26 20:15:50 +00001200 # Check default target refs for branches.
1201 self.assertEqual('refs/heads/master',
1202 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1203 None, None))
1204 self.assertEqual('refs/heads/master',
1205 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1206 None, None))
1207 self.assertEqual('refs/heads/master',
1208 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1209 None, None))
1210 self.assertEqual('refs/branch-heads/123',
1211 git_cl.GetTargetRef('origin',
1212 'refs/remotes/branch-heads/123',
1213 None, None))
1214 self.assertEqual('refs/diff/test',
1215 git_cl.GetTargetRef('origin',
1216 'refs/remotes/origin/refs/diff/test',
1217 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001218 self.assertEqual('refs/heads/chrome/m42',
1219 git_cl.GetTargetRef('origin',
1220 'refs/remotes/origin/chrome/m42',
1221 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001222
1223 # Check target refs for user-specified target branch.
1224 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1225 'refs/remotes/branch-heads/123'):
1226 self.assertEqual('refs/branch-heads/123',
1227 git_cl.GetTargetRef('origin',
1228 'refs/remotes/origin/master',
1229 branch, None))
1230 for branch in ('origin/master', 'remotes/origin/master',
1231 'refs/remotes/origin/master'):
1232 self.assertEqual('refs/heads/master',
1233 git_cl.GetTargetRef('origin',
1234 'refs/remotes/branch-heads/123',
1235 branch, None))
1236 for branch in ('master', 'heads/master', 'refs/heads/master'):
1237 self.assertEqual('refs/heads/master',
1238 git_cl.GetTargetRef('origin',
1239 'refs/remotes/branch-heads/123',
1240 branch, None))
1241
1242 # Check target refs for pending prefix.
1243 self.assertEqual('prefix/heads/master',
1244 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1245 None, 'prefix/'))
1246
wychen@chromium.orga872e752015-04-28 23:42:18 +00001247 def test_patch_when_dirty(self):
1248 # Patch when local tree is dirty
1249 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1250 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1251
1252 def test_diff_when_dirty(self):
1253 # Do 'git cl diff' when local tree is dirty
1254 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1255 self.assertNotEqual(git_cl.main(['diff']), 0)
1256
tandriidf09a462016-08-18 16:23:55 -07001257 def _patch_common(self, is_gerrit=False, force_codereview=False,
1258 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001259 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001260 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1261 lambda x: '60001')
1262 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
1263 lambda *args: None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001264 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1265 lambda *args: {
1266 'current_revision': '7777777777',
1267 'revisions': {
1268 '1111111111': {
1269 '_number': 1,
1270 'fetch': {'http': {
1271 'url': 'https://chromium.googlesource.com/my/repo',
1272 'ref': 'refs/changes/56/123456/1',
1273 }},
1274 },
1275 '7777777777': {
1276 '_number': 7,
1277 'fetch': {'http': {
1278 'url': 'https://chromium.googlesource.com/my/repo',
1279 'ref': 'refs/changes/56/123456/7',
1280 }},
1281 },
1282 },
1283 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001284 self.mock(git_cl.Changelist, 'GetDescription',
1285 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001286 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1287
tandriidf09a462016-08-18 16:23:55 -07001288 if new_branch:
1289 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1290 else:
1291 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001292 if not force_codereview:
1293 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001294 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001295 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001296 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1297 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001298 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001299 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001300
1301 if is_gerrit:
1302 if not force_codereview:
1303 self.calls += [
1304 ((['git', 'config', 'gerrit.host'],), 'true'),
1305 ]
1306 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001307 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001308 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001309 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1310 ((['git', 'rev-parse', '--show-cdup'],), ''),
1311 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
1312 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001313
tandriidf09a462016-08-18 16:23:55 -07001314 def _common_patch_successful(self, new_branch=False):
1315 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001316 self.calls += [
1317 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
1318 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001319 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001320 'patch from issue 123456 at patchset 60001 ' +
1321 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001322 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001323 ''),
1324 ((['git', 'config', 'branch.master.rietveldserver'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001325 ((['git', 'config', 'branch.master.rietveldserver',
1326 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001327 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001328 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001329 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001330
1331 def test_patch_successful(self):
1332 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001333 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1334
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001335 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001336 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001337 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1338
wychen@chromium.orga872e752015-04-28 23:42:18 +00001339 def test_patch_conflict(self):
1340 self._patch_common()
1341 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001342 ((['git', 'apply', '--index', '-p0', '--3way'],), CERR1),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001343 ]
1344 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001345
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001346 def test_gerrit_patch_successful(self):
1347 self._patch_common(is_gerrit=True)
1348 self.calls += [
1349 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1350 'refs/changes/56/123456/7'],), ''),
1351 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001352 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001353 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001354 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1355 ((['git', 'config', 'branch.master.merge'],), 'master'),
1356 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1357 ((['git', 'config', 'remote.origin.url'],),
1358 'https://chromium.googlesource.com/my/repo'),
1359 ((['git', 'config', 'branch.master.gerritserver',
1360 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001361 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001362 ]
1363 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1364
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001365 def test_patch_force_codereview(self):
1366 self._patch_common(is_gerrit=True, force_codereview=True)
1367 self.calls += [
1368 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1369 'refs/changes/56/123456/7'],), ''),
1370 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1371 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001372 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001373 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001374 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1375 ((['git', 'config', 'branch.master.merge'],), 'master'),
1376 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1377 ((['git', 'config', 'remote.origin.url'],),
1378 'https://chromium.googlesource.com/my/repo'),
1379 ((['git', 'config', 'branch.master.gerritserver',
1380 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001381 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001382 ]
1383 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1384
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001385 def test_gerrit_patch_url_successful(self):
1386 self._patch_common(is_gerrit=True)
1387 self.calls += [
1388 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1389 'refs/changes/56/123456/1'],), ''),
1390 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001391 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001392 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001393 ((['git', 'config', 'branch.master.gerritserver',
1394 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001395 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001396 ]
1397 self.assertEqual(git_cl.main(
1398 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1399
1400 def test_gerrit_patch_conflict(self):
1401 self._patch_common(is_gerrit=True)
1402 self.mock(git_cl, 'DieWithError',
1403 lambda msg: self._mocked_call(['DieWithError', msg]))
1404 class SystemExitMock(Exception):
1405 pass
1406 self.calls += [
1407 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1408 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001409 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1410 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1411 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001412 ]
1413 with self.assertRaises(SystemExitMock):
1414 git_cl.main(['patch',
1415 'https://chromium-review.googlesource.com/#/c/123456/1'])
1416
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001417 def _checkout_calls(self):
1418 return [
1419 ((['git', 'config', '--local', '--get-regexp',
1420 'branch\\..*\\.rietveldissue'], ),
1421 ('branch.retrying.rietveldissue 1111111111\n'
1422 'branch.some-fix.rietveldissue 2222222222\n')),
1423 ((['git', 'config', '--local', '--get-regexp',
1424 'branch\\..*\\.gerritissue'], ),
1425 ('branch.ger-branch.gerritissue 123456\n'
1426 'branch.gbranch654.gerritissue 654321\n')),
1427 ]
1428
1429 def test_checkout_gerrit(self):
1430 """Tests git cl checkout <issue>."""
1431 self.calls = self._checkout_calls()
1432 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1433 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1434
1435 def test_checkout_rietveld(self):
1436 """Tests git cl checkout <issue>."""
1437 self.calls = self._checkout_calls()
1438 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1439 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1440
1441 def test_checkout_not_found(self):
1442 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001443 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001444 self.calls = self._checkout_calls()
1445 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1446
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001447 def test_checkout_no_branch_issues(self):
1448 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001449 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001450 self.calls = [
1451 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001452 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001453 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001454 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001455 ]
1456 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1457
tandrii@chromium.org28253532016-04-14 13:46:56 +00001458 def _test_gerrit_ensure_authenticated_common(self, auth,
1459 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001460 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1461 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1462 self.mock(git_cl, 'DieWithError',
1463 lambda msg: self._mocked_call(['DieWithError', msg]))
1464 self.mock(git_cl, 'ask_for_data',
1465 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001466 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001467 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001468 cl.branch = 'master'
1469 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001470 cl.lookedup_issue = True
1471 return cl
1472
1473 def test_gerrit_ensure_authenticated_missing(self):
1474 cl = self._test_gerrit_ensure_authenticated_common(auth={
1475 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1476 })
1477 self.calls.append(
1478 ((['DieWithError',
1479 'Credentials for the following hosts are required:\n'
1480 ' chromium-review.googlesource.com\n'
1481 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1482 'You can (re)generate your credentails by visiting '
1483 'https://chromium-review.googlesource.com/new-password'],), ''),)
1484 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1485
1486 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001487 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001488 cl = self._test_gerrit_ensure_authenticated_common(auth={
1489 'chromium.googlesource.com': 'one',
1490 'chromium-review.googlesource.com': 'other',
1491 })
1492 self.calls.append(
1493 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001494 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001495 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1496
1497 def test_gerrit_ensure_authenticated_ok(self):
1498 cl = self._test_gerrit_ensure_authenticated_common(auth={
1499 'chromium.googlesource.com': 'same',
1500 'chromium-review.googlesource.com': 'same',
1501 })
1502 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1503
tandrii@chromium.org28253532016-04-14 13:46:56 +00001504 def test_gerrit_ensure_authenticated_skipped(self):
1505 cl = self._test_gerrit_ensure_authenticated_common(
1506 auth={}, skip_auth_check=True)
1507 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1508
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001509 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001510 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1511 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001512 self.calls = [
1513 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001514 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001515 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1516 ((['git', 'config', 'rietveld.server'],), ''),
1517 ((['git', 'config', 'rietveld.server'],), ''),
1518 ((['git', 'config', 'branch.feature.rietveldserver'],),
1519 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001520 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001521 ]
1522 self.assertEqual(0, git_cl.main(['set-commit']))
1523
tandriid9e5ce52016-07-13 02:32:59 -07001524 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001525 self.mock(git_cl.gerrit_util, 'SetReview',
1526 lambda h, i, labels: self._mocked_call(
1527 ['SetReview', h, i, labels]))
1528 self.calls = [
1529 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001530 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1531 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001532 ((['git', 'config', 'branch.feature.gerritserver'],),
1533 'https://chromium-review.googlesource.com'),
1534 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001535 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001536 ]
tandriid9e5ce52016-07-13 02:32:59 -07001537
1538 def test_cmd_set_commit_gerrit_clear(self):
1539 self._cmd_set_commit_gerrit_common(0)
1540 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1541
1542 def test_cmd_set_commit_gerrit_dry(self):
1543 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001544 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1545
tandriid9e5ce52016-07-13 02:32:59 -07001546 def test_cmd_set_commit_gerrit(self):
1547 self._cmd_set_commit_gerrit_common(2)
1548 self.assertEqual(0, git_cl.main(['set-commit']))
1549
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001550 def test_description_display(self):
1551 out = StringIO.StringIO()
1552 self.mock(git_cl.sys, 'stdout', out)
1553
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001554 self.mock(git_cl, 'Changelist', ChangelistMock)
1555 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001556
1557 self.assertEqual(0, git_cl.main(['description', '-d']))
1558 self.assertEqual('foo\n', out.getvalue())
1559
1560 def test_description_rietveld(self):
1561 out = StringIO.StringIO()
1562 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001563 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001564
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001565 self.assertEqual(0, git_cl.main([
1566 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1567 self.assertEqual('foobar\n', out.getvalue())
1568
iannucci3c972b92016-08-17 13:24:10 -07001569 def test_StatusFieldOverrideIssueMissingArgs(self):
1570 out = StringIO.StringIO()
1571 self.mock(git_cl.sys, 'stderr', out)
1572
1573 try:
1574 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1575 except SystemExit as ex:
1576 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001577 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001578
1579 out = StringIO.StringIO()
1580 self.mock(git_cl.sys, 'stderr', out)
1581
1582 try:
1583 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1584 except SystemExit as ex:
1585 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001586 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001587
1588 def test_StatusFieldOverrideIssue(self):
1589 out = StringIO.StringIO()
1590 self.mock(git_cl.sys, 'stdout', out)
1591
1592 def assertIssue(cl_self, *_args):
1593 self.assertEquals(cl_self.issue, 1)
1594 return 'foobar'
1595
1596 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1597 self.calls = [
1598 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1599 ((['git', 'config', 'rietveld.server'],), ''),
1600 ((['git', 'config', 'rietveld.server'],), ''),
1601 ]
iannuccie53c9352016-08-17 14:40:40 -07001602 self.assertEqual(
1603 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1604 0)
iannucci3c972b92016-08-17 13:24:10 -07001605 self.assertEqual(out.getvalue(), 'foobar\n')
1606
iannuccie53c9352016-08-17 14:40:40 -07001607 def test_SetCloseOverrideIssue(self):
1608 def assertIssue(cl_self, *_args):
1609 self.assertEquals(cl_self.issue, 1)
1610 return 'foobar'
1611
1612 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1613 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1614 self.calls = [
1615 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1616 ((['git', 'config', 'rietveld.server'],), ''),
1617 ((['git', 'config', 'rietveld.server'],), ''),
1618 ]
1619 self.assertEqual(
1620 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1621
1622 def test_SetCommitOverrideIssue(self):
1623 def assertIssue(cl_self, *_args):
1624 self.assertEquals(cl_self.issue, 1)
1625 return 'foobar'
1626
1627 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1628 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1629 self.calls = [
1630 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1631 ((['git', 'config', 'rietveld.server'],), ''),
1632 ((['git', 'config', 'rietveld.server'],), ''),
1633 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1634 ((['git', 'config', 'rietveld.server'],), ''),
1635 ((['git', 'config', 'rietveld.server'],), ''),
1636 ]
1637 self.assertEqual(
1638 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1639
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001640 def test_description_gerrit(self):
1641 out = StringIO.StringIO()
1642 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001643 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001644
1645 self.assertEqual(0, git_cl.main([
1646 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1647 self.assertEqual('foobar\n', out.getvalue())
1648
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001649 def test_description_set_raw(self):
1650 out = StringIO.StringIO()
1651 self.mock(git_cl.sys, 'stdout', out)
1652
1653 self.mock(git_cl, 'Changelist', ChangelistMock)
1654 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1655
1656 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1657 self.assertEqual('hihi', ChangelistMock.desc)
1658
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001659 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001660 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001661
1662 def RunEditor(desc, _, **kwargs):
1663 self.assertEquals(
1664 '# Enter a description of the change.\n'
1665 '# This will be displayed on the codereview site.\n'
1666 '# The first line will also be used as the subject of the review.\n'
1667 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001668 '--------------------\n'
1669 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001670 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001671 # Simulate user changing something.
1672 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001673
dsansomee2d6fd92016-09-08 00:10:47 -07001674 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001675 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001676
1677 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1678 self.mock(git_cl.Changelist, 'GetDescription',
1679 lambda *args: current_desc)
1680 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1681 UpdateDescriptionRemote)
1682 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1683
1684 self.calls = [
1685 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001686 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001687 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1688 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001689 ((['git', 'config', 'core.editor'],), 'vi'),
1690 ]
1691 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1692
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001693 def test_description_set_stdin(self):
1694 out = StringIO.StringIO()
1695 self.mock(git_cl.sys, 'stdout', out)
1696
1697 self.mock(git_cl, 'Changelist', ChangelistMock)
1698 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1699
1700 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1701 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1702
kmarshall3bff56b2016-06-06 18:31:47 -07001703 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001704 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1705
kmarshall3bff56b2016-06-06 18:31:47 -07001706 self.calls = \
1707 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1708 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07001709 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001710 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1711 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07001712 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1713 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1714 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001715 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1716 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1717 ((['git', 'branch', '-D', 'foo'],), '')]
1718
kmarshall3bff56b2016-06-06 18:31:47 -07001719 self.mock(git_cl, 'get_cl_statuses',
1720 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001721 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1722 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1723 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001724
1725 self.assertEqual(0, git_cl.main(['archive', '-f']))
1726
1727 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001728 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001729 self.calls = \
1730 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1731 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07001732 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001733 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1734 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001735 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1736
kmarshall9249e012016-08-23 12:02:16 -07001737 self.mock(git_cl, 'get_cl_statuses',
1738 lambda branches, fine_grained, max_processes:
1739 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
1740
1741 self.assertEqual(1, git_cl.main(['archive', '-f']))
1742
1743 def test_archive_dry_run(self):
1744 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1745
1746 self.calls = \
1747 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1748 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1749 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1750 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1751 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1752 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1753 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1754 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1755 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07001756
1757 self.mock(git_cl, 'get_cl_statuses',
1758 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07001759 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1760 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1761 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07001762
kmarshall9249e012016-08-23 12:02:16 -07001763 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
1764
1765 def test_archive_no_tags(self):
1766 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1767
1768 self.calls = \
1769 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1770 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1771 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1772 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1773 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1774 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1775 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1776 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1777 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1778 ((['git', 'branch', '-D', 'foo'],), '')]
1779
1780 self.mock(git_cl, 'get_cl_statuses',
1781 lambda branches, fine_grained, max_processes:
1782 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
1783 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
1784 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
1785
1786 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07001787
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001788 def test_cmd_issue_erase_existing(self):
1789 out = StringIO.StringIO()
1790 self.mock(git_cl.sys, 'stdout', out)
1791 self.calls = [
1792 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001793 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1794 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001795 # Let this command raise exception (retcode=1) - it should be ignored.
1796 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07001797 CERR1),
1798 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1799 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001800 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1801 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1802 ''),
1803 ]
1804 self.assertEqual(0, git_cl.main(['issue', '0']))
1805
phajdan.jre328cf92016-08-22 04:12:17 -07001806 def test_cmd_issue_json(self):
1807 out = StringIO.StringIO()
1808 self.mock(git_cl.sys, 'stdout', out)
1809 self.calls = [
1810 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001811 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07001812 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1813 ((['git', 'config', 'rietveld.server'],),
1814 'https://codereview.chromium.org'),
1815 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1816 (('write_json', 'output.json',
1817 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
1818 ''),
1819 ]
1820 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
1821
tandrii9de9ec62016-07-13 03:01:59 -07001822 def test_git_cl_try_default(self):
1823 self.mock(git_cl.Changelist, 'GetChange',
1824 lambda _, *a: (
1825 self._mocked_call(['GetChange']+list(a))))
1826 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1827 lambda *_, **__: (
1828 self._mocked_call(['DoGetTryMasters'])))
1829 self.mock(git_cl.presubmit_support, 'DoGetTrySlaves',
1830 lambda *_, **__: (
1831 self._mocked_call(['DoGetTrySlaves'])))
1832 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
1833 lambda _, s: self._mocked_call(['SetCQState', s]))
1834 self.calls = [
1835 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001836 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07001837 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1838 ((['git', 'config', 'rietveld.server'],),
1839 'https://codereview.chromium.org'),
1840 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1841 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1842 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1843 ((['get_or_create_merge_base', 'feature', 'feature'],),
1844 'fake_ancestor_sha'),
1845 ((['GetChange', 'fake_ancestor_sha', None], ),
1846 git_cl.presubmit_support.GitChange(
1847 '', '', '', '', '', '', '', '')),
1848 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1849 ((['DoGetTryMasters'], ), None),
1850 ((['DoGetTrySlaves'], ), None),
1851 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1852 ]
1853 out = StringIO.StringIO()
1854 self.mock(git_cl.sys, 'stdout', out)
1855 self.assertEqual(0, git_cl.main(['try']))
1856 self.assertEqual(
1857 out.getvalue(),
1858 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
1859
tandrii16e0b4e2016-06-07 10:34:28 -07001860 def _common_GerritCommitMsgHookCheck(self):
1861 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1862 self.mock(git_cl.os.path, 'abspath',
1863 lambda path: self._mocked_call(['abspath', path]))
1864 self.mock(git_cl.os.path, 'exists',
1865 lambda path: self._mocked_call(['exists', path]))
1866 self.mock(git_cl.gclient_utils, 'FileRead',
1867 lambda path: self._mocked_call(['FileRead', path]))
1868 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
1869 lambda path: self._mocked_call(['rm_file_or_tree', path]))
1870 self.calls = [
1871 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1872 ((['abspath', '../'],), '/abs/git_repo_root'),
1873 ]
1874 return git_cl.Changelist(codereview='gerrit', issue=123)
1875
1876 def test_GerritCommitMsgHookCheck_custom_hook(self):
1877 cl = self._common_GerritCommitMsgHookCheck()
1878 self.calls += [
1879 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1880 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1881 '#!/bin/sh\necho "custom hook"')
1882 ]
1883 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1884
1885 def test_GerritCommitMsgHookCheck_not_exists(self):
1886 cl = self._common_GerritCommitMsgHookCheck()
1887 self.calls += [
1888 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
1889 ]
1890 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1891
1892 def test_GerritCommitMsgHookCheck(self):
1893 cl = self._common_GerritCommitMsgHookCheck()
1894 self.calls += [
1895 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1896 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1897 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
1898 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
1899 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1900 ''),
1901 ]
1902 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1903
tandriic4344b52016-08-29 06:04:54 -07001904 def test_GerritCmdLand(self):
1905 self.calls += [
1906 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1907 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
1908 'deadbeaf'),
1909 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
1910 ((['git', 'config', 'branch.feature.gerritserver'],),
1911 'chromium-review.googlesource.com'),
1912 ]
1913 cl = git_cl.Changelist(issue=123, codereview='gerrit')
1914 cl._codereview_impl._GetChangeDetail = lambda _: {
1915 'labels': {},
1916 'current_revision': 'deadbeaf',
1917 }
1918 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07001919 out = StringIO.StringIO()
1920 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07001921 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07001922 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
tandriic4344b52016-08-29 06:04:54 -07001923
tandrii221ab252016-10-06 08:12:04 -07001924 BUILDBUCKET_BUILDS_MAP = {
1925 '9000': {
1926 'id': '9000',
1927 'status': 'STARTED',
1928 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
1929 'result_details_json': '{"properties": {}}',
1930 'bucket': 'master.x.y',
1931 'created_by': 'user:someone@chromium.org',
1932 'created_ts': '147200002222000',
1933 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
1934 },
1935 '8000': {
1936 'id': '8000',
1937 'status': 'COMPLETED',
1938 'result': 'FAILURE',
1939 'failure_reason': 'BUILD_FAILURE',
1940 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
1941 'result_details_json': '{"properties": {}}',
1942 'bucket': 'master.x.y',
1943 'created_by': 'user:someone@chromium.org',
1944 'created_ts': '147200001111000',
1945 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
1946 },
1947 }
1948
1949 def test_write_try_results_json(self):
1950 expected_output = [
1951 {
1952 'buildbucket_id': '8000',
1953 'bucket': 'master.x.y',
1954 'builder_name': 'my-builder',
1955 'status': 'COMPLETED',
1956 'result': 'FAILURE',
1957 'failure_reason': 'BUILD_FAILURE',
1958 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
1959 },
1960 {
1961 'buildbucket_id': '9000',
1962 'bucket': 'master.x.y',
1963 'builder_name': 'my-builder',
1964 'status': 'STARTED',
1965 'result': None,
1966 'failure_reason': None,
1967 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
1968 }
1969 ]
1970 self.calls = [(('write_json', 'output.json', expected_output), '')]
1971 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
1972
1973 def _setup_fetch_try_jobs_rietveld(self, *request_results):
1974 out = StringIO.StringIO()
1975 self.mock(sys, 'stdout', out)
1976 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda *args: 20001)
1977 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
1978 self._mocked_call(['get_authenticator_for_host', host]))
1979 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
1980 self._mocked_call(['_buildbucket_retry']))
1981 self.calls += [
1982 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1983 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
1984 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1985 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1986 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1987 ((['git', 'config', 'branch.feature.rietveldserver'],),
1988 'codereview.example.com'),
1989 ((['get_authenticator_for_host', 'codereview.example.com'],),
1990 AuthenticatorMock()),
1991 ] + [((['_buildbucket_retry'],), r) for r in request_results]
1992
1993 def test_fetch_try_jobs_none_rietveld(self):
1994 self._setup_fetch_try_jobs_rietveld({})
1995 self.assertEqual(0, git_cl.main(['try-results']))
1996 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
1997
1998 def test_fetch_try_jobs_some_rietveld(self):
1999 self._setup_fetch_try_jobs_rietveld({
2000 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2001 })
2002 self.assertEqual(0, git_cl.main(['try-results']))
2003 self.assertRegexpMatches(sys.stdout.getvalue(), 'Failures:')
2004 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2005 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2006
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002007
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002008if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002009 git_cl.logging.basicConfig(
2010 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002011 unittest.main()