blob: 378525a005eda3b575e93359895be8b0ff12abbd [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
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000024class ChangelistMock(object):
25 # A class variable so we can access it when we don't have access to the
26 # instance that's being set.
27 desc = ""
28 def __init__(self, **kwargs):
29 pass
30 def GetIssue(self):
31 return 1
32 def GetDescription(self):
33 return ChangelistMock.desc
34 def UpdateDescription(self, desc):
35 ChangelistMock.desc = desc
36
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000037class PresubmitMock(object):
38 def __init__(self, *args, **kwargs):
39 self.reviewers = []
40 @staticmethod
41 def should_continue():
42 return True
43
44
45class RietveldMock(object):
46 def __init__(self, *args, **kwargs):
47 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000048
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000049 @staticmethod
50 def get_description(issue):
51 return 'Issue: %d' % issue
52
maruel@chromium.org78936cb2013-04-11 00:17:52 +000053 @staticmethod
54 def get_issue_properties(_issue, _messages):
55 return {
56 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
57 'messages': [
58 {
59 'approval': True,
60 'sender': 'john@chromium.org',
61 },
62 ],
63 }
64
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000065
66class WatchlistsMock(object):
67 def __init__(self, _):
68 pass
69 @staticmethod
70 def GetWatchersForPaths(_):
71 return ['joe@example.com']
72
73
ukai@chromium.org78c4b982012-02-14 02:20:26 +000074class CodereviewSettingsFileMock(object):
75 def __init__(self):
76 pass
77 # pylint: disable=R0201
78 def read(self):
79 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +000080 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +000081
82
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +000083class AuthenticatorMock(object):
84 def __init__(self, *_args):
85 pass
86 def has_cached_credentials(self):
87 return True
88
89
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +000090def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
91 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
92
93 Usage:
94 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
95 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
96
97 OR
98 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
99 CookiesAuthenticatorMockFactory(cookie='cookie'))
100 """
101 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
102 def __init__(self): # pylint: disable=W0231
103 # Intentionally not calling super() because it reads actual cookie files.
104 pass
105 @classmethod
106 def get_gitcookies_path(cls):
107 return '~/.gitcookies'
108 @classmethod
109 def get_netrc_path(cls):
110 return '~/.netrc'
111 def get_auth_header(self, host):
112 if same_cookie:
113 return same_cookie
114 return (hosts_with_creds or {}).get(host)
115 return CookiesAuthenticatorMock
116
117
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000118class TestGitClBasic(unittest.TestCase):
119 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
120 parsed = urlparse.urlparse(url)
121 result = func(parsed)
122 if fail:
123 self.assertIsNone(result)
124 return None
125 self.assertIsNotNone(result)
126 self.assertEqual(result.issue, issue)
127 self.assertEqual(result.patchset, patchset)
128 self.assertEqual(result.hostname, hostname)
129 return result
130
131 def test_ParseIssueURL_rietveld(self):
132 def test(url, issue=None, patchset=None, hostname=None, patch_url=None,
133 fail=None):
134 result = self._test_ParseIssueUrl(
135 git_cl._RietveldChangelistImpl.ParseIssueURL,
136 url, issue, patchset, hostname, fail)
137 if not fail:
138 self.assertEqual(result.patch_url, patch_url)
139
140 test('http://codereview.chromium.org/123',
141 123, None, 'codereview.chromium.org')
142 test('https://codereview.chromium.org/123',
143 123, None, 'codereview.chromium.org')
144 test('https://codereview.chromium.org/123/',
145 123, None, 'codereview.chromium.org')
146 test('https://codereview.chromium.org/123/whatever',
147 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700148 test('https://codereview.chromium.org/123/#ps20001',
149 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000150 test('http://codereview.chromium.org/download/issue123_4.diff',
151 123, 4, 'codereview.chromium.org',
152 patch_url='https://codereview.chromium.org/download/issue123_4.diff')
153 # This looks like bad Gerrit, but is actually valid Rietveld.
154 test('https://chrome-review.source.com/123/4/',
155 123, None, 'chrome-review.source.com')
156
157 test('https://codereview.chromium.org/deadbeaf', fail=True)
158 test('https://codereview.chromium.org/api/123', fail=True)
159 test('bad://codereview.chromium.org/123', fail=True)
160 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
161
162 def test_ParseIssueURL_gerrit(self):
163 def test(url, issue=None, patchset=None, hostname=None, fail=None):
164 self._test_ParseIssueUrl(
165 git_cl._GerritChangelistImpl.ParseIssueURL,
166 url, issue, patchset, hostname, fail)
167
168 test('http://chrome-review.source.com/c/123',
169 123, None, 'chrome-review.source.com')
170 test('https://chrome-review.source.com/c/123/',
171 123, None, 'chrome-review.source.com')
172 test('https://chrome-review.source.com/c/123/4',
173 123, 4, 'chrome-review.source.com')
174 test('https://chrome-review.source.com/#/c/123/4',
175 123, 4, 'chrome-review.source.com')
176 test('https://chrome-review.source.com/c/123/4',
177 123, 4, 'chrome-review.source.com')
178 test('https://chrome-review.source.com/123',
179 123, None, 'chrome-review.source.com')
180 test('https://chrome-review.source.com/123/4',
181 123, 4, 'chrome-review.source.com')
182
183 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
184 test('https://chrome-review.source.com/c/abc/', fail=True)
185 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
186
187 def test_ParseIssueNumberArgument(self):
188 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
189 result = git_cl.ParseIssueNumberArgument(arg)
190 self.assertIsNotNone(result)
191 if fail:
192 self.assertFalse(result.valid)
193 else:
194 self.assertEqual(result.issue, issue)
195 self.assertEqual(result.patchset, patchset)
196 self.assertEqual(result.hostname, hostname)
197
198 test('123', 123)
199 test('', fail=True)
200 test('abc', fail=True)
201 test('123/1', fail=True)
202 test('123a', fail=True)
203 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
204 # Rietveld.
205 test('https://codereview.source.com/123',
206 123, None, 'codereview.source.com')
207 test('https://codereview.source.com/www123', fail=True)
208 # Gerrrit.
209 test('https://chrome-review.source.com/c/123/4',
210 123, 4, 'chrome-review.source.com')
211 test('https://chrome-review.source.com/bad/123/4', fail=True)
212
tandriif9aefb72016-07-01 09:06:51 -0700213 def test_get_bug_line_values(self):
214 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
215 self.assertEqual(f('', ''), [])
216 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
217 self.assertEqual(f('v8', '456'), ['v8:456'])
218 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
219 # Not nice, but not worth carying.
220 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
221 ['v8:456', 'chromium:123', 'v8:123'])
222
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000223
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000224class TestGitCl(TestCase):
225 def setUp(self):
226 super(TestGitCl, self).setUp()
227 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700228 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000229 self.mock(subprocess2, 'call', self._mocked_call)
230 self.mock(subprocess2, 'check_call', self._mocked_call)
231 self.mock(subprocess2, 'check_output', self._mocked_call)
232 self.mock(subprocess2, 'communicate', self._mocked_call)
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000233 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000234 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000235 self.mock(git_common, 'get_or_create_merge_base',
236 lambda *a: (
237 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000238 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000239 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000240 self.mock(git_cl, 'ask_for_data', self._mocked_call)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000241 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000242 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000243 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000244 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000245 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000246 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000247 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
248 classmethod(lambda _: False))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000249 # It's important to reset settings to not have inter-tests interference.
250 git_cl.settings = None
251
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000252
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000253 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000254 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000255 # Note: has_failed returns True if at least 1 test ran so far, current
256 # included, has failed. That means current test may have actually ran
257 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000258 if not self.has_failed():
259 self.assertEquals([], self.calls)
260 finally:
261 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000262
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000263 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000264 self.assertTrue(
265 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700266 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000267 top = self.calls.pop(0)
268 if len(top) > 2 and top[2]:
269 raise top[2]
270 expected_args, result = top
271
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000272 # Also logs otherwise it could get caught in a try/finally and be hard to
273 # diagnose.
274 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700275 N = 5
276 prior_calls = '\n '.join(
277 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
278 for i, c in enumerate(self._calls_done[-N:]))
279 following_calls = '\n '.join(
280 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
281 for i, c in enumerate(self.calls[:N]))
282 extended_msg = (
283 'A few prior calls:\n %s\n\n'
284 'This (expected):\n @%d: %r\n'
285 'This (actual):\n @%d: %r\n\n'
286 'A few following expected calls:\n %s' %
287 (prior_calls, len(self._calls_done), expected_args,
288 len(self._calls_done), args, following_calls))
289 git_cl.logging.error(extended_msg)
290
291 self.fail('@%d Expected: %r Actual: %r' % (
292 len(self._calls_done), expected_args, args))
293
294 self._calls_done.append(top)
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000295 return result
296
maruel@chromium.orga3353652011-11-30 14:26:57 +0000297 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000298 def _is_gerrit_calls(cls, gerrit=False):
299 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
300 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
301
302 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000303 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000304 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000305 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000306
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000307 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000308 def _upload_no_rev_calls(cls, similarity, find_copies):
309 return (cls._git_base_calls(similarity, find_copies) +
310 cls._git_upload_no_rev_calls())
311
312 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000313 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000314 if similarity is None:
315 similarity = '50'
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000316 similarity_call = ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000317 'branch.master.git-cl-similarity'],), '')
318 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000319 similarity_call = ((['git', 'config', '--int',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000320 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000321
322 if find_copies is None:
323 find_copies = True
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000324 find_copies_call = ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000325 'branch.master.git-find-copies'],), '')
326 else:
327 val = str(int(find_copies))
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000328 find_copies_call = ((['git', 'config', '--int',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000329 'branch.master.git-find-copies', val],), '')
330
331 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000332 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000333 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000334 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000335 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000336 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000337 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000338
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000339 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000340 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000341 similarity_call,
342 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
343 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000344 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000345 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000346 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
347 ((['git', 'config', 'branch.master.gerritissue'],), ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000348 ((['git', 'config', 'rietveld.server'],),
349 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000350 ((['git', 'config', 'branch.master.merge'],), 'master'),
351 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000352 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000353 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000354 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000355 ((['git', 'rev-parse', '--show-cdup'],), ''),
356 ((['git', 'rev-parse', 'HEAD'],), '12345'),
357 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000358 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000359 'M\t.gitignore\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000360 ((['git', 'config', 'branch.master.rietveldpatchset'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000361 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000362 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000363 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000364 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000365 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000366 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000367 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000368 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000369 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000370 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000371 ]
372
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000373 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000374 def _git_upload_no_rev_calls(cls):
375 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000376 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000377 ]
378
379 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000380 def _git_upload_calls(cls, private):
381 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000382 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000383 private_call = []
384 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000385 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000386 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000387 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000388
maruel@chromium.orga3353652011-11-30 14:26:57 +0000389 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000390 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000391 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000392 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000393 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000394 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000395 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
396 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000397 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000398 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000399 ((['git', 'config', 'rietveld.project'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000400 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000401 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000402 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000403 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000404 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000405 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000406 ] + cls._git_post_upload_calls()
407
408 @classmethod
409 def _git_post_upload_calls(cls):
410 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000411 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
412 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
413 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000414 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000415 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000416 ]
417
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000418 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000419 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000420 fake_ancestor = 'fake_ancestor'
421 fake_cl = 'fake_cl_for_patch'
422 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000423 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000424 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000425 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000426 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000427 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000428 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000429 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000430 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000431 'config', 'gitcl.remotebranch'],), (('', None), 1)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000432 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000433 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000434 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000435 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000436 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000437 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000438 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000439 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000440 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000441 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000442 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000443
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000444 @classmethod
445 def _dcommit_calls_1(cls):
446 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000447 ((['git', 'config', 'rietveld.autoupdate'],),
448 ''),
449 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
450 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000451 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000452 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000453 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
454 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
455 None),
456 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000457 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
458 ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000459 'branch.working.git-cl-similarity'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000460 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
461 ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000462 'branch.working.git-find-copies'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000463 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
464 ((['git',
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000465 'config', 'branch.working.rietveldissue'],), '12345'),
466 ((['git',
467 'config', 'rietveld.server'],), 'codereview.example.com'),
468 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000469 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000470 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000471 ((['git', 'config', 'branch.working.merge'],),
472 'refs/heads/master'),
473 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000474 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000475 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000476 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000477 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000478 'refs/remotes/origin/master'],),
479 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000480 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000481 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000482 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000483 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000484 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000485 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000486 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000487 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000488 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000489 ]
490
491 @classmethod
492 def _dcommit_calls_normal(cls):
493 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000494 ((['git', 'rev-parse', '--show-cdup'],), ''),
495 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000496 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000497 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000498 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000499 '.'],),
500 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000501 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000502 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000503 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000504 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000505 ((['git', 'config', 'user.email'],), 'author@example.com'),
506 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000507 ]
508
509 @classmethod
510 def _dcommit_calls_bypassed(cls):
511 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000512 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000513 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000514 ]
515
516 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000517 def _dcommit_calls_3(cls):
518 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000519 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000520 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000521 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000522 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000523 (' PRESUBMIT.py | 2 +-\n'
524 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000525 ((['git', 'show-ref', '--quiet', '--verify',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000526 'refs/heads/git-cl-commit'],),
527 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000528 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
529 ((['git', 'show-ref', '--quiet', '--verify',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000530 'refs/heads/git-cl-cherry-pick'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000531 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000532 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
533 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
534 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000535 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000536 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000537 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000538 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000539 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000540 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000541 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000542 ((['git', 'checkout', '-q', 'working'],), ''),
543 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000544 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000545
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000546 @staticmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000547 def _cmd_line(description, args, similarity, find_copies, private):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000548 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000549 return [
550 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000551 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000552 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000553 ] + args + [
554 '--cc', 'joe@example.com',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000555 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000556 '--git_similarity', similarity or '50'
557 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000558 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000559 ]
560
561 def _run_reviewer_test(
562 self,
563 upload_args,
564 expected_description,
565 returned_description,
566 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000567 reviewers,
568 private=False):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000569 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000570 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000571 try:
572 similarity = upload_args[upload_args.index('--similarity')+1]
573 except ValueError:
574 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000575
576 if '--find-copies' in upload_args:
577 find_copies = True
578 elif '--no-find-copies' in upload_args:
579 find_copies = False
580 else:
581 find_copies = None
582
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000583 private = '--private' in upload_args
584
585 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000586
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000587 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000588 self.assertEquals(
589 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000590 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000591 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000592 '#--------------------This line is 72 characters long'
593 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000594 expected_description,
595 desc)
596 return returned_description
597 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000598
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000599 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000600 cmd_line = self._cmd_line(final_description, reviewers, similarity,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000601 find_copies, private)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000602 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000603 return 1, 2
604 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000605
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000606 git_cl.main(['upload'] + upload_args)
607
608 def test_no_reviewer(self):
609 self._run_reviewer_test(
610 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000611 'desc\n\nBUG=',
612 '# Blah blah comment.\ndesc\n\nBUG=',
613 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000614 [])
615
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000616 def test_keep_similarity(self):
617 self._run_reviewer_test(
618 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000619 'desc\n\nBUG=',
620 '# Blah blah comment.\ndesc\n\nBUG=',
621 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000622 [])
623
iannucci@chromium.org79540052012-10-19 23:15:26 +0000624 def test_keep_find_copies(self):
625 self._run_reviewer_test(
626 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000627 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000628 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000629 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000630 [])
631
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000632 def test_private(self):
633 self._run_reviewer_test(
634 ['--private'],
635 'desc\n\nBUG=',
636 '# Blah blah comment.\ndesc\n\nBUG=\n',
637 'desc\n\nBUG=',
638 [])
639
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000640 def test_reviewers_cmd_line(self):
641 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000642 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000643 self._run_reviewer_test(
644 ['-r' 'foo@example.com'],
645 description,
646 '\n%s\n' % description,
647 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000648 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000649
650 def test_reviewer_tbr_overriden(self):
651 # Reviewer is overriden with TBR
652 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000653 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000654 self._run_reviewer_test(
655 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000656 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000657 description.strip('\n'),
658 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000659 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000660
661 def test_reviewer_multiple(self):
662 # Handles multiple R= or TBR= lines.
663 description = (
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000664 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000665 self._run_reviewer_test(
666 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000667 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000668 description,
669 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000670 ['--reviewers=another@example.com,reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000671
maruel@chromium.orga3353652011-11-30 14:26:57 +0000672 def test_reviewer_send_mail(self):
673 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000674 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000675 self._run_reviewer_test(
676 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000677 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000678 description.strip('\n'),
679 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000680 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000681
682 def test_reviewer_send_mail_no_rev(self):
683 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000684 stdout = StringIO.StringIO()
685 stderr = StringIO.StringIO()
maruel@chromium.orga3353652011-11-30 14:26:57 +0000686 try:
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000687 self.calls = self._upload_no_rev_calls(None, None)
688 def RunEditor(desc, _, **kwargs):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000689 return desc
690 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000691 self.mock(sys, 'stdout', stdout)
692 self.mock(sys, 'stderr', stderr)
maruel@chromium.orga3353652011-11-30 14:26:57 +0000693 git_cl.main(['upload', '--send-mail'])
694 self.fail()
695 except SystemExit:
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000696 self.assertEqual(
697 'Using 50% similarity for rename/copy detection. Override with '
698 '--similarity.\n',
699 stdout.getvalue())
700 self.assertEqual(
701 'Must specify reviewers to send email.\n', stderr.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000702
tandriif9aefb72016-07-01 09:06:51 -0700703 def test_bug_on_cmd(self):
704 self._run_reviewer_test(
705 ['--bug=500658,proj:123'],
706 'desc\n\nBUG=500658\nBUG=proj:123',
707 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
708 'desc\n\nBUG=500658\nBUG=proj:1234',
709 [])
710
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000711 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000712 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000713 self.calls = (
714 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000715 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000716 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000717 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000718 git_cl.main(['dcommit'])
719
720 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000721 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000722 self.calls = (
723 self._dcommit_calls_1() +
724 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000725 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000726 git_cl.main(['dcommit', '--bypass-hooks'])
727
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000728
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000729 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000730 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000731 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000732 if skip_auth_check:
733 return [((cmd, ), 'true')]
734
735 calls = [((cmd, ), '', subprocess2.CalledProcessError(1, '', '', '', ''))]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000736 if issue:
737 calls.extend([
738 ((['git', 'config', 'branch.master.gerritserver'],), ''),
739 ])
740 calls.extend([
741 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
742 ((['git', 'config', 'branch.master.remote'],), 'origin'),
743 ((['git', 'config', 'remote.origin.url'],),
744 'https://chromium.googlesource.com/my/repo'),
745 ((['git', 'config', 'remote.origin.url'],),
746 'https://chromium.googlesource.com/my/repo'),
747 ])
748 return calls
749
750 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000751 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000752 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000753 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
754 ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000755 'branch.master.git-cl-similarity'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000756 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
757 ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000758 'branch.master.git-find-copies'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000759 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000760 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000761 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000762 ((['git', 'config', 'branch.master.gerritissue'],),
763 '' if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000764 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000765 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000766 ((['get_or_create_merge_base', 'master',
767 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000768 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000769 # Calls to verify branch point is ancestor
770 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
771 cls._git_sanity_checks('fake_ancestor_sha', 'master',
772 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000773 ((['git', 'rev-parse', '--show-cdup'],), ''),
774 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000775
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000776 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000777 'diff', '--name-status', '--no-renames', '-r',
778 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000779 'M\t.gitignore\n'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000780 ((['git', 'config', 'branch.master.gerritpatchset'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000781 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000782 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000783 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000784 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000785 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000786 ((['git', 'config', 'user.email'],), 'me@example.com'),
787 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000788 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000789 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000790 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000791 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000792
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000793 @classmethod
794 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700795 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000796 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000797 ref_suffix='', notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000798 post_amend_description=None, issue=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000799 if post_amend_description is None:
800 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -0700801 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000802
tandriia60502f2016-06-20 02:01:53 -0700803 if squash_mode == 'default':
804 calls.extend([
805 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
806 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
807 ])
808 elif squash_mode in ('override_squash', 'override_nosquash'):
809 calls.extend([
810 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
811 'true' if squash_mode == 'override_squash' else 'false'),
812 ])
813 else:
814 assert squash_mode in ('squash', 'nosquash')
815
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000816 # If issue is given, then description is fetched from Gerrit instead.
817 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000818 calls += [
819 ((['git', 'log', '--pretty=format:%s\n\n%b',
820 'fake_ancestor_sha..HEAD'],),
821 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000822 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000823 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000824 # DownloadGerritHook(False)
825 ((False, ),
826 ''),
827 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000828 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000829 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000830 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000831 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000832 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000833 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000834 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000835 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000836 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000837 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000838 if not issue:
839 # Prompting to edit description on first upload.
840 calls += [
841 ((['git', 'config', 'core.editor'],), ''),
842 ((['RunEditor'],), description),
843 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000844 ref_to_push = 'abcdef0123456789'
845 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000846 ((['git', 'config', 'branch.master.merge'],),
847 'refs/heads/master'),
848 ((['git', 'config', 'branch.master.remote'],),
849 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000850 ((['get_or_create_merge_base', 'master',
851 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000852 'origin/master'),
853 ((['git', 'rev-parse', 'HEAD:'],),
854 '0123456789abcdef'),
855 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000856 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000857 ref_to_push),
858 ]
859 else:
860 ref_to_push = 'HEAD'
861
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000862 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000863 ((['git', 'rev-list',
864 expected_upstream_ref + '..' + ref_to_push],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000865 ((['git', 'config', 'rietveld.cc'],), '')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000866 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000867
868 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
869 if ref_suffix:
870 ref_suffix += ',' + notify_suffix
871 else:
872 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000873
874 # Add cc from watch list.
875 ref_suffix += ',cc=joe@example.com'
876
ukai@chromium.orge8077812012-02-03 03:41:46 +0000877 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000878 ref_suffix += ',' + ','.join('r=%s' % email
879 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000880 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000881 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000882 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000883 ('remote:\n'
884 'remote: Processing changes: (\)\n'
885 'remote: Processing changes: (|)\n'
886 'remote: Processing changes: (/)\n'
887 'remote: Processing changes: (-)\n'
888 'remote: Processing changes: new: 1 (/)\n'
889 'remote: Processing changes: new: 1, done\n'
890 'remote:\n'
891 'remote: New Changes:\n'
892 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
893 'remote:\n'
894 'To https://chromium.googlesource.com/yyy/zzz\n'
895 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000896 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000897 if squash:
898 calls += [
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000899 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000900 ((['git', 'config', 'branch.master.gerritserver',
901 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000902 ((['git', 'config', 'branch.master.gerritsquashhash',
903 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000904 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000905 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000906 return calls
907
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000908 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000909 self,
910 upload_args,
911 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000912 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -0700913 squash=True,
914 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000915 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000916 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000917 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000918 post_amend_description=None,
919 issue=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000920 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -0700921 if squash_mode is None:
922 if '--no-squash' in upload_args:
923 squash_mode = 'nosquash'
924 elif '--squash' in upload_args:
925 squash_mode = 'squash'
926 else:
927 squash_mode = 'default'
928
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000929 reviewers = reviewers or []
tandrii@chromium.org28253532016-04-14 13:46:56 +0000930 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -0700931 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000932 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -0700933 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
934 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -0700935 self.mock(git_cl.gclient_utils, 'RunEditor',
936 lambda *_, **__: self._mocked_call(['RunEditor']))
937 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
938
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000939 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +0000940 self.calls += self._gerrit_upload_calls(
941 description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700942 squash_mode=squash_mode,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000943 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000944 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000945 post_amend_description=post_amend_description,
946 issue=issue)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000947 # Uncomment when debugging.
948 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000949 git_cl.main(['upload'] + upload_args)
950
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000951 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -0700952 self._run_gerrit_upload_test(
953 ['--no-squash'],
954 'desc\n\nBUG=\n',
955 [],
956 squash=False,
957 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
958
959 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000960 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000961 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000962 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +0000963 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000964 [],
tandriia60502f2016-06-20 02:01:53 -0700965 squash=False,
966 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000967 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000968
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000969 def test_gerrit_no_reviewer(self):
970 self._run_gerrit_upload_test(
971 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000972 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -0700973 [],
974 squash=False,
975 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000976
tandriieefe8322016-08-17 10:12:24 -0700977 def test_gerrit_patch_bad_chars(self):
978 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000979 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -0700980 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000981 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -0700982 squash=False,
983 squash_mode='override_nosquash',
tandriieefe8322016-08-17 10:12:24 -0700984 ref_suffix='%m=Dont_put_bad_chars')
985 self.assertIn(
986 'WARNING: Patchset title may only contain alphanumeric chars '
987 'and spaces. Cleaned up title:\nDont put bad chars\n',
988 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000989
ukai@chromium.orge8077812012-02-03 03:41:46 +0000990 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000991 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000992 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000993 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000994 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -0700995 squash=False,
996 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000997 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +0000998
999 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001000 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001001 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001002 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
1003 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001004 ['reviewer@example.com', 'another@example.com'],
1005 squash=False,
1006 squash_mode='override_nosquash')
1007
1008 def test_gerrit_upload_squash_first_is_default(self):
1009 # Mock Gerrit CL description to indicate the first upload.
1010 self.mock(git_cl.Changelist, 'GetDescription',
1011 lambda *_: None)
1012 self._run_gerrit_upload_test(
1013 [],
1014 'desc\nBUG=\n\nChange-Id: 123456789',
1015 [],
1016 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001017
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001018 def test_gerrit_upload_squash_first(self):
1019 # Mock Gerrit CL description to indicate the first upload.
1020 self.mock(git_cl.Changelist, 'GetDescription',
1021 lambda *_: None)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001022 self._run_gerrit_upload_test(
1023 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001024 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001025 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001026 squash=True,
1027 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001028
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001029 def test_gerrit_upload_squash_reupload(self):
1030 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1031 # Mock Gerrit CL description to indicate re-upload.
1032 self.mock(git_cl.Changelist, 'GetDescription',
1033 lambda *args: description)
1034 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
1035 lambda *args: 1)
1036 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1037 lambda *args: {'change_id': '123456789'})
1038 self._run_gerrit_upload_test(
1039 ['--squash'],
1040 description,
1041 [],
1042 squash=True,
1043 expected_upstream_ref='origin/master',
1044 issue=123456)
1045
rmistry@google.com2dd99862015-06-22 12:22:18 +00001046 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001047 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001048 def mock_run_git(*args, **_kwargs):
1049 if args[0] == ['for-each-ref',
1050 '--format=%(refname:short) %(upstream:short)',
1051 'refs/heads']:
1052 # Create a local branch dependency tree that looks like this:
1053 # test1 -> test2 -> test3 -> test4 -> test5
1054 # -> test3.1
1055 # test6 -> test0
1056 branch_deps = [
1057 'test2 test1', # test1 -> test2
1058 'test3 test2', # test2 -> test3
1059 'test3.1 test2', # test2 -> test3.1
1060 'test4 test3', # test3 -> test4
1061 'test5 test4', # test4 -> test5
1062 'test6 test0', # test0 -> test6
1063 'test7', # test7
1064 ]
1065 return '\n'.join(branch_deps)
1066 self.mock(git_cl, 'RunGit', mock_run_git)
1067
1068 class RecordCalls:
1069 times_called = 0
1070 record_calls = RecordCalls()
1071 def mock_CMDupload(*args, **_kwargs):
1072 record_calls.times_called += 1
1073 return 0
1074 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1075
1076 self.calls = [
1077 (('[Press enter to continue or ctrl-C to quit]',), ''),
1078 ]
1079
1080 class MockChangelist():
1081 def __init__(self):
1082 pass
1083 def GetBranch(self):
1084 return 'test1'
1085 def GetIssue(self):
1086 return '123'
1087 def GetPatchset(self):
1088 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001089 def IsGerrit(self):
1090 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001091
1092 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1093 # CMDupload should have been called 5 times because of 5 dependent branches.
1094 self.assertEquals(5, record_calls.times_called)
1095 self.assertEquals(0, ret)
1096
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001097 def test_gerrit_change_id(self):
1098 self.calls = [
1099 ((['git', 'write-tree'], ),
1100 'hashtree'),
1101 ((['git', 'rev-parse', 'HEAD~0'], ),
1102 'branch-parent'),
1103 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1104 'A B <a@b.org> 1456848326 +0100'),
1105 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1106 'C D <c@d.org> 1456858326 +0100'),
1107 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1108 'hashchange'),
1109 ]
1110 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1111 self.assertEqual(change_id, 'Ihashchange')
1112
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001113 def test_desecription_append_footer(self):
1114 for init_desc, footer_line, expected_desc in [
1115 # Use unique desc first lines for easy test failure identification.
1116 ('foo', 'R=one', 'foo\n\nR=one'),
1117 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1118 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1119 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1120 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1121 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1122 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1123 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1124 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1125 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1126 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1127 ]:
1128 desc = git_cl.ChangeDescription(init_desc)
1129 desc.append_footer(footer_line)
1130 self.assertEqual(desc.description, expected_desc)
1131
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001132 def test_update_reviewers(self):
1133 data = [
1134 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001135 ('foo\nR=xx', [], 'foo\nR=xx'),
1136 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001137 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001138 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1139 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1140 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001141 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001142 ('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 +00001143 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001144 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1145 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1146 # Same as the line before, but full of whitespaces.
1147 (
1148 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1149 'foo\nBar\n\nR=c@c\n BUG =',
1150 ),
1151 # Whitespaces aren't interpreted as new lines.
1152 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001153 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001154 expected = [i[2] for i in data]
1155 actual = []
1156 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001157 obj = git_cl.ChangeDescription(orig)
1158 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001159 actual.append(obj.description)
1160 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001161
wittman@chromium.org455dc922015-01-26 20:15:50 +00001162 def test_get_target_ref(self):
1163 # Check remote or remote branch not present.
1164 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1165 self.assertEqual(None, git_cl.GetTargetRef(None,
1166 'refs/remotes/origin/master',
1167 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001168
wittman@chromium.org455dc922015-01-26 20:15:50 +00001169 # Check default target refs for branches.
1170 self.assertEqual('refs/heads/master',
1171 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1172 None, None))
1173 self.assertEqual('refs/heads/master',
1174 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1175 None, None))
1176 self.assertEqual('refs/heads/master',
1177 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1178 None, None))
1179 self.assertEqual('refs/branch-heads/123',
1180 git_cl.GetTargetRef('origin',
1181 'refs/remotes/branch-heads/123',
1182 None, None))
1183 self.assertEqual('refs/diff/test',
1184 git_cl.GetTargetRef('origin',
1185 'refs/remotes/origin/refs/diff/test',
1186 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001187 self.assertEqual('refs/heads/chrome/m42',
1188 git_cl.GetTargetRef('origin',
1189 'refs/remotes/origin/chrome/m42',
1190 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001191
1192 # Check target refs for user-specified target branch.
1193 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1194 'refs/remotes/branch-heads/123'):
1195 self.assertEqual('refs/branch-heads/123',
1196 git_cl.GetTargetRef('origin',
1197 'refs/remotes/origin/master',
1198 branch, None))
1199 for branch in ('origin/master', 'remotes/origin/master',
1200 'refs/remotes/origin/master'):
1201 self.assertEqual('refs/heads/master',
1202 git_cl.GetTargetRef('origin',
1203 'refs/remotes/branch-heads/123',
1204 branch, None))
1205 for branch in ('master', 'heads/master', 'refs/heads/master'):
1206 self.assertEqual('refs/heads/master',
1207 git_cl.GetTargetRef('origin',
1208 'refs/remotes/branch-heads/123',
1209 branch, None))
1210
1211 # Check target refs for pending prefix.
1212 self.assertEqual('prefix/heads/master',
1213 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1214 None, 'prefix/'))
1215
wychen@chromium.orga872e752015-04-28 23:42:18 +00001216 def test_patch_when_dirty(self):
1217 # Patch when local tree is dirty
1218 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1219 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1220
1221 def test_diff_when_dirty(self):
1222 # Do 'git cl diff' when local tree is dirty
1223 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1224 self.assertNotEqual(git_cl.main(['diff']), 0)
1225
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001226 def _patch_common(self, is_gerrit=False, force_codereview=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001227 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001228 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1229 lambda x: '60001')
1230 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
1231 lambda *args: None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001232 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1233 lambda *args: {
1234 'current_revision': '7777777777',
1235 'revisions': {
1236 '1111111111': {
1237 '_number': 1,
1238 'fetch': {'http': {
1239 'url': 'https://chromium.googlesource.com/my/repo',
1240 'ref': 'refs/changes/56/123456/1',
1241 }},
1242 },
1243 '7777777777': {
1244 '_number': 7,
1245 'fetch': {'http': {
1246 'url': 'https://chromium.googlesource.com/my/repo',
1247 'ref': 'refs/changes/56/123456/7',
1248 }},
1249 },
1250 },
1251 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001252 self.mock(git_cl.Changelist, 'GetDescription',
1253 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001254 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1255
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001256 self.calls = self.calls or []
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001257 if not force_codereview:
1258 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001259 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001260 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1261 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
1262 ((['git', 'config', 'branch.master.gerritissue'],), ''),
1263 ((['git', 'config', 'rietveld.autoupdate'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001264 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001265
1266 if is_gerrit:
1267 if not force_codereview:
1268 self.calls += [
1269 ((['git', 'config', 'gerrit.host'],), 'true'),
1270 ]
1271 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001272 self.calls += [
1273 ((['git', 'config', 'gerrit.host'],), ''),
1274 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1275 ((['git', 'rev-parse', '--show-cdup'],), ''),
1276 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
1277 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001278
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001279 def _common_patch_successful(self):
wychen@chromium.orga872e752015-04-28 23:42:18 +00001280 self._patch_common()
1281 self.calls += [
1282 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
1283 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001284 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001285 'patch from issue 123456 at patchset 60001 ' +
1286 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001287 ((['git', 'config', 'branch.master.rietveldissue', '123456'],), ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001288 ((['git', 'config', 'branch.master.rietveldserver'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001289 ((['git', 'config', 'branch.master.rietveldserver',
1290 'https://codereview.example.com'],), ''),
1291 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001292 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001293
1294 def test_patch_successful(self):
1295 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001296 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1297
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001298 def test_patch_successful_new_branch(self):
1299 self.calls = [ ((['git', 'new-branch', 'master'],), ''), ]
1300 self._common_patch_successful()
1301 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1302
wychen@chromium.orga872e752015-04-28 23:42:18 +00001303 def test_patch_conflict(self):
1304 self._patch_common()
1305 self.calls += [
1306 ((['git', 'apply', '--index', '-p0', '--3way'],), '',
1307 subprocess2.CalledProcessError(1, '', '', '', '')),
1308 ]
1309 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001310
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001311 def test_gerrit_patch_successful(self):
1312 self._patch_common(is_gerrit=True)
1313 self.calls += [
1314 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1315 'refs/changes/56/123456/7'],), ''),
1316 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1317 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
1318 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1319 ((['git', 'config', 'branch.master.merge'],), 'master'),
1320 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1321 ((['git', 'config', 'remote.origin.url'],),
1322 'https://chromium.googlesource.com/my/repo'),
1323 ((['git', 'config', 'branch.master.gerritserver',
1324 'https://chromium-review.googlesource.com'],), ''),
1325 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1326 ]
1327 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1328
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001329 def test_patch_force_codereview(self):
1330 self._patch_common(is_gerrit=True, force_codereview=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'],), ''),
1335 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1336 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
1337 ((['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'],), ''),
1344 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1345 ]
1346 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1347
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001348 def test_gerrit_patch_url_successful(self):
1349 self._patch_common(is_gerrit=True)
1350 self.calls += [
1351 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1352 'refs/changes/56/123456/1'],), ''),
1353 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1354 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
1355 ((['git', 'config', 'branch.master.gerritserver',
1356 'https://chromium-review.googlesource.com'],), ''),
1357 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1358 ]
1359 self.assertEqual(git_cl.main(
1360 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1361
1362 def test_gerrit_patch_conflict(self):
1363 self._patch_common(is_gerrit=True)
1364 self.mock(git_cl, 'DieWithError',
1365 lambda msg: self._mocked_call(['DieWithError', msg]))
1366 class SystemExitMock(Exception):
1367 pass
1368 self.calls += [
1369 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1370 'refs/changes/56/123456/1'],), ''),
1371 ((['git', 'cherry-pick', 'FETCH_HEAD'],),
1372 '', subprocess2.CalledProcessError(1, '', '', '', '')),
1373 ((['DieWithError', 'git cherry-pick FETCH_HEAD" failed.\n'],),
1374 '', SystemExitMock()),
1375 ]
1376 with self.assertRaises(SystemExitMock):
1377 git_cl.main(['patch',
1378 'https://chromium-review.googlesource.com/#/c/123456/1'])
1379
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001380 def _checkout_calls(self):
1381 return [
1382 ((['git', 'config', '--local', '--get-regexp',
1383 'branch\\..*\\.rietveldissue'], ),
1384 ('branch.retrying.rietveldissue 1111111111\n'
1385 'branch.some-fix.rietveldissue 2222222222\n')),
1386 ((['git', 'config', '--local', '--get-regexp',
1387 'branch\\..*\\.gerritissue'], ),
1388 ('branch.ger-branch.gerritissue 123456\n'
1389 'branch.gbranch654.gerritissue 654321\n')),
1390 ]
1391
1392 def test_checkout_gerrit(self):
1393 """Tests git cl checkout <issue>."""
1394 self.calls = self._checkout_calls()
1395 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1396 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1397
1398 def test_checkout_rietveld(self):
1399 """Tests git cl checkout <issue>."""
1400 self.calls = self._checkout_calls()
1401 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1402 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1403
1404 def test_checkout_not_found(self):
1405 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001406 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001407 self.calls = self._checkout_calls()
1408 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1409
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001410 def test_checkout_no_branch_issues(self):
1411 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001412 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001413 self.calls = [
1414 ((['git', 'config', '--local', '--get-regexp',
1415 'branch\\..*\\.rietveldissue'], ), '',
1416 subprocess2.CalledProcessError(1, '', '', '', '')),
1417 ((['git', 'config', '--local', '--get-regexp',
1418 'branch\\..*\\.gerritissue'], ), '',
1419 subprocess2.CalledProcessError(1, '', '', '', '')),
1420
1421 ]
1422 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1423
tandrii@chromium.org28253532016-04-14 13:46:56 +00001424 def _test_gerrit_ensure_authenticated_common(self, auth,
1425 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001426 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1427 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1428 self.mock(git_cl, 'DieWithError',
1429 lambda msg: self._mocked_call(['DieWithError', msg]))
1430 self.mock(git_cl, 'ask_for_data',
1431 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001432 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001433 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001434 cl.branch = 'master'
1435 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001436 cl.lookedup_issue = True
1437 return cl
1438
1439 def test_gerrit_ensure_authenticated_missing(self):
1440 cl = self._test_gerrit_ensure_authenticated_common(auth={
1441 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1442 })
1443 self.calls.append(
1444 ((['DieWithError',
1445 'Credentials for the following hosts are required:\n'
1446 ' chromium-review.googlesource.com\n'
1447 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1448 'You can (re)generate your credentails by visiting '
1449 'https://chromium-review.googlesource.com/new-password'],), ''),)
1450 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1451
1452 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001453 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001454 cl = self._test_gerrit_ensure_authenticated_common(auth={
1455 'chromium.googlesource.com': 'one',
1456 'chromium-review.googlesource.com': 'other',
1457 })
1458 self.calls.append(
1459 ((['ask_for_data', 'If you know what you are doing, '
1460 'press Enter to continue, Ctrl+C to abort.'],), ''))
1461 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1462
1463 def test_gerrit_ensure_authenticated_ok(self):
1464 cl = self._test_gerrit_ensure_authenticated_common(auth={
1465 'chromium.googlesource.com': 'same',
1466 'chromium-review.googlesource.com': 'same',
1467 })
1468 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1469
tandrii@chromium.org28253532016-04-14 13:46:56 +00001470 def test_gerrit_ensure_authenticated_skipped(self):
1471 cl = self._test_gerrit_ensure_authenticated_common(
1472 auth={}, skip_auth_check=True)
1473 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1474
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001475 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001476 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
1477 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001478 self.calls = [
1479 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1480 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1481 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1482 ((['git', 'config', 'rietveld.server'],), ''),
1483 ((['git', 'config', 'rietveld.server'],), ''),
1484 ((['git', 'config', 'branch.feature.rietveldserver'],),
1485 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07001486 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001487 ]
1488 self.assertEqual(0, git_cl.main(['set-commit']))
1489
tandriid9e5ce52016-07-13 02:32:59 -07001490 def _cmd_set_commit_gerrit_common(self, vote):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001491 self.mock(git_cl.gerrit_util, 'SetReview',
1492 lambda h, i, labels: self._mocked_call(
1493 ['SetReview', h, i, labels]))
1494 self.calls = [
1495 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1496 ((['git', 'config', 'branch.feature.rietveldissue'],), ''),
1497 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
1498 ((['git', 'config', 'branch.feature.gerritserver'],),
1499 'https://chromium-review.googlesource.com'),
1500 ((['SetReview', 'chromium-review.googlesource.com', 123,
tandriid9e5ce52016-07-13 02:32:59 -07001501 {'Commit-Queue': vote}],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001502 ]
tandriid9e5ce52016-07-13 02:32:59 -07001503
1504 def test_cmd_set_commit_gerrit_clear(self):
1505 self._cmd_set_commit_gerrit_common(0)
1506 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1507
1508 def test_cmd_set_commit_gerrit_dry(self):
1509 self._cmd_set_commit_gerrit_common(1)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001510 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1511
tandriid9e5ce52016-07-13 02:32:59 -07001512 def test_cmd_set_commit_gerrit(self):
1513 self._cmd_set_commit_gerrit_common(2)
1514 self.assertEqual(0, git_cl.main(['set-commit']))
1515
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001516 def test_description_display(self):
1517 out = StringIO.StringIO()
1518 self.mock(git_cl.sys, 'stdout', out)
1519
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001520 self.mock(git_cl, 'Changelist', ChangelistMock)
1521 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001522
1523 self.assertEqual(0, git_cl.main(['description', '-d']))
1524 self.assertEqual('foo\n', out.getvalue())
1525
1526 def test_description_rietveld(self):
1527 out = StringIO.StringIO()
1528 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001529 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001530
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001531 self.assertEqual(0, git_cl.main([
1532 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1533 self.assertEqual('foobar\n', out.getvalue())
1534
1535 def test_description_gerrit(self):
1536 out = StringIO.StringIO()
1537 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07001538 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001539
1540 self.assertEqual(0, git_cl.main([
1541 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1542 self.assertEqual('foobar\n', out.getvalue())
1543
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001544 def test_description_set_raw(self):
1545 out = StringIO.StringIO()
1546 self.mock(git_cl.sys, 'stdout', out)
1547
1548 self.mock(git_cl, 'Changelist', ChangelistMock)
1549 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1550
1551 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1552 self.assertEqual('hihi', ChangelistMock.desc)
1553
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001554 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001555 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001556
1557 def RunEditor(desc, _, **kwargs):
1558 self.assertEquals(
1559 '# Enter a description of the change.\n'
1560 '# This will be displayed on the codereview site.\n'
1561 '# The first line will also be used as the subject of the review.\n'
1562 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001563 '--------------------\n'
1564 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001565 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001566 # Simulate user changing something.
1567 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001568
1569 def UpdateDescriptionRemote(_, desc):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001570 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001571
1572 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1573 self.mock(git_cl.Changelist, 'GetDescription',
1574 lambda *args: current_desc)
1575 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1576 UpdateDescriptionRemote)
1577 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1578
1579 self.calls = [
1580 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1581 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
1582 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1583 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
1584 ((['git', 'config', 'core.editor'],), 'vi'),
1585 ]
1586 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1587
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001588 def test_description_set_stdin(self):
1589 out = StringIO.StringIO()
1590 self.mock(git_cl.sys, 'stdout', out)
1591
1592 self.mock(git_cl, 'Changelist', ChangelistMock)
1593 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1594
1595 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1596 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1597
kmarshall3bff56b2016-06-06 18:31:47 -07001598 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001599 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1600
kmarshall3bff56b2016-06-06 18:31:47 -07001601 self.calls = \
1602 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1603 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1604 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1605 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1606 ((['git', 'config', 'rietveld.server'],), ''),
1607 ((['git', 'config', 'rietveld.server'],), ''),
1608 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1609 ((['git', 'config', 'rietveld.server'],), ''),
1610 ((['git', 'config', 'rietveld.server'],), ''),
1611 ((['git', 'config', 'branch.bar.rietveldissue'],), ''),
1612 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1613 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1614 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1615 ((['git', 'branch', '-D', 'foo'],), '')]
1616
1617 class MockChangelist():
1618 def __init__(self, branch, issue):
1619 self.branch = branch
1620 self.issue = issue
1621 def GetBranch(self):
1622 return self.branch
1623 def GetIssue(self):
1624 return self.issue
1625
1626 self.mock(git_cl, 'get_cl_statuses',
1627 lambda branches, fine_grained, max_processes:
1628 [(MockChangelist('master', 1), 'open'),
1629 (MockChangelist('foo', 456), 'closed'),
1630 (MockChangelist('bar', 789), 'open')])
1631
1632 self.assertEqual(0, git_cl.main(['archive', '-f']))
1633
1634 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001635 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001636 self.calls = \
1637 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1638 'refs/heads/master'),
1639 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1640 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1641 ((['git', 'config', 'rietveld.server'],), ''),
1642 ((['git', 'config', 'rietveld.server'],), ''),
1643 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1644
1645 class MockChangelist():
1646 def __init__(self, branch, issue):
1647 self.branch = branch
1648 self.issue = issue
1649 def GetBranch(self):
1650 return self.branch
1651 def GetIssue(self):
1652 return self.issue
1653
1654 self.mock(git_cl, 'get_cl_statuses',
1655 lambda branches, fine_grained, max_processes:
1656 [(MockChangelist('master', 1), 'closed')])
1657
1658 self.assertEqual(1, git_cl.main(['archive', '-f']))
1659
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001660 def test_cmd_issue_erase_existing(self):
1661 out = StringIO.StringIO()
1662 self.mock(git_cl.sys, 'stdout', out)
1663 self.calls = [
1664 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1665 ((['git', 'config', 'branch.feature.rietveldissue'],), ''),
1666 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
1667 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1668 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
1669 # Let this command raise exception (retcode=1) - it should be ignored.
1670 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
1671 '', subprocess2.CalledProcessError(1, '', '', '', '')),
1672 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1673 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1674 ''),
1675 ]
1676 self.assertEqual(0, git_cl.main(['issue', '0']))
1677
tandrii9de9ec62016-07-13 03:01:59 -07001678 def test_git_cl_try_default(self):
1679 self.mock(git_cl.Changelist, 'GetChange',
1680 lambda _, *a: (
1681 self._mocked_call(['GetChange']+list(a))))
1682 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
1683 lambda *_, **__: (
1684 self._mocked_call(['DoGetTryMasters'])))
1685 self.mock(git_cl.presubmit_support, 'DoGetTrySlaves',
1686 lambda *_, **__: (
1687 self._mocked_call(['DoGetTrySlaves'])))
1688 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
1689 lambda _, s: self._mocked_call(['SetCQState', s]))
1690 self.calls = [
1691 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1692 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1693 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1694 ((['git', 'config', 'rietveld.server'],),
1695 'https://codereview.chromium.org'),
1696 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
1697 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1698 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1699 ((['get_or_create_merge_base', 'feature', 'feature'],),
1700 'fake_ancestor_sha'),
1701 ((['GetChange', 'fake_ancestor_sha', None], ),
1702 git_cl.presubmit_support.GitChange(
1703 '', '', '', '', '', '', '', '')),
1704 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1705 ((['DoGetTryMasters'], ), None),
1706 ((['DoGetTrySlaves'], ), None),
1707 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
1708 ]
1709 out = StringIO.StringIO()
1710 self.mock(git_cl.sys, 'stdout', out)
1711 self.assertEqual(0, git_cl.main(['try']))
1712 self.assertEqual(
1713 out.getvalue(),
1714 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
1715
tandrii16e0b4e2016-06-07 10:34:28 -07001716 def _common_GerritCommitMsgHookCheck(self):
1717 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1718 self.mock(git_cl.os.path, 'abspath',
1719 lambda path: self._mocked_call(['abspath', path]))
1720 self.mock(git_cl.os.path, 'exists',
1721 lambda path: self._mocked_call(['exists', path]))
1722 self.mock(git_cl.gclient_utils, 'FileRead',
1723 lambda path: self._mocked_call(['FileRead', path]))
1724 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
1725 lambda path: self._mocked_call(['rm_file_or_tree', path]))
1726 self.calls = [
1727 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1728 ((['abspath', '../'],), '/abs/git_repo_root'),
1729 ]
1730 return git_cl.Changelist(codereview='gerrit', issue=123)
1731
1732 def test_GerritCommitMsgHookCheck_custom_hook(self):
1733 cl = self._common_GerritCommitMsgHookCheck()
1734 self.calls += [
1735 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1736 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1737 '#!/bin/sh\necho "custom hook"')
1738 ]
1739 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1740
1741 def test_GerritCommitMsgHookCheck_not_exists(self):
1742 cl = self._common_GerritCommitMsgHookCheck()
1743 self.calls += [
1744 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
1745 ]
1746 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1747
1748 def test_GerritCommitMsgHookCheck(self):
1749 cl = self._common_GerritCommitMsgHookCheck()
1750 self.calls += [
1751 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1752 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1753 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
1754 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
1755 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1756 ''),
1757 ]
1758 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1759
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001760
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001761if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001762 git_cl.logging.basicConfig(
1763 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001764 unittest.main()