blob: d4603ed3da7108aed8b306ed8bdff1c42e01790e [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)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000254 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000255 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000256 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000257 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000258 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000259 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000260 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
261 classmethod(lambda _: False))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000262 # It's important to reset settings to not have inter-tests interference.
263 git_cl.settings = None
264
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000265
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000266 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000267 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000268 # Note: has_failed returns True if at least 1 test ran so far, current
269 # included, has failed. That means current test may have actually ran
270 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000271 if not self.has_failed():
272 self.assertEquals([], self.calls)
273 finally:
274 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000275
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000276 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000277 self.assertTrue(
278 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700279 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000280 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000281 expected_args, result = top
282
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000283 # Also logs otherwise it could get caught in a try/finally and be hard to
284 # diagnose.
285 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700286 N = 5
287 prior_calls = '\n '.join(
288 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
289 for i, c in enumerate(self._calls_done[-N:]))
290 following_calls = '\n '.join(
291 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
292 for i, c in enumerate(self.calls[:N]))
293 extended_msg = (
294 'A few prior calls:\n %s\n\n'
295 'This (expected):\n @%d: %r\n'
296 'This (actual):\n @%d: %r\n\n'
297 'A few following expected calls:\n %s' %
298 (prior_calls, len(self._calls_done), expected_args,
299 len(self._calls_done), args, following_calls))
300 git_cl.logging.error(extended_msg)
301
tandrii99a72f22016-08-17 14:33:24 -0700302 self.fail('@%d\n'
303 ' Expected: %r\n'
304 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700305 len(self._calls_done), expected_args, args))
306
307 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700308 if isinstance(result, Exception):
309 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000310 return result
311
maruel@chromium.orga3353652011-11-30 14:26:57 +0000312 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000313 def _is_gerrit_calls(cls, gerrit=False):
314 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
315 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
316
317 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000318 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000319 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000320 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000321
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000322 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000323 def _upload_no_rev_calls(cls, similarity, find_copies):
324 return (cls._git_base_calls(similarity, find_copies) +
325 cls._git_upload_no_rev_calls())
326
327 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000328 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000329 if similarity is None:
330 similarity = '50'
tandrii5d48c322016-08-18 16:19:37 -0700331 similarity_call = ((['git', 'config', '--int',
332 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000333 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000334 similarity_call = ((['git', 'config', '--int',
tandrii5d48c322016-08-18 16:19:37 -0700335 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000336
337 if find_copies is None:
338 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700339 find_copies_call = ((['git', 'config', '--bool',
340 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000341 else:
tandrii5d48c322016-08-18 16:19:37 -0700342 val = str(find_copies).lower()
343 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000344 'branch.master.git-find-copies', val],), '')
345
346 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000347 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000348 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000349 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000350 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000351 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000352 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000353
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000354 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000355 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000356 similarity_call,
357 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
358 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000359 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000360 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700361 ((['git', 'config', '--int', 'branch.master.rietveldissue'],), CERR1),
362 ((['git', 'config', '--int', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000363 ((['git', 'config', 'rietveld.server'],),
364 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000365 ((['git', 'config', 'branch.master.merge'],), 'master'),
366 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000367 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000368 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000369 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000370 ((['git', 'rev-parse', '--show-cdup'],), ''),
371 ((['git', 'rev-parse', 'HEAD'],), '12345'),
372 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000373 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000374 'M\t.gitignore\n'),
tandrii5d48c322016-08-18 16:19:37 -0700375 ((['git', 'config', '--int', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000376 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000377 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000378 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000379 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000380 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000381 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000382 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000383 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000384 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000385 ]
386
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000387 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000388 def _git_upload_no_rev_calls(cls):
389 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000390 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000391 ]
392
393 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000394 def _git_upload_calls(cls, private):
395 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000396 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000397 private_call = []
398 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000399 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000400 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000401 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000402
maruel@chromium.orga3353652011-11-30 14:26:57 +0000403 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000404 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000405 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000406 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000407 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000408 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000409 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
410 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000411 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000412 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000413 ((['git', 'config', 'rietveld.project'],), ''),
tandrii5d48c322016-08-18 16:19:37 -0700414 ((['git', 'config', '--int', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000415 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000416 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000417 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700418 'config', '--int', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000419 ] + cls._git_post_upload_calls()
420
421 @classmethod
422 def _git_post_upload_calls(cls):
423 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000424 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
425 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
426 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000427 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000428 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000429 ]
430
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000431 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000432 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000433 fake_ancestor = 'fake_ancestor'
434 fake_cl = 'fake_cl_for_patch'
435 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000436 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000437 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000438 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000439 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000440 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000441 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000442 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000443 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700444 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000445 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000446 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000447 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000448 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000449 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000450 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000451 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000452 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000453 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000454 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000455 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000456
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000457 @classmethod
458 def _dcommit_calls_1(cls):
459 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000460 ((['git', 'config', 'rietveld.autoupdate'],),
461 ''),
462 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
463 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000464 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000465 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000466 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
467 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
468 None),
469 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000470 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700471 ((['git', 'config', '--int',
472 'branch.working.git-cl-similarity'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000473 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
tandrii5d48c322016-08-18 16:19:37 -0700474 ((['git', 'config', '--bool',
475 'branch.working.git-find-copies'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000476 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
477 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700478 'config', '--int', 'branch.working.rietveldissue'],), '12345'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000479 ((['git',
480 'config', 'rietveld.server'],), 'codereview.example.com'),
481 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000482 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000483 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000484 ((['git', 'config', 'branch.working.merge'],),
485 'refs/heads/master'),
486 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000487 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000488 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000489 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000490 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000491 'refs/remotes/origin/master'],),
492 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000493 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000494 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000495 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000496 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000497 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000498 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000499 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000500 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000501 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000502 ]
503
504 @classmethod
505 def _dcommit_calls_normal(cls):
506 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000507 ((['git', 'rev-parse', '--show-cdup'],), ''),
508 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000509 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000510 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000511 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000512 '.'],),
513 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000514 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700515 'config', '--int', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000516 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000517 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000518 ((['git', 'config', 'user.email'],), 'author@example.com'),
519 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000520 ]
521
522 @classmethod
523 def _dcommit_calls_bypassed(cls):
524 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000525 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000526 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000527 ]
528
529 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000530 def _dcommit_calls_3(cls):
531 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000532 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000533 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000534 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000535 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000536 (' PRESUBMIT.py | 2 +-\n'
537 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000538 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700539 'refs/heads/git-cl-commit'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000540 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
541 ((['git', 'show-ref', '--quiet', '--verify',
tandrii5d48c322016-08-18 16:19:37 -0700542 'refs/heads/git-cl-cherry-pick'],), CERR1),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000543 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000544 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
545 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
546 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000547 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000548 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000549 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000550 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000551 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000552 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000553 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000554 ((['git', 'checkout', '-q', 'working'],), ''),
555 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000556 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000557
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000558 @staticmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000559 def _cmd_line(description, args, similarity, find_copies, private):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000560 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000561 return [
562 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000563 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000564 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000565 ] + args + [
566 '--cc', 'joe@example.com',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000567 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000568 '--git_similarity', similarity or '50'
569 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000570 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000571 ]
572
573 def _run_reviewer_test(
574 self,
575 upload_args,
576 expected_description,
577 returned_description,
578 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000579 reviewers,
580 private=False):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000581 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000582 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000583 try:
584 similarity = upload_args[upload_args.index('--similarity')+1]
585 except ValueError:
586 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000587
588 if '--find-copies' in upload_args:
589 find_copies = True
590 elif '--no-find-copies' in upload_args:
591 find_copies = False
592 else:
593 find_copies = None
594
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000595 private = '--private' in upload_args
596
597 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000598
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000599 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000600 self.assertEquals(
601 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000602 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000603 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000604 '#--------------------This line is 72 characters long'
605 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000606 expected_description,
607 desc)
608 return returned_description
609 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000610
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000611 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000612 cmd_line = self._cmd_line(final_description, reviewers, similarity,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000613 find_copies, private)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000614 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000615 return 1, 2
616 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000617
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000618 git_cl.main(['upload'] + upload_args)
619
620 def test_no_reviewer(self):
621 self._run_reviewer_test(
622 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000623 'desc\n\nBUG=',
624 '# Blah blah comment.\ndesc\n\nBUG=',
625 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000626 [])
627
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000628 def test_keep_similarity(self):
629 self._run_reviewer_test(
630 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000631 'desc\n\nBUG=',
632 '# Blah blah comment.\ndesc\n\nBUG=',
633 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000634 [])
635
iannucci@chromium.org79540052012-10-19 23:15:26 +0000636 def test_keep_find_copies(self):
637 self._run_reviewer_test(
638 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000639 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000640 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000641 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000642 [])
643
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000644 def test_private(self):
645 self._run_reviewer_test(
646 ['--private'],
647 'desc\n\nBUG=',
648 '# Blah blah comment.\ndesc\n\nBUG=\n',
649 'desc\n\nBUG=',
650 [])
651
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000652 def test_reviewers_cmd_line(self):
653 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000654 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000655 self._run_reviewer_test(
656 ['-r' 'foo@example.com'],
657 description,
658 '\n%s\n' % description,
659 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000660 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000661
662 def test_reviewer_tbr_overriden(self):
663 # Reviewer is overriden with TBR
664 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000665 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000666 self._run_reviewer_test(
667 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000668 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000669 description.strip('\n'),
670 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000671 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000672
673 def test_reviewer_multiple(self):
674 # Handles multiple R= or TBR= lines.
675 description = (
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000676 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000677 self._run_reviewer_test(
678 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000679 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000680 description,
681 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000682 ['--reviewers=another@example.com,reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000683
maruel@chromium.orga3353652011-11-30 14:26:57 +0000684 def test_reviewer_send_mail(self):
685 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000686 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000687 self._run_reviewer_test(
688 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000689 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000690 description.strip('\n'),
691 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000692 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000693
694 def test_reviewer_send_mail_no_rev(self):
695 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000696 stdout = StringIO.StringIO()
697 stderr = StringIO.StringIO()
maruel@chromium.orga3353652011-11-30 14:26:57 +0000698 try:
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000699 self.calls = self._upload_no_rev_calls(None, None)
700 def RunEditor(desc, _, **kwargs):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000701 return desc
702 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000703 self.mock(sys, 'stdout', stdout)
704 self.mock(sys, 'stderr', stderr)
maruel@chromium.orga3353652011-11-30 14:26:57 +0000705 git_cl.main(['upload', '--send-mail'])
706 self.fail()
707 except SystemExit:
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000708 self.assertEqual(
709 'Using 50% similarity for rename/copy detection. Override with '
710 '--similarity.\n',
711 stdout.getvalue())
712 self.assertEqual(
713 'Must specify reviewers to send email.\n', stderr.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000714
tandriif9aefb72016-07-01 09:06:51 -0700715 def test_bug_on_cmd(self):
716 self._run_reviewer_test(
717 ['--bug=500658,proj:123'],
718 'desc\n\nBUG=500658\nBUG=proj:123',
719 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
720 'desc\n\nBUG=500658\nBUG=proj:1234',
721 [])
722
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000723 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000724 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000725 self.calls = (
726 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000727 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000728 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000729 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000730 git_cl.main(['dcommit'])
731
732 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000733 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000734 self.calls = (
735 self._dcommit_calls_1() +
736 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000737 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000738 git_cl.main(['dcommit', '--bypass-hooks'])
739
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000740
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000741 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000742 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000743 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000744 if skip_auth_check:
745 return [((cmd, ), 'true')]
746
tandrii5d48c322016-08-18 16:19:37 -0700747 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000748 if issue:
749 calls.extend([
750 ((['git', 'config', 'branch.master.gerritserver'],), ''),
751 ])
752 calls.extend([
753 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
754 ((['git', 'config', 'branch.master.remote'],), 'origin'),
755 ((['git', 'config', 'remote.origin.url'],),
756 'https://chromium.googlesource.com/my/repo'),
757 ((['git', 'config', 'remote.origin.url'],),
758 'https://chromium.googlesource.com/my/repo'),
759 ])
760 return calls
761
762 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000763 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000764 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000765 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700766 ((['git', 'config', '--int', 'branch.master.git-cl-similarity'],),
767 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000768 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700769 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
770 CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000771 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000772 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -0700773 ((['git', 'config', '--int', 'branch.master.rietveldissue'],), CERR1),
774 ((['git', 'config', '--int', 'branch.master.gerritissue'],),
775 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000776 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000777 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000778 ((['get_or_create_merge_base', 'master',
779 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000780 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000781 # Calls to verify branch point is ancestor
782 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
783 cls._git_sanity_checks('fake_ancestor_sha', 'master',
784 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git', 'rev-parse', '--show-cdup'],), ''),
786 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000787
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000789 'diff', '--name-status', '--no-renames', '-r',
790 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000791 'M\t.gitignore\n'),
tandrii5d48c322016-08-18 16:19:37 -0700792 ((['git', 'config', '--int', 'branch.master.gerritpatchset'],), CERR1),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000793 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000795 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000796 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000797 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000798 ((['git', 'config', 'user.email'],), 'me@example.com'),
799 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000800 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000801 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000802 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000803 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000804
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000805 @classmethod
806 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700807 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000808 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000809 ref_suffix='', notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000810 post_amend_description=None, issue=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000811 if post_amend_description is None:
812 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -0700813 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000814
tandriia60502f2016-06-20 02:01:53 -0700815 if squash_mode == 'default':
816 calls.extend([
817 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
818 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
819 ])
820 elif squash_mode in ('override_squash', 'override_nosquash'):
821 calls.extend([
822 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
823 'true' if squash_mode == 'override_squash' else 'false'),
824 ])
825 else:
826 assert squash_mode in ('squash', 'nosquash')
827
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000828 # If issue is given, then description is fetched from Gerrit instead.
829 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000830 calls += [
831 ((['git', 'log', '--pretty=format:%s\n\n%b',
832 'fake_ancestor_sha..HEAD'],),
833 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000834 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000835 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000836 # DownloadGerritHook(False)
837 ((False, ),
838 ''),
839 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000840 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000841 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000842 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000844 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000846 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000847 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000848 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000849 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000850 if not issue:
851 # Prompting to edit description on first upload.
852 calls += [
853 ((['git', 'config', 'core.editor'],), ''),
854 ((['RunEditor'],), description),
855 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000856 ref_to_push = 'abcdef0123456789'
857 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000858 ((['git', 'config', 'branch.master.merge'],),
859 'refs/heads/master'),
860 ((['git', 'config', 'branch.master.remote'],),
861 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000862 ((['get_or_create_merge_base', 'master',
863 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000864 'origin/master'),
865 ((['git', 'rev-parse', 'HEAD:'],),
866 '0123456789abcdef'),
867 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000868 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000869 ref_to_push),
870 ]
871 else:
872 ref_to_push = 'HEAD'
873
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000874 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000875 ((['git', 'rev-list',
876 expected_upstream_ref + '..' + ref_to_push],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000877 ((['git', 'config', 'rietveld.cc'],), '')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000878 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000879
880 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
881 if ref_suffix:
882 ref_suffix += ',' + notify_suffix
883 else:
884 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000885
886 # Add cc from watch list.
887 ref_suffix += ',cc=joe@example.com'
888
ukai@chromium.orge8077812012-02-03 03:41:46 +0000889 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000890 ref_suffix += ',' + ','.join('r=%s' % email
891 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000892 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000893 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000894 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000895 ('remote:\n'
896 'remote: Processing changes: (\)\n'
897 'remote: Processing changes: (|)\n'
898 'remote: Processing changes: (/)\n'
899 'remote: Processing changes: (-)\n'
900 'remote: Processing changes: new: 1 (/)\n'
901 'remote: Processing changes: new: 1, done\n'
902 'remote:\n'
903 'remote: New Changes:\n'
904 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
905 'remote:\n'
906 'To https://chromium.googlesource.com/yyy/zzz\n'
907 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000908 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000909 if squash:
910 calls += [
tandrii5d48c322016-08-18 16:19:37 -0700911 ((['git', 'config', '--int', 'branch.master.gerritissue', '123456'],),
912 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000913 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -0700914 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000915 ((['git', 'config', 'branch.master.gerritsquashhash',
916 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000917 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000918 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000919 return calls
920
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000921 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000922 self,
923 upload_args,
924 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000925 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -0700926 squash=True,
927 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000928 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000929 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000930 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000931 post_amend_description=None,
932 issue=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000933 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -0700934 if squash_mode is None:
935 if '--no-squash' in upload_args:
936 squash_mode = 'nosquash'
937 elif '--squash' in upload_args:
938 squash_mode = 'squash'
939 else:
940 squash_mode = 'default'
941
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000942 reviewers = reviewers or []
tandrii@chromium.org28253532016-04-14 13:46:56 +0000943 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -0700944 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000945 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -0700946 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
947 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -0700948 self.mock(git_cl.gclient_utils, 'RunEditor',
949 lambda *_, **__: self._mocked_call(['RunEditor']))
950 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
951
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000952 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +0000953 self.calls += self._gerrit_upload_calls(
954 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700955 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000956 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000957 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000958 post_amend_description=post_amend_description,
959 issue=issue)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000960 # Uncomment when debugging.
961 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000962 git_cl.main(['upload'] + upload_args)
963
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000964 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -0700965 self._run_gerrit_upload_test(
966 ['--no-squash'],
967 'desc\n\nBUG=\n',
968 [],
969 squash=False,
970 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
971
972 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000973 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000974 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000975 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +0000976 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000977 [],
tandriia60502f2016-06-20 02:01:53 -0700978 squash=False,
979 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000980 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000981
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000982 def test_gerrit_no_reviewer(self):
983 self._run_gerrit_upload_test(
984 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000985 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -0700986 [],
987 squash=False,
988 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000989
tandriieefe8322016-08-17 10:12:24 -0700990 def test_gerrit_patch_bad_chars(self):
991 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000992 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -0700993 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000994 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -0700995 squash=False,
996 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -0700997 ref_suffix='%m=Dont_put_bad_chars')
998 self.assertIn(
999 'WARNING: Patchset title may only contain alphanumeric chars '
1000 'and spaces. Cleaned up title:\nDont put bad chars\n',
1001 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001002
ukai@chromium.orge8077812012-02-03 03:41:46 +00001003 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001004 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001005 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001006 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001007 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001008 squash=False,
1009 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001010 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001011
1012 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001013 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001014 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001015 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
1016 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001017 ['reviewer@example.com', 'another@example.com'],
1018 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001019 squash_mode='override_nosquash',
1020 ref_suffix='%l=Code-Review+1')
tandriia60502f2016-06-20 02:01:53 -07001021
1022 def test_gerrit_upload_squash_first_is_default(self):
1023 # Mock Gerrit CL description to indicate the first upload.
1024 self.mock(git_cl.Changelist, 'GetDescription',
1025 lambda *_: None)
1026 self._run_gerrit_upload_test(
1027 [],
1028 'desc\nBUG=\n\nChange-Id: 123456789',
1029 [],
1030 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001031
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001032 def test_gerrit_upload_squash_first(self):
1033 # Mock Gerrit CL description to indicate the first upload.
1034 self.mock(git_cl.Changelist, 'GetDescription',
1035 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001036 self._run_gerrit_upload_test(
1037 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001038 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001039 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001040 squash=True,
1041 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001042
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001043 def test_gerrit_upload_squash_reupload(self):
1044 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1045 # Mock Gerrit CL description to indicate re-upload.
1046 self.mock(git_cl.Changelist, 'GetDescription',
1047 lambda *args: description)
1048 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1049 lambda *args: 1)
1050 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1051 lambda *args: {'change_id': '123456789'})
1052 self._run_gerrit_upload_test(
1053 ['--squash'],
1054 description,
1055 [],
1056 squash=True,
1057 expected_upstream_ref='origin/master',
1058 issue=123456)
1059
rmistry@google.com2dd99862015-06-22 12:22:18 +00001060 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001061 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001062 def mock_run_git(*args, **_kwargs):
1063 if args[0] == ['for-each-ref',
1064 '--format=%(refname:short) %(upstream:short)',
1065 'refs/heads']:
1066 # Create a local branch dependency tree that looks like this:
1067 # test1 -> test2 -> test3 -> test4 -> test5
1068 # -> test3.1
1069 # test6 -> test0
1070 branch_deps = [
1071 'test2 test1', # test1 -> test2
1072 'test3 test2', # test2 -> test3
1073 'test3.1 test2', # test2 -> test3.1
1074 'test4 test3', # test3 -> test4
1075 'test5 test4', # test4 -> test5
1076 'test6 test0', # test0 -> test6
1077 'test7', # test7
1078 ]
1079 return '\n'.join(branch_deps)
1080 self.mock(git_cl, 'RunGit', mock_run_git)
1081
1082 class RecordCalls:
1083 times_called = 0
1084 record_calls = RecordCalls()
1085 def mock_CMDupload(*args, **_kwargs):
1086 record_calls.times_called += 1
1087 return 0
1088 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1089
1090 self.calls = [
1091 (('[Press enter to continue or ctrl-C to quit]',), ''),
1092 ]
1093
1094 class MockChangelist():
1095 def __init__(self):
1096 pass
1097 def GetBranch(self):
1098 return 'test1'
1099 def GetIssue(self):
1100 return '123'
1101 def GetPatchset(self):
1102 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001103 def IsGerrit(self):
1104 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001105
1106 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1107 # CMDupload should have been called 5 times because of 5 dependent branches.
1108 self.assertEquals(5, record_calls.times_called)
1109 self.assertEquals(0, ret)
1110
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001111 def test_gerrit_change_id(self):
1112 self.calls = [
1113 ((['git', 'write-tree'], ),
1114 'hashtree'),
1115 ((['git', 'rev-parse', 'HEAD~0'], ),
1116 'branch-parent'),
1117 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1118 'A B <a@b.org> 1456848326 +0100'),
1119 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1120 'C D <c@d.org> 1456858326 +0100'),
1121 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1122 'hashchange'),
1123 ]
1124 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1125 self.assertEqual(change_id, 'Ihashchange')
1126
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001127 def test_desecription_append_footer(self):
1128 for init_desc, footer_line, expected_desc in [
1129 # Use unique desc first lines for easy test failure identification.
1130 ('foo', 'R=one', 'foo\n\nR=one'),
1131 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1132 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1133 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1134 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1135 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1136 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1137 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1138 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1139 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1140 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1141 ]:
1142 desc = git_cl.ChangeDescription(init_desc)
1143 desc.append_footer(footer_line)
1144 self.assertEqual(desc.description, expected_desc)
1145
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001146 def test_update_reviewers(self):
1147 data = [
1148 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001149 ('foo\nR=xx', [], 'foo\nR=xx'),
1150 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001151 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001152 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1153 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1154 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001155 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001156 ('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 +00001157 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001158 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1159 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1160 # Same as the line before, but full of whitespaces.
1161 (
1162 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1163 'foo\nBar\n\nR=c@c\n BUG =',
1164 ),
1165 # Whitespaces aren't interpreted as new lines.
1166 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001167 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001168 expected = [i[2] for i in data]
1169 actual = []
1170 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001171 obj = git_cl.ChangeDescription(orig)
1172 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001173 actual.append(obj.description)
1174 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001175
wittman@chromium.org455dc922015-01-26 20:15:50 +00001176 def test_get_target_ref(self):
1177 # Check remote or remote branch not present.
1178 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1179 self.assertEqual(None, git_cl.GetTargetRef(None,
1180 'refs/remotes/origin/master',
1181 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001182
wittman@chromium.org455dc922015-01-26 20:15:50 +00001183 # Check default target refs for branches.
1184 self.assertEqual('refs/heads/master',
1185 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1186 None, None))
1187 self.assertEqual('refs/heads/master',
1188 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1189 None, None))
1190 self.assertEqual('refs/heads/master',
1191 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1192 None, None))
1193 self.assertEqual('refs/branch-heads/123',
1194 git_cl.GetTargetRef('origin',
1195 'refs/remotes/branch-heads/123',
1196 None, None))
1197 self.assertEqual('refs/diff/test',
1198 git_cl.GetTargetRef('origin',
1199 'refs/remotes/origin/refs/diff/test',
1200 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001201 self.assertEqual('refs/heads/chrome/m42',
1202 git_cl.GetTargetRef('origin',
1203 'refs/remotes/origin/chrome/m42',
1204 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001205
1206 # Check target refs for user-specified target branch.
1207 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1208 'refs/remotes/branch-heads/123'):
1209 self.assertEqual('refs/branch-heads/123',
1210 git_cl.GetTargetRef('origin',
1211 'refs/remotes/origin/master',
1212 branch, None))
1213 for branch in ('origin/master', 'remotes/origin/master',
1214 'refs/remotes/origin/master'):
1215 self.assertEqual('refs/heads/master',
1216 git_cl.GetTargetRef('origin',
1217 'refs/remotes/branch-heads/123',
1218 branch, None))
1219 for branch in ('master', 'heads/master', 'refs/heads/master'):
1220 self.assertEqual('refs/heads/master',
1221 git_cl.GetTargetRef('origin',
1222 'refs/remotes/branch-heads/123',
1223 branch, None))
1224
1225 # Check target refs for pending prefix.
1226 self.assertEqual('prefix/heads/master',
1227 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1228 None, 'prefix/'))
1229
wychen@chromium.orga872e752015-04-28 23:42:18 +00001230 def test_patch_when_dirty(self):
1231 # Patch when local tree is dirty
1232 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1233 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1234
1235 def test_diff_when_dirty(self):
1236 # Do 'git cl diff' when local tree is dirty
1237 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1238 self.assertNotEqual(git_cl.main(['diff']), 0)
1239
tandriidf09a462016-08-18 16:23:55 -07001240 def _patch_common(self, is_gerrit=False, force_codereview=False,
1241 new_branch=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001242 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001243 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1244 lambda x: '60001')
1245 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
1246 lambda *args: None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001247 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1248 lambda *args: {
1249 'current_revision': '7777777777',
1250 'revisions': {
1251 '1111111111': {
1252 '_number': 1,
1253 'fetch': {'http': {
1254 'url': 'https://chromium.googlesource.com/my/repo',
1255 'ref': 'refs/changes/56/123456/1',
1256 }},
1257 },
1258 '7777777777': {
1259 '_number': 7,
1260 'fetch': {'http': {
1261 'url': 'https://chromium.googlesource.com/my/repo',
1262 'ref': 'refs/changes/56/123456/7',
1263 }},
1264 },
1265 },
1266 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001267 self.mock(git_cl.Changelist, 'GetDescription',
1268 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001269 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1270
tandriidf09a462016-08-18 16:23:55 -07001271 if new_branch:
1272 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1273 else:
1274 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001275 if not force_codereview:
1276 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001277 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001278 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001279 ((['git', 'config', '--int', 'branch.master.rietveldissue'],), CERR1),
1280 ((['git', 'config', '--int', 'branch.master.gerritissue'],), CERR1),
1281 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001282 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001283
1284 if is_gerrit:
1285 if not force_codereview:
1286 self.calls += [
1287 ((['git', 'config', 'gerrit.host'],), 'true'),
1288 ]
1289 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001290 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001291 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001292 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1293 ((['git', 'rev-parse', '--show-cdup'],), ''),
1294 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
1295 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001296
tandriidf09a462016-08-18 16:23:55 -07001297 def _common_patch_successful(self, new_branch=False):
1298 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001299 self.calls += [
1300 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
1301 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001302 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001303 'patch from issue 123456 at patchset 60001 ' +
1304 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001305 ((['git', 'config', '--int', 'branch.master.rietveldissue', '123456'],),
1306 ''),
1307 ((['git', 'config', 'branch.master.rietveldserver'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001308 ((['git', 'config', 'branch.master.rietveldserver',
1309 'https://codereview.example.com'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001310 ((['git', 'config', '--int', 'branch.master.rietveldpatchset', '60001'],),
1311 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001312 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001313
1314 def test_patch_successful(self):
1315 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001316 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1317
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001318 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001319 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001320 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1321
wychen@chromium.orga872e752015-04-28 23:42:18 +00001322 def test_patch_conflict(self):
1323 self._patch_common()
1324 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001325 ((['git', 'apply', '--index', '-p0', '--3way'],), CERR1),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001326 ]
1327 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001328
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001329 def test_gerrit_patch_successful(self):
1330 self._patch_common(is_gerrit=True)
1331 self.calls += [
1332 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1333 'refs/changes/56/123456/7'],), ''),
1334 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001335 ((['git', 'config', '--int', 'branch.master.gerritissue', '123456'],),
1336 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001337 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1338 ((['git', 'config', 'branch.master.merge'],), 'master'),
1339 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1340 ((['git', 'config', 'remote.origin.url'],),
1341 'https://chromium.googlesource.com/my/repo'),
1342 ((['git', 'config', 'branch.master.gerritserver',
1343 'https://chromium-review.googlesource.com'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001344 ((['git', 'config', '--int', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001345 ]
1346 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1347
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001348 def test_patch_force_codereview(self):
1349 self._patch_common(is_gerrit=True, force_codereview=True)
1350 self.calls += [
1351 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1352 'refs/changes/56/123456/7'],), ''),
1353 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1354 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001355 ((['git', 'config', '--int', 'branch.master.gerritissue', '123456'],),
1356 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001357 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1358 ((['git', 'config', 'branch.master.merge'],), 'master'),
1359 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1360 ((['git', 'config', 'remote.origin.url'],),
1361 'https://chromium.googlesource.com/my/repo'),
1362 ((['git', 'config', 'branch.master.gerritserver',
1363 'https://chromium-review.googlesource.com'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001364 ((['git', 'config', '--int', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001365 ]
1366 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1367
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001368 def test_gerrit_patch_url_successful(self):
1369 self._patch_common(is_gerrit=True)
1370 self.calls += [
1371 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1372 'refs/changes/56/123456/1'],), ''),
1373 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001374 ((['git', 'config', '--int', 'branch.master.gerritissue', '123456'],),
1375 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001376 ((['git', 'config', 'branch.master.gerritserver',
1377 'https://chromium-review.googlesource.com'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001378 ((['git', 'config', '--int', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001379 ]
1380 self.assertEqual(git_cl.main(
1381 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1382
1383 def test_gerrit_patch_conflict(self):
1384 self._patch_common(is_gerrit=True)
1385 self.mock(git_cl, 'DieWithError',
1386 lambda msg: self._mocked_call(['DieWithError', msg]))
1387 class SystemExitMock(Exception):
1388 pass
1389 self.calls += [
1390 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1391 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001392 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1393 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1394 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001395 ]
1396 with self.assertRaises(SystemExitMock):
1397 git_cl.main(['patch',
1398 'https://chromium-review.googlesource.com/#/c/123456/1'])
1399
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001400 def _checkout_calls(self):
1401 return [
1402 ((['git', 'config', '--local', '--get-regexp',
1403 'branch\\..*\\.rietveldissue'], ),
1404 ('branch.retrying.rietveldissue 1111111111\n'
1405 'branch.some-fix.rietveldissue 2222222222\n')),
1406 ((['git', 'config', '--local', '--get-regexp',
1407 'branch\\..*\\.gerritissue'], ),
1408 ('branch.ger-branch.gerritissue 123456\n'
1409 'branch.gbranch654.gerritissue 654321\n')),
1410 ]
1411
1412 def test_checkout_gerrit(self):
1413 """Tests git cl checkout <issue>."""
1414 self.calls = self._checkout_calls()
1415 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1416 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1417
1418 def test_checkout_rietveld(self):
1419 """Tests git cl checkout <issue>."""
1420 self.calls = self._checkout_calls()
1421 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1422 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1423
1424 def test_checkout_not_found(self):
1425 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001426 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001427 self.calls = self._checkout_calls()
1428 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1429
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001430 def test_checkout_no_branch_issues(self):
1431 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001432 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001433 self.calls = [
1434 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001435 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001436 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001437 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001438 ]
1439 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1440
tandrii@chromium.org28253532016-04-14 13:46:56 +00001441 def _test_gerrit_ensure_authenticated_common(self, auth,
1442 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001443 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1444 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1445 self.mock(git_cl, 'DieWithError',
1446 lambda msg: self._mocked_call(['DieWithError', msg]))
1447 self.mock(git_cl, 'ask_for_data',
1448 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001449 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001450 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001451 cl.branch = 'master'
1452 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001453 cl.lookedup_issue = True
1454 return cl
1455
1456 def test_gerrit_ensure_authenticated_missing(self):
1457 cl = self._test_gerrit_ensure_authenticated_common(auth={
1458 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1459 })
1460 self.calls.append(
1461 ((['DieWithError',
1462 'Credentials for the following hosts are required:\n'
1463 ' chromium-review.googlesource.com\n'
1464 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1465 'You can (re)generate your credentails by visiting '
1466 'https://chromium-review.googlesource.com/new-password'],), ''),)
1467 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1468
1469 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001470 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001471 cl = self._test_gerrit_ensure_authenticated_common(auth={
1472 'chromium.googlesource.com': 'one',
1473 'chromium-review.googlesource.com': 'other',
1474 })
1475 self.calls.append(
1476 ((['ask_for_data', 'If you know what you are doing, '
1477 'press Enter to continue, Ctrl+C to abort.'],), ''))
1478 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1479
1480 def test_gerrit_ensure_authenticated_ok(self):
1481 cl = self._test_gerrit_ensure_authenticated_common(auth={
1482 'chromium.googlesource.com': 'same',
1483 'chromium-review.googlesource.com': 'same',
1484 })
1485 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1486
tandrii@chromium.org28253532016-04-14 13:46:56 +00001487 def test_gerrit_ensure_authenticated_skipped(self):
1488 cl = self._test_gerrit_ensure_authenticated_common(
1489 auth={}, skip_auth_check=True)
1490 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1491
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001492 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001493 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1494 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001495 self.calls = [
1496 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii5d48c322016-08-18 16:19:37 -07001497 ((['git', 'config', '--int', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001498 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1499 ((['git', 'config', 'rietveld.server'],), ''),
1500 ((['git', 'config', 'rietveld.server'],), ''),
1501 ((['git', 'config', 'branch.feature.rietveldserver'],),
1502 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001503 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001504 ]
1505 self.assertEqual(0, git_cl.main(['set-commit']))
1506
tandriid9e5ce52016-07-13 02:32:59 -07001507 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001508 self.mock(git_cl.gerrit_util, 'SetReview',
1509 lambda h, i, labels: self._mocked_call(
1510 ['SetReview', h, i, labels]))
1511 self.calls = [
1512 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii5d48c322016-08-18 16:19:37 -07001513 ((['git', 'config', '--int', 'branch.feature.rietveldissue'],), CERR1),
1514 ((['git', 'config', '--int', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001515 ((['git', 'config', 'branch.feature.gerritserver'],),
1516 'https://chromium-review.googlesource.com'),
1517 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001518 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001519 ]
tandriid9e5ce52016-07-13 02:32:59 -07001520
1521 def test_cmd_set_commit_gerrit_clear(self):
1522 self._cmd_set_commit_gerrit_common(0)
1523 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1524
1525 def test_cmd_set_commit_gerrit_dry(self):
1526 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001527 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1528
tandriid9e5ce52016-07-13 02:32:59 -07001529 def test_cmd_set_commit_gerrit(self):
1530 self._cmd_set_commit_gerrit_common(2)
1531 self.assertEqual(0, git_cl.main(['set-commit']))
1532
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001533 def test_description_display(self):
1534 out = StringIO.StringIO()
1535 self.mock(git_cl.sys, 'stdout', out)
1536
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001537 self.mock(git_cl, 'Changelist', ChangelistMock)
1538 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001539
1540 self.assertEqual(0, git_cl.main(['description', '-d']))
1541 self.assertEqual('foo\n', out.getvalue())
1542
1543 def test_description_rietveld(self):
1544 out = StringIO.StringIO()
1545 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001546 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001547
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001548 self.assertEqual(0, git_cl.main([
1549 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1550 self.assertEqual('foobar\n', out.getvalue())
1551
iannucci3c972b92016-08-17 13:24:10 -07001552 def test_StatusFieldOverrideIssueMissingArgs(self):
1553 out = StringIO.StringIO()
1554 self.mock(git_cl.sys, 'stderr', out)
1555
1556 try:
1557 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1558 except SystemExit as ex:
1559 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001560 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001561
1562 out = StringIO.StringIO()
1563 self.mock(git_cl.sys, 'stderr', out)
1564
1565 try:
1566 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1567 except SystemExit as ex:
1568 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001569 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001570
1571 def test_StatusFieldOverrideIssue(self):
1572 out = StringIO.StringIO()
1573 self.mock(git_cl.sys, 'stdout', out)
1574
1575 def assertIssue(cl_self, *_args):
1576 self.assertEquals(cl_self.issue, 1)
1577 return 'foobar'
1578
1579 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1580 self.calls = [
1581 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1582 ((['git', 'config', 'rietveld.server'],), ''),
1583 ((['git', 'config', 'rietveld.server'],), ''),
1584 ]
iannuccie53c9352016-08-17 14:40:40 -07001585 self.assertEqual(
1586 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1587 0)
iannucci3c972b92016-08-17 13:24:10 -07001588 self.assertEqual(out.getvalue(), 'foobar\n')
1589
iannuccie53c9352016-08-17 14:40:40 -07001590 def test_SetCloseOverrideIssue(self):
1591 def assertIssue(cl_self, *_args):
1592 self.assertEquals(cl_self.issue, 1)
1593 return 'foobar'
1594
1595 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1596 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1597 self.calls = [
1598 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1599 ((['git', 'config', 'rietveld.server'],), ''),
1600 ((['git', 'config', 'rietveld.server'],), ''),
1601 ]
1602 self.assertEqual(
1603 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1604
1605 def test_SetCommitOverrideIssue(self):
1606 def assertIssue(cl_self, *_args):
1607 self.assertEquals(cl_self.issue, 1)
1608 return 'foobar'
1609
1610 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1611 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
1612 self.calls = [
1613 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1614 ((['git', 'config', 'rietveld.server'],), ''),
1615 ((['git', 'config', 'rietveld.server'],), ''),
1616 ((['git', 'symbolic-ref', 'HEAD'],), ''),
1617 ((['git', 'config', 'rietveld.server'],), ''),
1618 ((['git', 'config', 'rietveld.server'],), ''),
1619 ]
1620 self.assertEqual(
1621 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1622
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001623 def test_description_gerrit(self):
1624 out = StringIO.StringIO()
1625 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001626 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001627
1628 self.assertEqual(0, git_cl.main([
1629 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1630 self.assertEqual('foobar\n', out.getvalue())
1631
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001632 def test_description_set_raw(self):
1633 out = StringIO.StringIO()
1634 self.mock(git_cl.sys, 'stdout', out)
1635
1636 self.mock(git_cl, 'Changelist', ChangelistMock)
1637 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1638
1639 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1640 self.assertEqual('hihi', ChangelistMock.desc)
1641
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001642 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001643 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001644
1645 def RunEditor(desc, _, **kwargs):
1646 self.assertEquals(
1647 '# Enter a description of the change.\n'
1648 '# This will be displayed on the codereview site.\n'
1649 '# The first line will also be used as the subject of the review.\n'
1650 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001651 '--------------------\n'
1652 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001653 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001654 # Simulate user changing something.
1655 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001656
1657 def UpdateDescriptionRemote(_, desc):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001658 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001659
1660 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1661 self.mock(git_cl.Changelist, 'GetDescription',
1662 lambda *args: current_desc)
1663 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1664 UpdateDescriptionRemote)
1665 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1666
1667 self.calls = [
1668 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii5d48c322016-08-18 16:19:37 -07001669 ((['git', 'config', '--int', 'branch.feature.gerritissue'],), '123'),
1670 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1671 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001672 ((['git', 'config', 'core.editor'],), 'vi'),
1673 ]
1674 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1675
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001676 def test_description_set_stdin(self):
1677 out = StringIO.StringIO()
1678 self.mock(git_cl.sys, 'stdout', out)
1679
1680 self.mock(git_cl, 'Changelist', ChangelistMock)
1681 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1682
1683 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1684 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1685
kmarshall3bff56b2016-06-06 18:31:47 -07001686 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001687 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1688
kmarshall3bff56b2016-06-06 18:31:47 -07001689 self.calls = \
1690 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1691 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii5d48c322016-08-18 16:19:37 -07001692 ((['git', 'config', '--int', 'branch.master.rietveldissue'],), '1'),
1693 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1694 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1695 ((['git', 'config', '--int', 'branch.foo.rietveldissue'],), '456'),
1696 ((['git', 'config', '--int', 'branch.bar.rietveldissue'],), CERR1),
1697 ((['git', 'config', '--int', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07001698 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1699 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1700 ((['git', 'branch', '-D', 'foo'],), '')]
1701
1702 class MockChangelist():
1703 def __init__(self, branch, issue):
1704 self.branch = branch
1705 self.issue = issue
1706 def GetBranch(self):
1707 return self.branch
1708 def GetIssue(self):
1709 return self.issue
1710
1711 self.mock(git_cl, 'get_cl_statuses',
1712 lambda branches, fine_grained, max_processes:
1713 [(MockChangelist('master', 1), 'open'),
1714 (MockChangelist('foo', 456), 'closed'),
1715 (MockChangelist('bar', 789), 'open')])
1716
1717 self.assertEqual(0, git_cl.main(['archive', '-f']))
1718
1719 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001720 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001721 self.calls = \
1722 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1723 'refs/heads/master'),
tandrii5d48c322016-08-18 16:19:37 -07001724 ((['git', 'config', '--int', 'branch.master.rietveldissue'],), '1'),
1725 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1726 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07001727 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1728
1729 class MockChangelist():
1730 def __init__(self, branch, issue):
1731 self.branch = branch
1732 self.issue = issue
1733 def GetBranch(self):
1734 return self.branch
1735 def GetIssue(self):
1736 return self.issue
1737
1738 self.mock(git_cl, 'get_cl_statuses',
1739 lambda branches, fine_grained, max_processes:
1740 [(MockChangelist('master', 1), 'closed')])
1741
1742 self.assertEqual(1, git_cl.main(['archive', '-f']))
1743
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001744 def test_cmd_issue_erase_existing(self):
1745 out = StringIO.StringIO()
1746 self.mock(git_cl.sys, 'stdout', out)
1747 self.calls = [
1748 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii5d48c322016-08-18 16:19:37 -07001749 ((['git', 'config', '--int', 'branch.feature.rietveldissue'],), CERR1),
1750 ((['git', 'config', '--int', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001751 # Let this command raise exception (retcode=1) - it should be ignored.
1752 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07001753 CERR1),
1754 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1755 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001756 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1757 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1758 ''),
1759 ]
1760 self.assertEqual(0, git_cl.main(['issue', '0']))
1761
tandrii9de9ec62016-07-13 03:01:59 -07001762 def test_git_cl_try_default(self):
1763 self.mock(git_cl.Changelist, 'GetChange',
1764 lambda _, *a: (
1765 self._mocked_call(['GetChange']+list(a))))
1766 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1767 lambda *_, **__: (
1768 self._mocked_call(['DoGetTryMasters'])))
1769 self.mock(git_cl.presubmit_support, 'DoGetTrySlaves',
1770 lambda *_, **__: (
1771 self._mocked_call(['DoGetTrySlaves'])))
1772 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
1773 lambda _, s: self._mocked_call(['SetCQState', s]))
1774 self.calls = [
1775 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii5d48c322016-08-18 16:19:37 -07001776 ((['git', 'config', '--int', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07001777 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1778 ((['git', 'config', 'rietveld.server'],),
1779 'https://codereview.chromium.org'),
1780 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1781 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1782 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1783 ((['get_or_create_merge_base', 'feature', 'feature'],),
1784 'fake_ancestor_sha'),
1785 ((['GetChange', 'fake_ancestor_sha', None], ),
1786 git_cl.presubmit_support.GitChange(
1787 '', '', '', '', '', '', '', '')),
1788 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1789 ((['DoGetTryMasters'], ), None),
1790 ((['DoGetTrySlaves'], ), None),
1791 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1792 ]
1793 out = StringIO.StringIO()
1794 self.mock(git_cl.sys, 'stdout', out)
1795 self.assertEqual(0, git_cl.main(['try']))
1796 self.assertEqual(
1797 out.getvalue(),
1798 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
1799
tandrii16e0b4e2016-06-07 10:34:28 -07001800 def _common_GerritCommitMsgHookCheck(self):
1801 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1802 self.mock(git_cl.os.path, 'abspath',
1803 lambda path: self._mocked_call(['abspath', path]))
1804 self.mock(git_cl.os.path, 'exists',
1805 lambda path: self._mocked_call(['exists', path]))
1806 self.mock(git_cl.gclient_utils, 'FileRead',
1807 lambda path: self._mocked_call(['FileRead', path]))
1808 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
1809 lambda path: self._mocked_call(['rm_file_or_tree', path]))
1810 self.calls = [
1811 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1812 ((['abspath', '../'],), '/abs/git_repo_root'),
1813 ]
1814 return git_cl.Changelist(codereview='gerrit', issue=123)
1815
1816 def test_GerritCommitMsgHookCheck_custom_hook(self):
1817 cl = self._common_GerritCommitMsgHookCheck()
1818 self.calls += [
1819 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1820 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1821 '#!/bin/sh\necho "custom hook"')
1822 ]
1823 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1824
1825 def test_GerritCommitMsgHookCheck_not_exists(self):
1826 cl = self._common_GerritCommitMsgHookCheck()
1827 self.calls += [
1828 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
1829 ]
1830 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1831
1832 def test_GerritCommitMsgHookCheck(self):
1833 cl = self._common_GerritCommitMsgHookCheck()
1834 self.calls += [
1835 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1836 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1837 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
1838 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
1839 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1840 ''),
1841 ]
1842 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1843
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001844
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001845if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001846 git_cl.logging.basicConfig(
1847 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001848 unittest.main()