blob: f2c05a0d088288c0ba0dab7a649342c9d3e8a695 [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
41 def UpdateDescription(self, desc):
42 ChangelistMock.desc = desc
43
tandrii5d48c322016-08-18 16:19:37 -070044
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000045class PresubmitMock(object):
46 def __init__(self, *args, **kwargs):
47 self.reviewers = []
48 @staticmethod
49 def should_continue():
50 return True
51
52
53class RietveldMock(object):
54 def __init__(self, *args, **kwargs):
55 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000056
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000057 @staticmethod
58 def get_description(issue):
59 return 'Issue: %d' % issue
60
maruel@chromium.org78936cb2013-04-11 00:17:52 +000061 @staticmethod
62 def get_issue_properties(_issue, _messages):
63 return {
64 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
65 'messages': [
66 {
67 'approval': True,
68 'sender': 'john@chromium.org',
69 },
70 ],
71 }
72
iannuccie53c9352016-08-17 14:40:40 -070073 @staticmethod
74 def close_issue(_issue):
75 return 'Closed'
76
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000077
78class WatchlistsMock(object):
79 def __init__(self, _):
80 pass
81 @staticmethod
82 def GetWatchersForPaths(_):
83 return ['joe@example.com']
84
85
ukai@chromium.org78c4b982012-02-14 02:20:26 +000086class CodereviewSettingsFileMock(object):
87 def __init__(self):
88 pass
89 # pylint: disable=R0201
90 def read(self):
91 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +000092 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +000093
94
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +000095class AuthenticatorMock(object):
96 def __init__(self, *_args):
97 pass
98 def has_cached_credentials(self):
99 return True
100
101
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000102def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
103 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
104
105 Usage:
106 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
107 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
108
109 OR
110 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
111 CookiesAuthenticatorMockFactory(cookie='cookie'))
112 """
113 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
114 def __init__(self): # pylint: disable=W0231
115 # Intentionally not calling super() because it reads actual cookie files.
116 pass
117 @classmethod
118 def get_gitcookies_path(cls):
119 return '~/.gitcookies'
120 @classmethod
121 def get_netrc_path(cls):
122 return '~/.netrc'
123 def get_auth_header(self, host):
124 if same_cookie:
125 return same_cookie
126 return (hosts_with_creds or {}).get(host)
127 return CookiesAuthenticatorMock
128
129
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000130class TestGitClBasic(unittest.TestCase):
131 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
132 parsed = urlparse.urlparse(url)
133 result = func(parsed)
134 if fail:
135 self.assertIsNone(result)
136 return None
137 self.assertIsNotNone(result)
138 self.assertEqual(result.issue, issue)
139 self.assertEqual(result.patchset, patchset)
140 self.assertEqual(result.hostname, hostname)
141 return result
142
143 def test_ParseIssueURL_rietveld(self):
144 def test(url, issue=None, patchset=None, hostname=None, patch_url=None,
145 fail=None):
146 result = self._test_ParseIssueUrl(
147 git_cl._RietveldChangelistImpl.ParseIssueURL,
148 url, issue, patchset, hostname, fail)
149 if not fail:
150 self.assertEqual(result.patch_url, patch_url)
151
152 test('http://codereview.chromium.org/123',
153 123, None, 'codereview.chromium.org')
154 test('https://codereview.chromium.org/123',
155 123, None, 'codereview.chromium.org')
156 test('https://codereview.chromium.org/123/',
157 123, None, 'codereview.chromium.org')
158 test('https://codereview.chromium.org/123/whatever',
159 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700160 test('https://codereview.chromium.org/123/#ps20001',
161 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000162 test('http://codereview.chromium.org/download/issue123_4.diff',
163 123, 4, 'codereview.chromium.org',
164 patch_url='https://codereview.chromium.org/download/issue123_4.diff')
165 # This looks like bad Gerrit, but is actually valid Rietveld.
166 test('https://chrome-review.source.com/123/4/',
167 123, None, 'chrome-review.source.com')
168
169 test('https://codereview.chromium.org/deadbeaf', fail=True)
170 test('https://codereview.chromium.org/api/123', fail=True)
171 test('bad://codereview.chromium.org/123', fail=True)
172 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
173
174 def test_ParseIssueURL_gerrit(self):
175 def test(url, issue=None, patchset=None, hostname=None, fail=None):
176 self._test_ParseIssueUrl(
177 git_cl._GerritChangelistImpl.ParseIssueURL,
178 url, issue, patchset, hostname, fail)
179
180 test('http://chrome-review.source.com/c/123',
181 123, None, 'chrome-review.source.com')
182 test('https://chrome-review.source.com/c/123/',
183 123, None, 'chrome-review.source.com')
184 test('https://chrome-review.source.com/c/123/4',
185 123, 4, 'chrome-review.source.com')
186 test('https://chrome-review.source.com/#/c/123/4',
187 123, 4, 'chrome-review.source.com')
188 test('https://chrome-review.source.com/c/123/4',
189 123, 4, 'chrome-review.source.com')
190 test('https://chrome-review.source.com/123',
191 123, None, 'chrome-review.source.com')
192 test('https://chrome-review.source.com/123/4',
193 123, 4, 'chrome-review.source.com')
194
195 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
196 test('https://chrome-review.source.com/c/abc/', fail=True)
197 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
198
199 def test_ParseIssueNumberArgument(self):
200 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
201 result = git_cl.ParseIssueNumberArgument(arg)
202 self.assertIsNotNone(result)
203 if fail:
204 self.assertFalse(result.valid)
205 else:
206 self.assertEqual(result.issue, issue)
207 self.assertEqual(result.patchset, patchset)
208 self.assertEqual(result.hostname, hostname)
209
210 test('123', 123)
211 test('', fail=True)
212 test('abc', fail=True)
213 test('123/1', fail=True)
214 test('123a', fail=True)
215 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
216 # Rietveld.
217 test('https://codereview.source.com/123',
218 123, None, 'codereview.source.com')
219 test('https://codereview.source.com/www123', fail=True)
220 # Gerrrit.
221 test('https://chrome-review.source.com/c/123/4',
222 123, 4, 'chrome-review.source.com')
223 test('https://chrome-review.source.com/bad/123/4', fail=True)
224
tandriif9aefb72016-07-01 09:06:51 -0700225 def test_get_bug_line_values(self):
226 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
227 self.assertEqual(f('', ''), [])
228 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
229 self.assertEqual(f('v8', '456'), ['v8:456'])
230 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
231 # Not nice, but not worth carying.
232 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
233 ['v8:456', 'chromium:123', 'v8:123'])
234
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000235
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000236class TestGitCl(TestCase):
237 def setUp(self):
238 super(TestGitCl, self).setUp()
239 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700240 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000241 self.mock(subprocess2, 'call', self._mocked_call)
242 self.mock(subprocess2, 'check_call', self._mocked_call)
243 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700244 self.mock(subprocess2, 'communicate',
245 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000246 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000247 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000248 self.mock(git_common, 'get_or_create_merge_base',
249 lambda *a: (
250 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000251 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000252 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000253 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700254 self.mock(git_cl, 'write_json', lambda path, contents:
255 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000256 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000257 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000258 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000259 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000260 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000261 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000262 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
263 classmethod(lambda _: False))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000264 # It's important to reset settings to not have inter-tests interference.
265 git_cl.settings = None
266
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000267
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000268 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000269 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000270 # Note: has_failed returns True if at least 1 test ran so far, current
271 # included, has failed. That means current test may have actually ran
272 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000273 if not self.has_failed():
274 self.assertEquals([], self.calls)
275 finally:
276 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000277
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000278 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000279 self.assertTrue(
280 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700281 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000282 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000283 expected_args, result = top
284
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000285 # Also logs otherwise it could get caught in a try/finally and be hard to
286 # diagnose.
287 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700288 N = 5
289 prior_calls = '\n '.join(
290 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
291 for i, c in enumerate(self._calls_done[-N:]))
292 following_calls = '\n '.join(
293 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
294 for i, c in enumerate(self.calls[:N]))
295 extended_msg = (
296 'A few prior calls:\n %s\n\n'
297 'This (expected):\n @%d: %r\n'
298 'This (actual):\n @%d: %r\n\n'
299 'A few following expected calls:\n %s' %
300 (prior_calls, len(self._calls_done), expected_args,
301 len(self._calls_done), args, following_calls))
302 git_cl.logging.error(extended_msg)
303
tandrii99a72f22016-08-17 14:33:24 -0700304 self.fail('@%d\n'
305 ' Expected: %r\n'
306 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700307 len(self._calls_done), expected_args, args))
308
309 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700310 if isinstance(result, Exception):
311 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000312 return result
313
maruel@chromium.orga3353652011-11-30 14:26:57 +0000314 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000315 def _is_gerrit_calls(cls, gerrit=False):
316 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
317 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
318
319 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000320 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000321 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000322 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000323
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000324 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000325 def _upload_no_rev_calls(cls, similarity, find_copies):
326 return (cls._git_base_calls(similarity, find_copies) +
327 cls._git_upload_no_rev_calls())
328
329 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000330 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000331 if similarity is None:
332 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700333 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700334 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000335 else:
tandrii33a46ff2016-08-23 05:53:40 -0700336 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700337 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000338
339 if find_copies is None:
340 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700341 find_copies_call = ((['git', 'config', '--bool',
342 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000343 else:
tandrii5d48c322016-08-18 16:19:37 -0700344 val = str(find_copies).lower()
345 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000346 'branch.master.git-find-copies', val],), '')
347
348 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000349 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000350 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000351 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000352 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000353 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000354 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000355
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000356 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000357 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000358 similarity_call,
359 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
360 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000361 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000362 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700363 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
364 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000365 ((['git', 'config', 'rietveld.server'],),
366 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000367 ((['git', 'config', 'branch.master.merge'],), 'master'),
368 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000369 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000370 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000371 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000372 ((['git', 'rev-parse', '--show-cdup'],), ''),
373 ((['git', 'rev-parse', 'HEAD'],), '12345'),
374 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000375 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000376 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700377 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000378 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000379 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000380 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000381 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000382 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000383 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000384 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000385 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000386 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000387 ]
388
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000389 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000390 def _git_upload_no_rev_calls(cls):
391 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000392 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000393 ]
394
395 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000396 def _git_upload_calls(cls, private):
397 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000398 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000399 private_call = []
400 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000401 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000402 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000403 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000404
maruel@chromium.orga3353652011-11-30 14:26:57 +0000405 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000406 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000407 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000408 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000409 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000410 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000411 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
412 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000413 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000414 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000415 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700416 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000417 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000418 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000419 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700420 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000421 ] + cls._git_post_upload_calls()
422
423 @classmethod
424 def _git_post_upload_calls(cls):
425 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000426 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
427 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
428 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000429 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000430 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000431 ]
432
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000433 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000434 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000435 fake_ancestor = 'fake_ancestor'
436 fake_cl = 'fake_cl_for_patch'
437 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000438 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000439 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000440 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000441 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000442 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000443 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000444 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000445 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700446 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000447 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000448 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000449 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000450 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000451 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000452 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000453 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000454 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000455 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000456 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000457 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000458
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000459 @classmethod
460 def _dcommit_calls_1(cls):
461 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000462 ((['git', 'config', 'rietveld.autoupdate'],),
463 ''),
464 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
465 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000466 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000467 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000468 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
469 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
470 None),
471 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000472 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii33a46ff2016-08-23 05:53:40 -0700473 ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700474 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000475 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700476 ((['git', 'config', '--bool',
477 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000478 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
479 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700480 'config', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000481 ((['git',
482 'config', 'rietveld.server'],), 'codereview.example.com'),
483 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000484 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000485 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000486 ((['git', 'config', 'branch.working.merge'],),
487 'refs/heads/master'),
488 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000489 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000490 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000491 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000492 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000493 'refs/remotes/origin/master'],),
494 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000495 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000496 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000497 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000498 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000499 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000500 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000501 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000502 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000503 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000504 ]
505
506 @classmethod
507 def _dcommit_calls_normal(cls):
508 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000509 ((['git', 'rev-parse', '--show-cdup'],), ''),
510 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000511 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000512 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000513 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000514 '.'],),
515 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000516 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700517 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000518 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000519 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000520 ((['git', 'config', 'user.email'],), 'author@example.com'),
521 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000522 ]
523
524 @classmethod
525 def _dcommit_calls_bypassed(cls):
526 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000527 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000528 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000529 ]
530
531 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000532 def _dcommit_calls_3(cls):
533 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000534 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000535 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000536 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000537 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000538 (' PRESUBMIT.py | 2 +-\n'
539 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000540 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700541 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000542 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
543 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700544 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000545 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000546 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
547 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
548 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000549 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000550 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000551 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000552 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000553 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000554 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000555 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000556 ((['git', 'checkout', '-q', 'working'],), ''),
557 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000558 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000559
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000560 @staticmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000561 def _cmd_line(description, args, similarity, find_copies, private):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000562 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000563 return [
564 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000565 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000566 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000567 ] + args + [
568 '--cc', 'joe@example.com',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000569 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000570 '--git_similarity', similarity or '50'
571 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000572 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000573 ]
574
575 def _run_reviewer_test(
576 self,
577 upload_args,
578 expected_description,
579 returned_description,
580 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000581 reviewers,
582 private=False):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000583 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000584 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000585 try:
586 similarity = upload_args[upload_args.index('--similarity')+1]
587 except ValueError:
588 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000589
590 if '--find-copies' in upload_args:
591 find_copies = True
592 elif '--no-find-copies' in upload_args:
593 find_copies = False
594 else:
595 find_copies = None
596
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000597 private = '--private' in upload_args
598
599 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000600
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000601 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000602 self.assertEquals(
603 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000604 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000605 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000606 '#--------------------This line is 72 characters long'
607 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000608 expected_description,
609 desc)
610 return returned_description
611 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000612
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000613 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000614 cmd_line = self._cmd_line(final_description, reviewers, similarity,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000615 find_copies, private)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000616 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000617 return 1, 2
618 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000619
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000620 git_cl.main(['upload'] + upload_args)
621
622 def test_no_reviewer(self):
623 self._run_reviewer_test(
624 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000625 'desc\n\nBUG=',
626 '# Blah blah comment.\ndesc\n\nBUG=',
627 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000628 [])
629
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000630 def test_keep_similarity(self):
631 self._run_reviewer_test(
632 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000633 'desc\n\nBUG=',
634 '# Blah blah comment.\ndesc\n\nBUG=',
635 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000636 [])
637
iannucci@chromium.org79540052012-10-19 23:15:26 +0000638 def test_keep_find_copies(self):
639 self._run_reviewer_test(
640 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000641 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000642 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000643 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000644 [])
645
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000646 def test_private(self):
647 self._run_reviewer_test(
648 ['--private'],
649 'desc\n\nBUG=',
650 '# Blah blah comment.\ndesc\n\nBUG=\n',
651 'desc\n\nBUG=',
652 [])
653
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000654 def test_reviewers_cmd_line(self):
655 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000656 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000657 self._run_reviewer_test(
658 ['-r' 'foo@example.com'],
659 description,
660 '\n%s\n' % description,
661 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000662 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000663
664 def test_reviewer_tbr_overriden(self):
665 # Reviewer is overriden with TBR
666 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000667 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000668 self._run_reviewer_test(
669 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000670 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000671 description.strip('\n'),
672 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000673 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000674
675 def test_reviewer_multiple(self):
676 # Handles multiple R= or TBR= lines.
677 description = (
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000678 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000679 self._run_reviewer_test(
680 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000681 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000682 description,
683 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000684 ['--reviewers=another@example.com,reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000685
maruel@chromium.orga3353652011-11-30 14:26:57 +0000686 def test_reviewer_send_mail(self):
687 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000688 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000689 self._run_reviewer_test(
690 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000691 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000692 description.strip('\n'),
693 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000694 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000695
696 def test_reviewer_send_mail_no_rev(self):
697 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000698 stdout = StringIO.StringIO()
699 stderr = StringIO.StringIO()
maruel@chromium.orga3353652011-11-30 14:26:57 +0000700 try:
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000701 self.calls = self._upload_no_rev_calls(None, None)
702 def RunEditor(desc, _, **kwargs):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000703 return desc
704 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000705 self.mock(sys, 'stdout', stdout)
706 self.mock(sys, 'stderr', stderr)
maruel@chromium.orga3353652011-11-30 14:26:57 +0000707 git_cl.main(['upload', '--send-mail'])
708 self.fail()
709 except SystemExit:
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000710 self.assertEqual(
711 'Using 50% similarity for rename/copy detection. Override with '
712 '--similarity.\n',
713 stdout.getvalue())
714 self.assertEqual(
715 'Must specify reviewers to send email.\n', stderr.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000716
tandriif9aefb72016-07-01 09:06:51 -0700717 def test_bug_on_cmd(self):
718 self._run_reviewer_test(
719 ['--bug=500658,proj:123'],
720 'desc\n\nBUG=500658\nBUG=proj:123',
721 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
722 'desc\n\nBUG=500658\nBUG=proj:1234',
723 [])
724
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000725 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000726 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000727 self.calls = (
728 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000729 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000730 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000731 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000732 git_cl.main(['dcommit'])
733
734 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000735 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000736 self.calls = (
737 self._dcommit_calls_1() +
738 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000739 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000740 git_cl.main(['dcommit', '--bypass-hooks'])
741
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000742
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000743 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000744 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000745 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000746 if skip_auth_check:
747 return [((cmd, ), 'true')]
748
tandrii5d48c322016-08-18 16:19:37 -0700749 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000750 if issue:
751 calls.extend([
752 ((['git', 'config', 'branch.master.gerritserver'],), ''),
753 ])
754 calls.extend([
755 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
756 ((['git', 'config', 'branch.master.remote'],), 'origin'),
757 ((['git', 'config', 'remote.origin.url'],),
758 'https://chromium.googlesource.com/my/repo'),
759 ((['git', 'config', 'remote.origin.url'],),
760 'https://chromium.googlesource.com/my/repo'),
761 ])
762 return calls
763
764 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000765 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000766 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000767 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700768 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -0700769 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000770 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700771 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
772 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000773 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000774 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700775 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
776 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -0700777 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000778 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000779 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000780 ((['get_or_create_merge_base', 'master',
781 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000782 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000783 # Calls to verify branch point is ancestor
784 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
785 cls._git_sanity_checks('fake_ancestor_sha', 'master',
786 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000787 ((['git', 'rev-parse', '--show-cdup'],), ''),
788 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000789
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000791 'diff', '--name-status', '--no-renames', '-r',
792 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000793 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700794 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000795 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000796 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000797 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000798 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000799 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000800 ((['git', 'config', 'user.email'],), 'me@example.com'),
801 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000802 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000803 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000804 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000805 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000806
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000807 @classmethod
808 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700809 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000810 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000811 ref_suffix='', notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000812 post_amend_description=None, issue=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000813 if post_amend_description is None:
814 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -0700815 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000816
tandriia60502f2016-06-20 02:01:53 -0700817 if squash_mode == 'default':
818 calls.extend([
819 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
820 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
821 ])
822 elif squash_mode in ('override_squash', 'override_nosquash'):
823 calls.extend([
824 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
825 'true' if squash_mode == 'override_squash' else 'false'),
826 ])
827 else:
828 assert squash_mode in ('squash', 'nosquash')
829
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000830 # If issue is given, then description is fetched from Gerrit instead.
831 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000832 calls += [
833 ((['git', 'log', '--pretty=format:%s\n\n%b',
834 'fake_ancestor_sha..HEAD'],),
835 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000836 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000837 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000838 # DownloadGerritHook(False)
839 ((False, ),
840 ''),
841 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000842 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000843 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000844 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000846 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000847 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000848 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000849 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000850 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000851 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000852 if not issue:
853 # Prompting to edit description on first upload.
854 calls += [
855 ((['git', 'config', 'core.editor'],), ''),
856 ((['RunEditor'],), description),
857 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000858 ref_to_push = 'abcdef0123456789'
859 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000860 ((['git', 'config', 'branch.master.merge'],),
861 'refs/heads/master'),
862 ((['git', 'config', 'branch.master.remote'],),
863 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000864 ((['get_or_create_merge_base', 'master',
865 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000866 'origin/master'),
867 ((['git', 'rev-parse', 'HEAD:'],),
868 '0123456789abcdef'),
869 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000870 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000871 ref_to_push),
872 ]
873 else:
874 ref_to_push = 'HEAD'
875
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000876 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000877 ((['git', 'rev-list',
878 expected_upstream_ref + '..' + ref_to_push],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000879 ((['git', 'config', 'rietveld.cc'],), '')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000880 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000881
882 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
883 if ref_suffix:
884 ref_suffix += ',' + notify_suffix
885 else:
886 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000887
888 # Add cc from watch list.
889 ref_suffix += ',cc=joe@example.com'
890
ukai@chromium.orge8077812012-02-03 03:41:46 +0000891 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000892 ref_suffix += ',' + ','.join('r=%s' % email
893 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000894 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000895 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000896 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000897 ('remote:\n'
898 'remote: Processing changes: (\)\n'
899 'remote: Processing changes: (|)\n'
900 'remote: Processing changes: (/)\n'
901 'remote: Processing changes: (-)\n'
902 'remote: Processing changes: new: 1 (/)\n'
903 'remote: Processing changes: new: 1, done\n'
904 'remote:\n'
905 'remote: New Changes:\n'
906 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
907 'remote:\n'
908 'To https://chromium.googlesource.com/yyy/zzz\n'
909 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000910 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000911 if squash:
912 calls += [
tandrii33a46ff2016-08-23 05:53:40 -0700913 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -0700914 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000915 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -0700916 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000917 ((['git', 'config', 'branch.master.gerritsquashhash',
918 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000919 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000920 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000921 return calls
922
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000923 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000924 self,
925 upload_args,
926 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000927 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -0700928 squash=True,
929 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000930 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000931 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000932 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000933 post_amend_description=None,
934 issue=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000935 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -0700936 if squash_mode is None:
937 if '--no-squash' in upload_args:
938 squash_mode = 'nosquash'
939 elif '--squash' in upload_args:
940 squash_mode = 'squash'
941 else:
942 squash_mode = 'default'
943
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000944 reviewers = reviewers or []
tandrii@chromium.org28253532016-04-14 13:46:56 +0000945 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -0700946 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000947 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -0700948 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
949 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -0700950 self.mock(git_cl.gclient_utils, 'RunEditor',
951 lambda *_, **__: self._mocked_call(['RunEditor']))
952 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
953
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000954 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +0000955 self.calls += self._gerrit_upload_calls(
956 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700957 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000958 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000959 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000960 post_amend_description=post_amend_description,
961 issue=issue)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000962 # Uncomment when debugging.
963 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000964 git_cl.main(['upload'] + upload_args)
965
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000966 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -0700967 self._run_gerrit_upload_test(
968 ['--no-squash'],
969 'desc\n\nBUG=\n',
970 [],
971 squash=False,
972 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
973
974 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000975 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000976 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000977 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +0000978 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000979 [],
tandriia60502f2016-06-20 02:01:53 -0700980 squash=False,
981 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000982 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000983
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000984 def test_gerrit_no_reviewer(self):
985 self._run_gerrit_upload_test(
986 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000987 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -0700988 [],
989 squash=False,
990 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000991
tandriieefe8322016-08-17 10:12:24 -0700992 def test_gerrit_patch_bad_chars(self):
993 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000994 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -0700995 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000996 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -0700997 squash=False,
998 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -0700999 ref_suffix='%m=Dont_put_bad_chars')
1000 self.assertIn(
1001 'WARNING: Patchset title may only contain alphanumeric chars '
1002 'and spaces. Cleaned up title:\nDont put bad chars\n',
1003 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001004
ukai@chromium.orge8077812012-02-03 03:41:46 +00001005 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001006 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001007 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001008 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001009 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001010 squash=False,
1011 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001012 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001013
1014 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001015 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001016 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001017 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
1018 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001019 ['reviewer@example.com', 'another@example.com'],
1020 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001021 squash_mode='override_nosquash',
1022 ref_suffix='%l=Code-Review+1')
tandriia60502f2016-06-20 02:01:53 -07001023
1024 def test_gerrit_upload_squash_first_is_default(self):
1025 # Mock Gerrit CL description to indicate the first upload.
1026 self.mock(git_cl.Changelist, 'GetDescription',
1027 lambda *_: None)
1028 self._run_gerrit_upload_test(
1029 [],
1030 'desc\nBUG=\n\nChange-Id: 123456789',
1031 [],
1032 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001033
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001034 def test_gerrit_upload_squash_first(self):
1035 # Mock Gerrit CL description to indicate the first upload.
1036 self.mock(git_cl.Changelist, 'GetDescription',
1037 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001038 self._run_gerrit_upload_test(
1039 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001040 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001041 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001042 squash=True,
1043 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001044
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001045 def test_gerrit_upload_squash_reupload(self):
1046 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1047 # Mock Gerrit CL description to indicate re-upload.
1048 self.mock(git_cl.Changelist, 'GetDescription',
1049 lambda *args: description)
1050 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1051 lambda *args: 1)
1052 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1053 lambda *args: {'change_id': '123456789'})
1054 self._run_gerrit_upload_test(
1055 ['--squash'],
1056 description,
1057 [],
1058 squash=True,
1059 expected_upstream_ref='origin/master',
1060 issue=123456)
1061
rmistry@google.com2dd99862015-06-22 12:22:18 +00001062 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001063 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001064 def mock_run_git(*args, **_kwargs):
1065 if args[0] == ['for-each-ref',
1066 '--format=%(refname:short) %(upstream:short)',
1067 'refs/heads']:
1068 # Create a local branch dependency tree that looks like this:
1069 # test1 -> test2 -> test3 -> test4 -> test5
1070 # -> test3.1
1071 # test6 -> test0
1072 branch_deps = [
1073 'test2 test1', # test1 -> test2
1074 'test3 test2', # test2 -> test3
1075 'test3.1 test2', # test2 -> test3.1
1076 'test4 test3', # test3 -> test4
1077 'test5 test4', # test4 -> test5
1078 'test6 test0', # test0 -> test6
1079 'test7', # test7
1080 ]
1081 return '\n'.join(branch_deps)
1082 self.mock(git_cl, 'RunGit', mock_run_git)
1083
1084 class RecordCalls:
1085 times_called = 0
1086 record_calls = RecordCalls()
1087 def mock_CMDupload(*args, **_kwargs):
1088 record_calls.times_called += 1
1089 return 0
1090 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1091
1092 self.calls = [
1093 (('[Press enter to continue or ctrl-C to quit]',), ''),
1094 ]
1095
1096 class MockChangelist():
1097 def __init__(self):
1098 pass
1099 def GetBranch(self):
1100 return 'test1'
1101 def GetIssue(self):
1102 return '123'
1103 def GetPatchset(self):
1104 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001105 def IsGerrit(self):
1106 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001107
1108 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1109 # CMDupload should have been called 5 times because of 5 dependent branches.
1110 self.assertEquals(5, record_calls.times_called)
1111 self.assertEquals(0, ret)
1112
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001113 def test_gerrit_change_id(self):
1114 self.calls = [
1115 ((['git', 'write-tree'], ),
1116 'hashtree'),
1117 ((['git', 'rev-parse', 'HEAD~0'], ),
1118 'branch-parent'),
1119 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1120 'A B <a@b.org> 1456848326 +0100'),
1121 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1122 'C D <c@d.org> 1456858326 +0100'),
1123 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1124 'hashchange'),
1125 ]
1126 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1127 self.assertEqual(change_id, 'Ihashchange')
1128
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001129 def test_desecription_append_footer(self):
1130 for init_desc, footer_line, expected_desc in [
1131 # Use unique desc first lines for easy test failure identification.
1132 ('foo', 'R=one', 'foo\n\nR=one'),
1133 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1134 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1135 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1136 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1137 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1138 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1139 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1140 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1141 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1142 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1143 ]:
1144 desc = git_cl.ChangeDescription(init_desc)
1145 desc.append_footer(footer_line)
1146 self.assertEqual(desc.description, expected_desc)
1147
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001148 def test_update_reviewers(self):
1149 data = [
1150 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001151 ('foo\nR=xx', [], 'foo\nR=xx'),
1152 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001153 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001154 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1155 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1156 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001157 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001158 ('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 +00001159 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001160 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1161 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1162 # Same as the line before, but full of whitespaces.
1163 (
1164 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1165 'foo\nBar\n\nR=c@c\n BUG =',
1166 ),
1167 # Whitespaces aren't interpreted as new lines.
1168 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001169 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001170 expected = [i[2] for i in data]
1171 actual = []
1172 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001173 obj = git_cl.ChangeDescription(orig)
1174 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001175 actual.append(obj.description)
1176 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001177
wittman@chromium.org455dc922015-01-26 20:15:50 +00001178 def test_get_target_ref(self):
1179 # Check remote or remote branch not present.
1180 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1181 self.assertEqual(None, git_cl.GetTargetRef(None,
1182 'refs/remotes/origin/master',
1183 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001184
wittman@chromium.org455dc922015-01-26 20:15:50 +00001185 # Check default target refs for branches.
1186 self.assertEqual('refs/heads/master',
1187 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1188 None, None))
1189 self.assertEqual('refs/heads/master',
1190 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1191 None, None))
1192 self.assertEqual('refs/heads/master',
1193 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1194 None, None))
1195 self.assertEqual('refs/branch-heads/123',
1196 git_cl.GetTargetRef('origin',
1197 'refs/remotes/branch-heads/123',
1198 None, None))
1199 self.assertEqual('refs/diff/test',
1200 git_cl.GetTargetRef('origin',
1201 'refs/remotes/origin/refs/diff/test',
1202 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001203 self.assertEqual('refs/heads/chrome/m42',
1204 git_cl.GetTargetRef('origin',
1205 'refs/remotes/origin/chrome/m42',
1206 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001207
1208 # Check target refs for user-specified target branch.
1209 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1210 'refs/remotes/branch-heads/123'):
1211 self.assertEqual('refs/branch-heads/123',
1212 git_cl.GetTargetRef('origin',
1213 'refs/remotes/origin/master',
1214 branch, None))
1215 for branch in ('origin/master', 'remotes/origin/master',
1216 'refs/remotes/origin/master'):
1217 self.assertEqual('refs/heads/master',
1218 git_cl.GetTargetRef('origin',
1219 'refs/remotes/branch-heads/123',
1220 branch, None))
1221 for branch in ('master', 'heads/master', 'refs/heads/master'):
1222 self.assertEqual('refs/heads/master',
1223 git_cl.GetTargetRef('origin',
1224 'refs/remotes/branch-heads/123',
1225 branch, None))
1226
1227 # Check target refs for pending prefix.
1228 self.assertEqual('prefix/heads/master',
1229 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1230 None, 'prefix/'))
1231
wychen@chromium.orga872e752015-04-28 23:42:18 +00001232 def test_patch_when_dirty(self):
1233 # Patch when local tree is dirty
1234 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1235 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1236
1237 def test_diff_when_dirty(self):
1238 # Do 'git cl diff' when local tree is dirty
1239 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1240 self.assertNotEqual(git_cl.main(['diff']), 0)
1241
tandriidf09a462016-08-18 16:23:55 -07001242 def _patch_common(self, is_gerrit=False, force_codereview=False,
1243 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001244 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001245 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1246 lambda x: '60001')
1247 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
1248 lambda *args: None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001249 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1250 lambda *args: {
1251 'current_revision': '7777777777',
1252 'revisions': {
1253 '1111111111': {
1254 '_number': 1,
1255 'fetch': {'http': {
1256 'url': 'https://chromium.googlesource.com/my/repo',
1257 'ref': 'refs/changes/56/123456/1',
1258 }},
1259 },
1260 '7777777777': {
1261 '_number': 7,
1262 'fetch': {'http': {
1263 'url': 'https://chromium.googlesource.com/my/repo',
1264 'ref': 'refs/changes/56/123456/7',
1265 }},
1266 },
1267 },
1268 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001269 self.mock(git_cl.Changelist, 'GetDescription',
1270 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001271 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1272
tandriidf09a462016-08-18 16:23:55 -07001273 if new_branch:
1274 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1275 else:
1276 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001277 if not force_codereview:
1278 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001279 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001280 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001281 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1282 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001283 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001284 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001285
1286 if is_gerrit:
1287 if not force_codereview:
1288 self.calls += [
1289 ((['git', 'config', 'gerrit.host'],), 'true'),
1290 ]
1291 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001292 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001293 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001294 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1295 ((['git', 'rev-parse', '--show-cdup'],), ''),
1296 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
1297 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001298
tandriidf09a462016-08-18 16:23:55 -07001299 def _common_patch_successful(self, new_branch=False):
1300 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001301 self.calls += [
1302 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
1303 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001304 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001305 'patch from issue 123456 at patchset 60001 ' +
1306 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001307 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001308 ''),
1309 ((['git', 'config', 'branch.master.rietveldserver'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001310 ((['git', 'config', 'branch.master.rietveldserver',
1311 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001312 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001313 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001314 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001315
1316 def test_patch_successful(self):
1317 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001318 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1319
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001320 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001321 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001322 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1323
wychen@chromium.orga872e752015-04-28 23:42:18 +00001324 def test_patch_conflict(self):
1325 self._patch_common()
1326 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001327 ((['git', 'apply', '--index', '-p0', '--3way'],), CERR1),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001328 ]
1329 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001330
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001331 def test_gerrit_patch_successful(self):
1332 self._patch_common(is_gerrit=True)
1333 self.calls += [
1334 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1335 'refs/changes/56/123456/7'],), ''),
1336 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001337 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001338 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001339 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1340 ((['git', 'config', 'branch.master.merge'],), 'master'),
1341 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1342 ((['git', 'config', 'remote.origin.url'],),
1343 'https://chromium.googlesource.com/my/repo'),
1344 ((['git', 'config', 'branch.master.gerritserver',
1345 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001346 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001347 ]
1348 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1349
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001350 def test_patch_force_codereview(self):
1351 self._patch_common(is_gerrit=True, force_codereview=True)
1352 self.calls += [
1353 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1354 'refs/changes/56/123456/7'],), ''),
1355 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1356 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001357 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001358 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001359 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1360 ((['git', 'config', 'branch.master.merge'],), 'master'),
1361 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1362 ((['git', 'config', 'remote.origin.url'],),
1363 'https://chromium.googlesource.com/my/repo'),
1364 ((['git', 'config', 'branch.master.gerritserver',
1365 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001366 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001367 ]
1368 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1369
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001370 def test_gerrit_patch_url_successful(self):
1371 self._patch_common(is_gerrit=True)
1372 self.calls += [
1373 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1374 'refs/changes/56/123456/1'],), ''),
1375 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001376 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001377 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001378 ((['git', 'config', 'branch.master.gerritserver',
1379 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001380 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001381 ]
1382 self.assertEqual(git_cl.main(
1383 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1384
1385 def test_gerrit_patch_conflict(self):
1386 self._patch_common(is_gerrit=True)
1387 self.mock(git_cl, 'DieWithError',
1388 lambda msg: self._mocked_call(['DieWithError', msg]))
1389 class SystemExitMock(Exception):
1390 pass
1391 self.calls += [
1392 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1393 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001394 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1395 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1396 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001397 ]
1398 with self.assertRaises(SystemExitMock):
1399 git_cl.main(['patch',
1400 'https://chromium-review.googlesource.com/#/c/123456/1'])
1401
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001402 def _checkout_calls(self):
1403 return [
1404 ((['git', 'config', '--local', '--get-regexp',
1405 'branch\\..*\\.rietveldissue'], ),
1406 ('branch.retrying.rietveldissue 1111111111\n'
1407 'branch.some-fix.rietveldissue 2222222222\n')),
1408 ((['git', 'config', '--local', '--get-regexp',
1409 'branch\\..*\\.gerritissue'], ),
1410 ('branch.ger-branch.gerritissue 123456\n'
1411 'branch.gbranch654.gerritissue 654321\n')),
1412 ]
1413
1414 def test_checkout_gerrit(self):
1415 """Tests git cl checkout <issue>."""
1416 self.calls = self._checkout_calls()
1417 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1418 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1419
1420 def test_checkout_rietveld(self):
1421 """Tests git cl checkout <issue>."""
1422 self.calls = self._checkout_calls()
1423 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1424 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1425
1426 def test_checkout_not_found(self):
1427 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001428 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001429 self.calls = self._checkout_calls()
1430 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1431
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001432 def test_checkout_no_branch_issues(self):
1433 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001434 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001435 self.calls = [
1436 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001437 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001438 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001439 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001440 ]
1441 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1442
tandrii@chromium.org28253532016-04-14 13:46:56 +00001443 def _test_gerrit_ensure_authenticated_common(self, auth,
1444 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001445 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1446 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1447 self.mock(git_cl, 'DieWithError',
1448 lambda msg: self._mocked_call(['DieWithError', msg]))
1449 self.mock(git_cl, 'ask_for_data',
1450 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001451 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001452 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001453 cl.branch = 'master'
1454 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001455 cl.lookedup_issue = True
1456 return cl
1457
1458 def test_gerrit_ensure_authenticated_missing(self):
1459 cl = self._test_gerrit_ensure_authenticated_common(auth={
1460 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1461 })
1462 self.calls.append(
1463 ((['DieWithError',
1464 'Credentials for the following hosts are required:\n'
1465 ' chromium-review.googlesource.com\n'
1466 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1467 'You can (re)generate your credentails by visiting '
1468 'https://chromium-review.googlesource.com/new-password'],), ''),)
1469 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1470
1471 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001472 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001473 cl = self._test_gerrit_ensure_authenticated_common(auth={
1474 'chromium.googlesource.com': 'one',
1475 'chromium-review.googlesource.com': 'other',
1476 })
1477 self.calls.append(
1478 ((['ask_for_data', 'If you know what you are doing, '
1479 'press Enter to continue, Ctrl+C to abort.'],), ''))
1480 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1481
1482 def test_gerrit_ensure_authenticated_ok(self):
1483 cl = self._test_gerrit_ensure_authenticated_common(auth={
1484 'chromium.googlesource.com': 'same',
1485 'chromium-review.googlesource.com': 'same',
1486 })
1487 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1488
tandrii@chromium.org28253532016-04-14 13:46:56 +00001489 def test_gerrit_ensure_authenticated_skipped(self):
1490 cl = self._test_gerrit_ensure_authenticated_common(
1491 auth={}, skip_auth_check=True)
1492 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1493
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001494 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001495 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1496 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001497 self.calls = [
1498 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001499 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001500 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1501 ((['git', 'config', 'rietveld.server'],), ''),
1502 ((['git', 'config', 'rietveld.server'],), ''),
1503 ((['git', 'config', 'branch.feature.rietveldserver'],),
1504 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001505 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001506 ]
1507 self.assertEqual(0, git_cl.main(['set-commit']))
1508
tandriid9e5ce52016-07-13 02:32:59 -07001509 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001510 self.mock(git_cl.gerrit_util, 'SetReview',
1511 lambda h, i, labels: self._mocked_call(
1512 ['SetReview', h, i, labels]))
1513 self.calls = [
1514 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001515 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1516 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001517 ((['git', 'config', 'branch.feature.gerritserver'],),
1518 'https://chromium-review.googlesource.com'),
1519 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001520 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001521 ]
tandriid9e5ce52016-07-13 02:32:59 -07001522
1523 def test_cmd_set_commit_gerrit_clear(self):
1524 self._cmd_set_commit_gerrit_common(0)
1525 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1526
1527 def test_cmd_set_commit_gerrit_dry(self):
1528 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001529 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1530
tandriid9e5ce52016-07-13 02:32:59 -07001531 def test_cmd_set_commit_gerrit(self):
1532 self._cmd_set_commit_gerrit_common(2)
1533 self.assertEqual(0, git_cl.main(['set-commit']))
1534
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001535 def test_description_display(self):
1536 out = StringIO.StringIO()
1537 self.mock(git_cl.sys, 'stdout', out)
1538
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001539 self.mock(git_cl, 'Changelist', ChangelistMock)
1540 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001541
1542 self.assertEqual(0, git_cl.main(['description', '-d']))
1543 self.assertEqual('foo\n', out.getvalue())
1544
1545 def test_description_rietveld(self):
1546 out = StringIO.StringIO()
1547 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001548 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001549
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001550 self.assertEqual(0, git_cl.main([
1551 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1552 self.assertEqual('foobar\n', out.getvalue())
1553
iannucci3c972b92016-08-17 13:24:10 -07001554 def test_StatusFieldOverrideIssueMissingArgs(self):
1555 out = StringIO.StringIO()
1556 self.mock(git_cl.sys, 'stderr', out)
1557
1558 try:
1559 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1560 except SystemExit as ex:
1561 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001562 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001563
1564 out = StringIO.StringIO()
1565 self.mock(git_cl.sys, 'stderr', out)
1566
1567 try:
1568 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1569 except SystemExit as ex:
1570 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001571 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001572
1573 def test_StatusFieldOverrideIssue(self):
1574 out = StringIO.StringIO()
1575 self.mock(git_cl.sys, 'stdout', out)
1576
1577 def assertIssue(cl_self, *_args):
1578 self.assertEquals(cl_self.issue, 1)
1579 return 'foobar'
1580
1581 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1582 self.calls = [
1583 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1584 ((['git', 'config', 'rietveld.server'],), ''),
1585 ((['git', 'config', 'rietveld.server'],), ''),
1586 ]
iannuccie53c9352016-08-17 14:40:40 -07001587 self.assertEqual(
1588 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1589 0)
iannucci3c972b92016-08-17 13:24:10 -07001590 self.assertEqual(out.getvalue(), 'foobar\n')
1591
iannuccie53c9352016-08-17 14:40:40 -07001592 def test_SetCloseOverrideIssue(self):
1593 def assertIssue(cl_self, *_args):
1594 self.assertEquals(cl_self.issue, 1)
1595 return 'foobar'
1596
1597 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1598 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1599 self.calls = [
1600 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1601 ((['git', 'config', 'rietveld.server'],), ''),
1602 ((['git', 'config', 'rietveld.server'],), ''),
1603 ]
1604 self.assertEqual(
1605 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1606
1607 def test_SetCommitOverrideIssue(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, 'SetCQState', lambda *_: None)
1614 self.calls = [
1615 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1616 ((['git', 'config', 'rietveld.server'],), ''),
1617 ((['git', 'config', 'rietveld.server'],), ''),
1618 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1619 ((['git', 'config', 'rietveld.server'],), ''),
1620 ((['git', 'config', 'rietveld.server'],), ''),
1621 ]
1622 self.assertEqual(
1623 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1624
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001625 def test_description_gerrit(self):
1626 out = StringIO.StringIO()
1627 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001628 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001629
1630 self.assertEqual(0, git_cl.main([
1631 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1632 self.assertEqual('foobar\n', out.getvalue())
1633
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001634 def test_description_set_raw(self):
1635 out = StringIO.StringIO()
1636 self.mock(git_cl.sys, 'stdout', out)
1637
1638 self.mock(git_cl, 'Changelist', ChangelistMock)
1639 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1640
1641 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1642 self.assertEqual('hihi', ChangelistMock.desc)
1643
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001644 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001645 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001646
1647 def RunEditor(desc, _, **kwargs):
1648 self.assertEquals(
1649 '# Enter a description of the change.\n'
1650 '# This will be displayed on the codereview site.\n'
1651 '# The first line will also be used as the subject of the review.\n'
1652 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001653 '--------------------\n'
1654 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001655 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001656 # Simulate user changing something.
1657 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001658
1659 def UpdateDescriptionRemote(_, desc):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001660 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001661
1662 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1663 self.mock(git_cl.Changelist, 'GetDescription',
1664 lambda *args: current_desc)
1665 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1666 UpdateDescriptionRemote)
1667 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1668
1669 self.calls = [
1670 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001671 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001672 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1673 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001674 ((['git', 'config', 'core.editor'],), 'vi'),
1675 ]
1676 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1677
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001678 def test_description_set_stdin(self):
1679 out = StringIO.StringIO()
1680 self.mock(git_cl.sys, 'stdout', out)
1681
1682 self.mock(git_cl, 'Changelist', ChangelistMock)
1683 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1684
1685 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1686 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1687
kmarshall3bff56b2016-06-06 18:31:47 -07001688 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001689 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1690
kmarshall3bff56b2016-06-06 18:31:47 -07001691 self.calls = \
1692 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1693 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07001694 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001695 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1696 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07001697 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1698 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
1699 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001700 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1701 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1702 ((['git', 'branch', '-D', 'foo'],), '')]
1703
1704 class MockChangelist():
1705 def __init__(self, branch, issue):
1706 self.branch = branch
1707 self.issue = issue
1708 def GetBranch(self):
1709 return self.branch
1710 def GetIssue(self):
1711 return self.issue
1712
1713 self.mock(git_cl, 'get_cl_statuses',
1714 lambda branches, fine_grained, max_processes:
1715 [(MockChangelist('master', 1), 'open'),
1716 (MockChangelist('foo', 456), 'closed'),
1717 (MockChangelist('bar', 789), 'open')])
1718
1719 self.assertEqual(0, git_cl.main(['archive', '-f']))
1720
1721 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001722 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001723 self.calls = \
1724 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1725 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07001726 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07001727 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1728 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001729 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1730
1731 class MockChangelist():
1732 def __init__(self, branch, issue):
1733 self.branch = branch
1734 self.issue = issue
1735 def GetBranch(self):
1736 return self.branch
1737 def GetIssue(self):
1738 return self.issue
1739
1740 self.mock(git_cl, 'get_cl_statuses',
1741 lambda branches, fine_grained, max_processes:
1742 [(MockChangelist('master', 1), 'closed')])
1743
1744 self.assertEqual(1, git_cl.main(['archive', '-f']))
1745
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001746 def test_cmd_issue_erase_existing(self):
1747 out = StringIO.StringIO()
1748 self.mock(git_cl.sys, 'stdout', out)
1749 self.calls = [
1750 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001751 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1752 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001753 # Let this command raise exception (retcode=1) - it should be ignored.
1754 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07001755 CERR1),
1756 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1757 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001758 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1759 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1760 ''),
1761 ]
1762 self.assertEqual(0, git_cl.main(['issue', '0']))
1763
phajdan.jre328cf92016-08-22 04:12:17 -07001764 def test_cmd_issue_json(self):
1765 out = StringIO.StringIO()
1766 self.mock(git_cl.sys, 'stdout', out)
1767 self.calls = [
1768 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001769 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07001770 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1771 ((['git', 'config', 'rietveld.server'],),
1772 'https://codereview.chromium.org'),
1773 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1774 (('write_json', 'output.json',
1775 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
1776 ''),
1777 ]
1778 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
1779
tandrii9de9ec62016-07-13 03:01:59 -07001780 def test_git_cl_try_default(self):
1781 self.mock(git_cl.Changelist, 'GetChange',
1782 lambda _, *a: (
1783 self._mocked_call(['GetChange']+list(a))))
1784 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1785 lambda *_, **__: (
1786 self._mocked_call(['DoGetTryMasters'])))
1787 self.mock(git_cl.presubmit_support, 'DoGetTrySlaves',
1788 lambda *_, **__: (
1789 self._mocked_call(['DoGetTrySlaves'])))
1790 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
1791 lambda _, s: self._mocked_call(['SetCQState', s]))
1792 self.calls = [
1793 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001794 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07001795 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1796 ((['git', 'config', 'rietveld.server'],),
1797 'https://codereview.chromium.org'),
1798 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1799 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1800 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1801 ((['get_or_create_merge_base', 'feature', 'feature'],),
1802 'fake_ancestor_sha'),
1803 ((['GetChange', 'fake_ancestor_sha', None], ),
1804 git_cl.presubmit_support.GitChange(
1805 '', '', '', '', '', '', '', '')),
1806 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1807 ((['DoGetTryMasters'], ), None),
1808 ((['DoGetTrySlaves'], ), None),
1809 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1810 ]
1811 out = StringIO.StringIO()
1812 self.mock(git_cl.sys, 'stdout', out)
1813 self.assertEqual(0, git_cl.main(['try']))
1814 self.assertEqual(
1815 out.getvalue(),
1816 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
1817
tandrii16e0b4e2016-06-07 10:34:28 -07001818 def _common_GerritCommitMsgHookCheck(self):
1819 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1820 self.mock(git_cl.os.path, 'abspath',
1821 lambda path: self._mocked_call(['abspath', path]))
1822 self.mock(git_cl.os.path, 'exists',
1823 lambda path: self._mocked_call(['exists', path]))
1824 self.mock(git_cl.gclient_utils, 'FileRead',
1825 lambda path: self._mocked_call(['FileRead', path]))
1826 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
1827 lambda path: self._mocked_call(['rm_file_or_tree', path]))
1828 self.calls = [
1829 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1830 ((['abspath', '../'],), '/abs/git_repo_root'),
1831 ]
1832 return git_cl.Changelist(codereview='gerrit', issue=123)
1833
1834 def test_GerritCommitMsgHookCheck_custom_hook(self):
1835 cl = self._common_GerritCommitMsgHookCheck()
1836 self.calls += [
1837 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1838 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1839 '#!/bin/sh\necho "custom hook"')
1840 ]
1841 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1842
1843 def test_GerritCommitMsgHookCheck_not_exists(self):
1844 cl = self._common_GerritCommitMsgHookCheck()
1845 self.calls += [
1846 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
1847 ]
1848 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1849
1850 def test_GerritCommitMsgHookCheck(self):
1851 cl = self._common_GerritCommitMsgHookCheck()
1852 self.calls += [
1853 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1854 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1855 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
1856 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
1857 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1858 ''),
1859 ]
1860 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1861
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001862
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001863if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001864 git_cl.logging.basicConfig(
1865 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001866 unittest.main()