blob: b0048a11d9cee39d22648e9d50a92e752cdc4e6f [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')
148 test('http://codereview.chromium.org/download/issue123_4.diff',
149 123, 4, 'codereview.chromium.org',
150 patch_url='https://codereview.chromium.org/download/issue123_4.diff')
151 # This looks like bad Gerrit, but is actually valid Rietveld.
152 test('https://chrome-review.source.com/123/4/',
153 123, None, 'chrome-review.source.com')
154
155 test('https://codereview.chromium.org/deadbeaf', fail=True)
156 test('https://codereview.chromium.org/api/123', fail=True)
157 test('bad://codereview.chromium.org/123', fail=True)
158 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
159
160 def test_ParseIssueURL_gerrit(self):
161 def test(url, issue=None, patchset=None, hostname=None, fail=None):
162 self._test_ParseIssueUrl(
163 git_cl._GerritChangelistImpl.ParseIssueURL,
164 url, issue, patchset, hostname, fail)
165
166 test('http://chrome-review.source.com/c/123',
167 123, None, 'chrome-review.source.com')
168 test('https://chrome-review.source.com/c/123/',
169 123, None, 'chrome-review.source.com')
170 test('https://chrome-review.source.com/c/123/4',
171 123, 4, '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/123',
177 123, None, 'chrome-review.source.com')
178 test('https://chrome-review.source.com/123/4',
179 123, 4, 'chrome-review.source.com')
180
181 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
182 test('https://chrome-review.source.com/c/abc/', fail=True)
183 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
184
185 def test_ParseIssueNumberArgument(self):
186 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
187 result = git_cl.ParseIssueNumberArgument(arg)
188 self.assertIsNotNone(result)
189 if fail:
190 self.assertFalse(result.valid)
191 else:
192 self.assertEqual(result.issue, issue)
193 self.assertEqual(result.patchset, patchset)
194 self.assertEqual(result.hostname, hostname)
195
196 test('123', 123)
197 test('', fail=True)
198 test('abc', fail=True)
199 test('123/1', fail=True)
200 test('123a', fail=True)
201 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
202 # Rietveld.
203 test('https://codereview.source.com/123',
204 123, None, 'codereview.source.com')
205 test('https://codereview.source.com/www123', fail=True)
206 # Gerrrit.
207 test('https://chrome-review.source.com/c/123/4',
208 123, 4, 'chrome-review.source.com')
209 test('https://chrome-review.source.com/bad/123/4', fail=True)
210
211
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000212class TestGitCl(TestCase):
213 def setUp(self):
214 super(TestGitCl, self).setUp()
215 self.calls = []
216 self._calls_done = 0
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000217 self.mock(subprocess2, 'call', self._mocked_call)
218 self.mock(subprocess2, 'check_call', self._mocked_call)
219 self.mock(subprocess2, 'check_output', self._mocked_call)
220 self.mock(subprocess2, 'communicate', self._mocked_call)
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000221 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000222 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000223 self.mock(git_common, 'get_or_create_merge_base',
224 lambda *a: (
225 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000226 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000227 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000228 self.mock(git_cl, 'ask_for_data', self._mocked_call)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000229 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000230 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000231 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000232 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000233 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000234 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000235 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
236 classmethod(lambda _: False))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000237 # It's important to reset settings to not have inter-tests interference.
238 git_cl.settings = None
239
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000240
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000241 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000242 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000243 # Note: has_failed returns True if at least 1 test ran so far, current
244 # included, has failed. That means current test may have actually ran
245 # fine, and the check for no leftover calls would be skipped.
wychen@chromium.org445c8962015-04-28 23:30:05 +0000246 if not self.has_failed():
247 self.assertEquals([], self.calls)
248 finally:
249 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000250
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000251 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000252 self.assertTrue(
253 self.calls,
254 '@%d Expected: <Missing> Actual: %r' % (self._calls_done, args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000255 top = self.calls.pop(0)
256 if len(top) > 2 and top[2]:
257 raise top[2]
258 expected_args, result = top
259
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000260 # Also logs otherwise it could get caught in a try/finally and be hard to
261 # diagnose.
262 if expected_args != args:
263 msg = '@%d Expected: %r Actual: %r' % (
264 self._calls_done, expected_args, args)
265 git_cl.logging.error(msg)
266 self.fail(msg)
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000267 self._calls_done += 1
268 return result
269
maruel@chromium.orga3353652011-11-30 14:26:57 +0000270 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000271 def _is_gerrit_calls(cls, gerrit=False):
272 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
273 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
274
275 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000276 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000277 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000278 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000279
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000280 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000281 def _upload_no_rev_calls(cls, similarity, find_copies):
282 return (cls._git_base_calls(similarity, find_copies) +
283 cls._git_upload_no_rev_calls())
284
285 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000286 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000287 if similarity is None:
288 similarity = '50'
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000289 similarity_call = ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000290 'branch.master.git-cl-similarity'],), '')
291 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000292 similarity_call = ((['git', 'config', '--int',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000293 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000294
295 if find_copies is None:
296 find_copies = True
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000297 find_copies_call = ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000298 'branch.master.git-find-copies'],), '')
299 else:
300 val = str(int(find_copies))
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000301 find_copies_call = ((['git', 'config', '--int',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000302 'branch.master.git-find-copies', val],), '')
303
304 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000305 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000306 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000307 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000308 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000309 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000310 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000311
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000312 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000313 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000314 similarity_call,
315 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
316 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000317 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000318 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000319 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
320 ((['git', 'config', 'branch.master.gerritissue'],), ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000321 ((['git', 'config', 'rietveld.server'],),
322 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000323 ((['git', 'config', 'branch.master.merge'],), 'master'),
324 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000325 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000326 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000327 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000328 ((['git', 'rev-parse', '--show-cdup'],), ''),
329 ((['git', 'rev-parse', 'HEAD'],), '12345'),
330 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000331 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000332 'M\t.gitignore\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000333 ((['git', 'config', 'branch.master.rietveldpatchset'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000334 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000335 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000336 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000337 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000338 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000339 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000340 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000341 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000342 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000343 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000344 ]
345
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000346 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000347 def _git_upload_no_rev_calls(cls):
348 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000349 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000350 ]
351
352 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000353 def _git_upload_calls(cls, private):
354 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000355 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000356 private_call = []
357 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000358 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000359 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000360 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000361
maruel@chromium.orga3353652011-11-30 14:26:57 +0000362 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000363 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000364 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000365 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000366 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000367 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000368 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
369 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000370 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000371 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000372 ((['git', 'config', 'rietveld.project'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000373 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000374 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000375 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000376 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000377 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000378 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000379 ] + cls._git_post_upload_calls()
380
381 @classmethod
382 def _git_post_upload_calls(cls):
383 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000384 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
385 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
386 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000387 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000388 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000389 ]
390
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000391 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000392 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000393 fake_ancestor = 'fake_ancestor'
394 fake_cl = 'fake_cl_for_patch'
395 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000396 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000397 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000398 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000399 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000400 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000401 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000402 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000403 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000404 'config', 'gitcl.remotebranch'],), (('', None), 1)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000405 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000406 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000407 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000408 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000409 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000410 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000411 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000412 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000413 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000414 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000415 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000416
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000417 @classmethod
418 def _dcommit_calls_1(cls):
419 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000420 ((['git', 'config', 'rietveld.autoupdate'],),
421 ''),
422 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
423 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000424 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000425 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000426 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
427 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
428 None),
429 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000430 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
431 ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000432 'branch.working.git-cl-similarity'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000433 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
434 ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000435 'branch.working.git-find-copies'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000436 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
437 ((['git',
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000438 'config', 'branch.working.rietveldissue'],), '12345'),
439 ((['git',
440 'config', 'rietveld.server'],), 'codereview.example.com'),
441 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000442 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000443 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000444 ((['git', 'config', 'branch.working.merge'],),
445 'refs/heads/master'),
446 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000447 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000448 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000449 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000450 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000451 'refs/remotes/origin/master'],),
452 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000453 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000454 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000455 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000456 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000457 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000458 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000459 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000460 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000461 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000462 ]
463
464 @classmethod
465 def _dcommit_calls_normal(cls):
466 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000467 ((['git', 'rev-parse', '--show-cdup'],), ''),
468 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000469 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000470 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000471 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000472 '.'],),
473 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000474 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000475 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000476 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000477 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000478 ((['git', 'config', 'user.email'],), 'author@example.com'),
479 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000480 ]
481
482 @classmethod
483 def _dcommit_calls_bypassed(cls):
484 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000485 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000486 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000487 ]
488
489 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000490 def _dcommit_calls_3(cls):
491 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000492 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000493 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000494 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000495 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000496 (' PRESUBMIT.py | 2 +-\n'
497 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000498 ((['git', 'show-ref', '--quiet', '--verify',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000499 'refs/heads/git-cl-commit'],),
500 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000501 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
502 ((['git', 'show-ref', '--quiet', '--verify',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000503 'refs/heads/git-cl-cherry-pick'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000504 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000505 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
506 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
507 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000508 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000509 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000510 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000511 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000512 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000513 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000514 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000515 ((['git', 'checkout', '-q', 'working'],), ''),
516 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000517 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000518
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000519 @staticmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000520 def _cmd_line(description, args, similarity, find_copies, private):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000521 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000522 return [
523 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000524 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000525 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000526 ] + args + [
527 '--cc', 'joe@example.com',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000528 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000529 '--git_similarity', similarity or '50'
530 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000531 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000532 ]
533
534 def _run_reviewer_test(
535 self,
536 upload_args,
537 expected_description,
538 returned_description,
539 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000540 reviewers,
541 private=False):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000542 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000543 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000544 try:
545 similarity = upload_args[upload_args.index('--similarity')+1]
546 except ValueError:
547 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000548
549 if '--find-copies' in upload_args:
550 find_copies = True
551 elif '--no-find-copies' in upload_args:
552 find_copies = False
553 else:
554 find_copies = None
555
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000556 private = '--private' in upload_args
557
558 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000559
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000560 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000561 self.assertEquals(
562 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000563 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000564 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000565 '#--------------------This line is 72 characters long'
566 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000567 expected_description,
568 desc)
569 return returned_description
570 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000571
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000572 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000573 cmd_line = self._cmd_line(final_description, reviewers, similarity,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000574 find_copies, private)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000575 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000576 return 1, 2
577 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000578
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000579 git_cl.main(['upload'] + upload_args)
580
581 def test_no_reviewer(self):
582 self._run_reviewer_test(
583 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000584 'desc\n\nBUG=',
585 '# Blah blah comment.\ndesc\n\nBUG=',
586 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000587 [])
588
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000589 def test_keep_similarity(self):
590 self._run_reviewer_test(
591 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000592 'desc\n\nBUG=',
593 '# Blah blah comment.\ndesc\n\nBUG=',
594 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000595 [])
596
iannucci@chromium.org79540052012-10-19 23:15:26 +0000597 def test_keep_find_copies(self):
598 self._run_reviewer_test(
599 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000600 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000601 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000602 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000603 [])
604
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000605 def test_private(self):
606 self._run_reviewer_test(
607 ['--private'],
608 'desc\n\nBUG=',
609 '# Blah blah comment.\ndesc\n\nBUG=\n',
610 'desc\n\nBUG=',
611 [])
612
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000613 def test_reviewers_cmd_line(self):
614 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000615 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000616 self._run_reviewer_test(
617 ['-r' 'foo@example.com'],
618 description,
619 '\n%s\n' % description,
620 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000621 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000622
623 def test_reviewer_tbr_overriden(self):
624 # Reviewer is overriden with TBR
625 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000626 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000627 self._run_reviewer_test(
628 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000629 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000630 description.strip('\n'),
631 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000632 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000633
634 def test_reviewer_multiple(self):
635 # Handles multiple R= or TBR= lines.
636 description = (
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000637 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000638 self._run_reviewer_test(
639 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000640 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000641 description,
642 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000643 ['--reviewers=another@example.com,reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000644
maruel@chromium.orga3353652011-11-30 14:26:57 +0000645 def test_reviewer_send_mail(self):
646 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000647 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000648 self._run_reviewer_test(
649 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000650 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000651 description.strip('\n'),
652 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000653 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000654
655 def test_reviewer_send_mail_no_rev(self):
656 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000657 stdout = StringIO.StringIO()
658 stderr = StringIO.StringIO()
maruel@chromium.orga3353652011-11-30 14:26:57 +0000659 try:
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000660 self.calls = self._upload_no_rev_calls(None, None)
661 def RunEditor(desc, _, **kwargs):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000662 return desc
663 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000664 self.mock(sys, 'stdout', stdout)
665 self.mock(sys, 'stderr', stderr)
maruel@chromium.orga3353652011-11-30 14:26:57 +0000666 git_cl.main(['upload', '--send-mail'])
667 self.fail()
668 except SystemExit:
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000669 self.assertEqual(
670 'Using 50% similarity for rename/copy detection. Override with '
671 '--similarity.\n',
672 stdout.getvalue())
673 self.assertEqual(
674 'Must specify reviewers to send email.\n', stderr.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000675
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000676 def test_dcommit(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000677 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000678 self.calls = (
679 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000680 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000681 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000682 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000683 git_cl.main(['dcommit'])
684
685 def test_dcommit_bypass_hooks(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000686 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000687 self.calls = (
688 self._dcommit_calls_1() +
689 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000690 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000691 git_cl.main(['dcommit', '--bypass-hooks'])
692
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000693
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000694 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000695 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000696 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000697 if skip_auth_check:
698 return [((cmd, ), 'true')]
699
700 calls = [((cmd, ), '', subprocess2.CalledProcessError(1, '', '', '', ''))]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000701 if issue:
702 calls.extend([
703 ((['git', 'config', 'branch.master.gerritserver'],), ''),
704 ])
705 calls.extend([
706 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
707 ((['git', 'config', 'branch.master.remote'],), 'origin'),
708 ((['git', 'config', 'remote.origin.url'],),
709 'https://chromium.googlesource.com/my/repo'),
710 ((['git', 'config', 'remote.origin.url'],),
711 'https://chromium.googlesource.com/my/repo'),
712 ])
713 return calls
714
715 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000716 def _gerrit_base_calls(cls, issue=None):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000717 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000718 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
719 ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000720 'branch.master.git-cl-similarity'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000721 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
722 ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000723 'branch.master.git-find-copies'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000724 ] + cls._is_gerrit_calls(True) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000725 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000726 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000727 ((['git', 'config', 'branch.master.gerritissue'],),
728 '' if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000729 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000730 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000731 ((['get_or_create_merge_base', 'master',
732 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000733 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000734 # Calls to verify branch point is ancestor
735 ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
736 cls._git_sanity_checks('fake_ancestor_sha', 'master',
737 get_remote_branch=False)) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000738 ((['git', 'rev-parse', '--show-cdup'],), ''),
739 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000740
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000741 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000742 'diff', '--name-status', '--no-renames', '-r',
743 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000744 'M\t.gitignore\n'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000745 ((['git', 'config', 'branch.master.gerritpatchset'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000746 ] + ([] if issue else [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000747 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000748 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000749 'foo'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000750 ]) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000751 ((['git', 'config', 'user.email'],), 'me@example.com'),
752 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000753 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000754 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000755 '+dat'),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000756 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000757
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000758 @classmethod
759 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000760 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000761 ref_suffix='', notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000762 post_amend_description=None, issue=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000763 if post_amend_description is None:
764 post_amend_description = description
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000765
ukai@chromium.orge8077812012-02-03 03:41:46 +0000766 calls = [
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000767 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000768 ]
769 # If issue is given, then description is fetched from Gerrit instead.
770 if issue is None:
771 if squash:
772 calls += [
773 ((['git', 'show', '--format=%B', '-s',
774 'refs/heads/git_cl_uploads/master'],), '')]
775 calls += [
776 ((['git', 'log', '--pretty=format:%s\n\n%b',
777 'fake_ancestor_sha..HEAD'],),
778 description)]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000779 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000780 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000781 # DownloadGerritHook(False)
782 ((False, ),
783 ''),
784 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000786 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000787 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000789 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000791 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000792 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000793 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000794 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000795 if not issue:
796 # Prompting to edit description on first upload.
797 calls += [
798 ((['git', 'config', 'core.editor'],), ''),
799 ((['RunEditor'],), description),
800 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000801 ref_to_push = 'abcdef0123456789'
802 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000803 ((['git', 'config', 'branch.master.merge'],),
804 'refs/heads/master'),
805 ((['git', 'config', 'branch.master.remote'],),
806 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000807 ((['get_or_create_merge_base', 'master',
808 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000809 'origin/master'),
810 ((['git', 'rev-parse', 'HEAD:'],),
811 '0123456789abcdef'),
812 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000813 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000814 ref_to_push),
815 ]
816 else:
817 ref_to_push = 'HEAD'
818
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000819 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000820 ((['git', 'rev-list',
821 expected_upstream_ref + '..' + ref_to_push],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git', 'config', 'rietveld.cc'],), '')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000823 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000824
825 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
826 if ref_suffix:
827 ref_suffix += ',' + notify_suffix
828 else:
829 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +0000830
831 # Add cc from watch list.
832 ref_suffix += ',cc=joe@example.com'
833
ukai@chromium.orge8077812012-02-03 03:41:46 +0000834 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000835 ref_suffix += ',' + ','.join('r=%s' % email
836 for email in sorted(reviewers))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000837 calls += [
tandrii@chromium.org8acd8332016-04-13 12:56:03 +0000838 ((['git', 'push', 'origin',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000839 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000840 ('remote:\n'
841 'remote: Processing changes: (\)\n'
842 'remote: Processing changes: (|)\n'
843 'remote: Processing changes: (/)\n'
844 'remote: Processing changes: (-)\n'
845 'remote: Processing changes: new: 1 (/)\n'
846 'remote: Processing changes: new: 1, done\n'
847 'remote:\n'
848 'remote: New Changes:\n'
849 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
850 'remote:\n'
851 'To https://chromium.googlesource.com/yyy/zzz\n'
852 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000853 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000854 if squash:
855 calls += [
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000856 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000857 ((['git', 'config', 'branch.master.gerritserver',
858 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000859 ((['git', 'config', 'branch.master.gerritsquashhash',
860 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000861 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000862 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000863 return calls
864
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000865 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000866 self,
867 upload_args,
868 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000869 reviewers=None,
luqui@chromium.org609f3952015-05-04 22:47:04 +0000870 squash=False,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000871 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000872 ref_suffix='',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000873 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000874 post_amend_description=None,
875 issue=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000876 """Generic gerrit upload test framework."""
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000877 reviewers = reviewers or []
tandrii@chromium.org28253532016-04-14 13:46:56 +0000878 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -0700879 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000880 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -0700881 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
882 lambda _, offer_removal: None)
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000883 self.calls = self._gerrit_base_calls(issue=issue)
luqui@chromium.org609f3952015-05-04 22:47:04 +0000884 self.calls += self._gerrit_upload_calls(
885 description, reviewers, squash,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000886 expected_upstream_ref=expected_upstream_ref,
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000887 ref_suffix=ref_suffix, notify=notify,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000888 post_amend_description=post_amend_description,
889 issue=issue)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000890 # Uncomment when debugging.
891 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000892 git_cl.main(['upload'] + upload_args)
893
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000894 def test_gerrit_upload_without_change_id(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000895 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000896 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000897 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +0000898 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000899 [],
900 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000901
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000902 def test_gerrit_no_reviewer(self):
903 self._run_gerrit_upload_test(
904 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000905 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000906 [])
907
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +0000908 def test_gerrit_patch_title(self):
909 self._run_gerrit_upload_test(
910 ['-t', 'Don\'t put under_scores as they become spaces'],
911 'desc\n\nBUG=\n\nChange-Id: I123456789',
912 ref_suffix='%m=Don\'t_put_under_scores_as_they_become_spaces')
913
ukai@chromium.orge8077812012-02-03 03:41:46 +0000914 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000915 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000916 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000917 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000918 ['foo@example.com'],
919 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +0000920
921 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000922 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000923 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000924 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
925 'Change-Id: 123456789\n',
ukai@chromium.orge8077812012-02-03 03:41:46 +0000926 ['reviewer@example.com', 'another@example.com'])
927
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000928 def test_gerrit_upload_squash_first(self):
929 # Mock Gerrit CL description to indicate the first upload.
930 self.mock(git_cl.Changelist, 'GetDescription',
931 lambda *_: None)
932 self.mock(git_cl.gclient_utils, 'RunEditor',
933 lambda *_, **__: self._mocked_call(['RunEditor']))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000934 self._run_gerrit_upload_test(
935 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000936 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000937 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +0000938 squash=True,
939 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000940
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000941 def test_gerrit_upload_squash_reupload(self):
942 description = 'desc\nBUG=\n\nChange-Id: 123456789'
943 # Mock Gerrit CL description to indicate re-upload.
944 self.mock(git_cl.Changelist, 'GetDescription',
945 lambda *args: description)
946 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
947 lambda *args: 1)
948 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
949 lambda *args: {'change_id': '123456789'})
950 self._run_gerrit_upload_test(
951 ['--squash'],
952 description,
953 [],
954 squash=True,
955 expected_upstream_ref='origin/master',
956 issue=123456)
957
rmistry@google.com2dd99862015-06-22 12:22:18 +0000958 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +0000959 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +0000960 def mock_run_git(*args, **_kwargs):
961 if args[0] == ['for-each-ref',
962 '--format=%(refname:short) %(upstream:short)',
963 'refs/heads']:
964 # Create a local branch dependency tree that looks like this:
965 # test1 -> test2 -> test3 -> test4 -> test5
966 # -> test3.1
967 # test6 -> test0
968 branch_deps = [
969 'test2 test1', # test1 -> test2
970 'test3 test2', # test2 -> test3
971 'test3.1 test2', # test2 -> test3.1
972 'test4 test3', # test3 -> test4
973 'test5 test4', # test4 -> test5
974 'test6 test0', # test0 -> test6
975 'test7', # test7
976 ]
977 return '\n'.join(branch_deps)
978 self.mock(git_cl, 'RunGit', mock_run_git)
979
980 class RecordCalls:
981 times_called = 0
982 record_calls = RecordCalls()
983 def mock_CMDupload(*args, **_kwargs):
984 record_calls.times_called += 1
985 return 0
986 self.mock(git_cl, 'CMDupload', mock_CMDupload)
987
988 self.calls = [
989 (('[Press enter to continue or ctrl-C to quit]',), ''),
990 ]
991
992 class MockChangelist():
993 def __init__(self):
994 pass
995 def GetBranch(self):
996 return 'test1'
997 def GetIssue(self):
998 return '123'
999 def GetPatchset(self):
1000 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001001 def IsGerrit(self):
1002 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001003
1004 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1005 # CMDupload should have been called 5 times because of 5 dependent branches.
1006 self.assertEquals(5, record_calls.times_called)
1007 self.assertEquals(0, ret)
1008
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001009 def test_gerrit_change_id(self):
1010 self.calls = [
1011 ((['git', 'write-tree'], ),
1012 'hashtree'),
1013 ((['git', 'rev-parse', 'HEAD~0'], ),
1014 'branch-parent'),
1015 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1016 'A B <a@b.org> 1456848326 +0100'),
1017 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1018 'C D <c@d.org> 1456858326 +0100'),
1019 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1020 'hashchange'),
1021 ]
1022 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1023 self.assertEqual(change_id, 'Ihashchange')
1024
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001025 def test_desecription_append_footer(self):
1026 for init_desc, footer_line, expected_desc in [
1027 # Use unique desc first lines for easy test failure identification.
1028 ('foo', 'R=one', 'foo\n\nR=one'),
1029 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1030 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1031 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1032 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1033 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1034 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1035 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1036 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1037 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1038 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1039 ]:
1040 desc = git_cl.ChangeDescription(init_desc)
1041 desc.append_footer(footer_line)
1042 self.assertEqual(desc.description, expected_desc)
1043
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001044 def test_update_reviewers(self):
1045 data = [
1046 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001047 ('foo\nR=xx', [], 'foo\nR=xx'),
1048 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001049 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001050 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1051 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1052 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001053 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001054 ('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 +00001055 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001056 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1057 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1058 # Same as the line before, but full of whitespaces.
1059 (
1060 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1061 'foo\nBar\n\nR=c@c\n BUG =',
1062 ),
1063 # Whitespaces aren't interpreted as new lines.
1064 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001065 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001066 expected = [i[2] for i in data]
1067 actual = []
1068 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001069 obj = git_cl.ChangeDescription(orig)
1070 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001071 actual.append(obj.description)
1072 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001073
wittman@chromium.org455dc922015-01-26 20:15:50 +00001074 def test_get_target_ref(self):
1075 # Check remote or remote branch not present.
1076 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1077 self.assertEqual(None, git_cl.GetTargetRef(None,
1078 'refs/remotes/origin/master',
1079 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001080
wittman@chromium.org455dc922015-01-26 20:15:50 +00001081 # Check default target refs for branches.
1082 self.assertEqual('refs/heads/master',
1083 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1084 None, None))
1085 self.assertEqual('refs/heads/master',
1086 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1087 None, None))
1088 self.assertEqual('refs/heads/master',
1089 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1090 None, None))
1091 self.assertEqual('refs/branch-heads/123',
1092 git_cl.GetTargetRef('origin',
1093 'refs/remotes/branch-heads/123',
1094 None, None))
1095 self.assertEqual('refs/diff/test',
1096 git_cl.GetTargetRef('origin',
1097 'refs/remotes/origin/refs/diff/test',
1098 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001099 self.assertEqual('refs/heads/chrome/m42',
1100 git_cl.GetTargetRef('origin',
1101 'refs/remotes/origin/chrome/m42',
1102 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001103
1104 # Check target refs for user-specified target branch.
1105 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1106 'refs/remotes/branch-heads/123'):
1107 self.assertEqual('refs/branch-heads/123',
1108 git_cl.GetTargetRef('origin',
1109 'refs/remotes/origin/master',
1110 branch, None))
1111 for branch in ('origin/master', 'remotes/origin/master',
1112 'refs/remotes/origin/master'):
1113 self.assertEqual('refs/heads/master',
1114 git_cl.GetTargetRef('origin',
1115 'refs/remotes/branch-heads/123',
1116 branch, None))
1117 for branch in ('master', 'heads/master', 'refs/heads/master'):
1118 self.assertEqual('refs/heads/master',
1119 git_cl.GetTargetRef('origin',
1120 'refs/remotes/branch-heads/123',
1121 branch, None))
1122
1123 # Check target refs for pending prefix.
1124 self.assertEqual('prefix/heads/master',
1125 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1126 None, 'prefix/'))
1127
wychen@chromium.orga872e752015-04-28 23:42:18 +00001128 def test_patch_when_dirty(self):
1129 # Patch when local tree is dirty
1130 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1131 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1132
1133 def test_diff_when_dirty(self):
1134 # Do 'git cl diff' when local tree is dirty
1135 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1136 self.assertNotEqual(git_cl.main(['diff']), 0)
1137
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001138 def _patch_common(self, is_gerrit=False, force_codereview=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001139 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001140 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1141 lambda x: '60001')
1142 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
1143 lambda *args: None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001144 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1145 lambda *args: {
1146 'current_revision': '7777777777',
1147 'revisions': {
1148 '1111111111': {
1149 '_number': 1,
1150 'fetch': {'http': {
1151 'url': 'https://chromium.googlesource.com/my/repo',
1152 'ref': 'refs/changes/56/123456/1',
1153 }},
1154 },
1155 '7777777777': {
1156 '_number': 7,
1157 'fetch': {'http': {
1158 'url': 'https://chromium.googlesource.com/my/repo',
1159 'ref': 'refs/changes/56/123456/7',
1160 }},
1161 },
1162 },
1163 })
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001164 self.mock(git_cl.Changelist, 'GetDescription',
1165 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001166 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1167
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001168 self.calls = self.calls or []
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001169 if not force_codereview:
1170 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001171 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001172 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1173 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
1174 ((['git', 'config', 'branch.master.gerritissue'],), ''),
1175 ((['git', 'config', 'rietveld.autoupdate'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001176 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001177
1178 if is_gerrit:
1179 if not force_codereview:
1180 self.calls += [
1181 ((['git', 'config', 'gerrit.host'],), 'true'),
1182 ]
1183 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001184 self.calls += [
1185 ((['git', 'config', 'gerrit.host'],), ''),
1186 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1187 ((['git', 'rev-parse', '--show-cdup'],), ''),
1188 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
1189 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001190
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001191 def _common_patch_successful(self):
wychen@chromium.orga872e752015-04-28 23:42:18 +00001192 self._patch_common()
1193 self.calls += [
1194 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
1195 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001196 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001197 'patch from issue 123456 at patchset 60001 ' +
1198 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001199 ((['git', 'config', 'branch.master.rietveldissue', '123456'],), ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001200 ((['git', 'config', 'branch.master.rietveldserver'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001201 ((['git', 'config', 'branch.master.rietveldserver',
1202 'https://codereview.example.com'],), ''),
1203 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001204 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001205
1206 def test_patch_successful(self):
1207 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001208 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1209
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001210 def test_patch_successful_new_branch(self):
1211 self.calls = [ ((['git', 'new-branch', 'master'],), ''), ]
1212 self._common_patch_successful()
1213 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1214
wychen@chromium.orga872e752015-04-28 23:42:18 +00001215 def test_patch_conflict(self):
1216 self._patch_common()
1217 self.calls += [
1218 ((['git', 'apply', '--index', '-p0', '--3way'],), '',
1219 subprocess2.CalledProcessError(1, '', '', '', '')),
1220 ]
1221 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001222
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001223 def test_gerrit_patch_successful(self):
1224 self._patch_common(is_gerrit=True)
1225 self.calls += [
1226 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1227 'refs/changes/56/123456/7'],), ''),
1228 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1229 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
1230 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1231 ((['git', 'config', 'branch.master.merge'],), 'master'),
1232 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1233 ((['git', 'config', 'remote.origin.url'],),
1234 'https://chromium.googlesource.com/my/repo'),
1235 ((['git', 'config', 'branch.master.gerritserver',
1236 'https://chromium-review.googlesource.com'],), ''),
1237 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1238 ]
1239 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1240
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001241 def test_patch_force_codereview(self):
1242 self._patch_common(is_gerrit=True, force_codereview=True)
1243 self.calls += [
1244 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1245 'refs/changes/56/123456/7'],), ''),
1246 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1247 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1248 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
1249 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1250 ((['git', 'config', 'branch.master.merge'],), 'master'),
1251 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1252 ((['git', 'config', 'remote.origin.url'],),
1253 'https://chromium.googlesource.com/my/repo'),
1254 ((['git', 'config', 'branch.master.gerritserver',
1255 'https://chromium-review.googlesource.com'],), ''),
1256 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1257 ]
1258 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1259
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001260 def test_gerrit_patch_url_successful(self):
1261 self._patch_common(is_gerrit=True)
1262 self.calls += [
1263 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1264 'refs/changes/56/123456/1'],), ''),
1265 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1266 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
1267 ((['git', 'config', 'branch.master.gerritserver',
1268 'https://chromium-review.googlesource.com'],), ''),
1269 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1270 ]
1271 self.assertEqual(git_cl.main(
1272 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1273
1274 def test_gerrit_patch_conflict(self):
1275 self._patch_common(is_gerrit=True)
1276 self.mock(git_cl, 'DieWithError',
1277 lambda msg: self._mocked_call(['DieWithError', msg]))
1278 class SystemExitMock(Exception):
1279 pass
1280 self.calls += [
1281 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1282 'refs/changes/56/123456/1'],), ''),
1283 ((['git', 'cherry-pick', 'FETCH_HEAD'],),
1284 '', subprocess2.CalledProcessError(1, '', '', '', '')),
1285 ((['DieWithError', 'git cherry-pick FETCH_HEAD" failed.\n'],),
1286 '', SystemExitMock()),
1287 ]
1288 with self.assertRaises(SystemExitMock):
1289 git_cl.main(['patch',
1290 'https://chromium-review.googlesource.com/#/c/123456/1'])
1291
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001292 def _checkout_calls(self):
1293 return [
1294 ((['git', 'config', '--local', '--get-regexp',
1295 'branch\\..*\\.rietveldissue'], ),
1296 ('branch.retrying.rietveldissue 1111111111\n'
1297 'branch.some-fix.rietveldissue 2222222222\n')),
1298 ((['git', 'config', '--local', '--get-regexp',
1299 'branch\\..*\\.gerritissue'], ),
1300 ('branch.ger-branch.gerritissue 123456\n'
1301 'branch.gbranch654.gerritissue 654321\n')),
1302 ]
1303
1304 def test_checkout_gerrit(self):
1305 """Tests git cl checkout <issue>."""
1306 self.calls = self._checkout_calls()
1307 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1308 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1309
1310 def test_checkout_rietveld(self):
1311 """Tests git cl checkout <issue>."""
1312 self.calls = self._checkout_calls()
1313 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1314 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1315
1316 def test_checkout_not_found(self):
1317 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001318 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001319 self.calls = self._checkout_calls()
1320 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1321
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001322 def test_checkout_no_branch_issues(self):
1323 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001324 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001325 self.calls = [
1326 ((['git', 'config', '--local', '--get-regexp',
1327 'branch\\..*\\.rietveldissue'], ), '',
1328 subprocess2.CalledProcessError(1, '', '', '', '')),
1329 ((['git', 'config', '--local', '--get-regexp',
1330 'branch\\..*\\.gerritissue'], ), '',
1331 subprocess2.CalledProcessError(1, '', '', '', '')),
1332
1333 ]
1334 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1335
tandrii@chromium.org28253532016-04-14 13:46:56 +00001336 def _test_gerrit_ensure_authenticated_common(self, auth,
1337 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001338 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1339 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1340 self.mock(git_cl, 'DieWithError',
1341 lambda msg: self._mocked_call(['DieWithError', msg]))
1342 self.mock(git_cl, 'ask_for_data',
1343 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001344 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001345 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001346 cl.branch = 'master'
1347 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001348 cl.lookedup_issue = True
1349 return cl
1350
1351 def test_gerrit_ensure_authenticated_missing(self):
1352 cl = self._test_gerrit_ensure_authenticated_common(auth={
1353 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1354 })
1355 self.calls.append(
1356 ((['DieWithError',
1357 'Credentials for the following hosts are required:\n'
1358 ' chromium-review.googlesource.com\n'
1359 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1360 'You can (re)generate your credentails by visiting '
1361 'https://chromium-review.googlesource.com/new-password'],), ''),)
1362 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1363
1364 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001365 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001366 cl = self._test_gerrit_ensure_authenticated_common(auth={
1367 'chromium.googlesource.com': 'one',
1368 'chromium-review.googlesource.com': 'other',
1369 })
1370 self.calls.append(
1371 ((['ask_for_data', 'If you know what you are doing, '
1372 'press Enter to continue, Ctrl+C to abort.'],), ''))
1373 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1374
1375 def test_gerrit_ensure_authenticated_ok(self):
1376 cl = self._test_gerrit_ensure_authenticated_common(auth={
1377 'chromium.googlesource.com': 'same',
1378 'chromium-review.googlesource.com': 'same',
1379 })
1380 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1381
tandrii@chromium.org28253532016-04-14 13:46:56 +00001382 def test_gerrit_ensure_authenticated_skipped(self):
1383 cl = self._test_gerrit_ensure_authenticated_common(
1384 auth={}, skip_auth_check=True)
1385 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1386
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001387 def test_cmd_set_commit_rietveld(self):
1388 self.mock(git_cl._RietveldChangelistImpl, 'SetFlag',
1389 lambda _, f, v: self._mocked_call(['SetFlag', f, v]))
1390 self.calls = [
1391 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1392 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1393 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1394 ((['git', 'config', 'rietveld.server'],), ''),
1395 ((['git', 'config', 'rietveld.server'],), ''),
1396 ((['git', 'config', 'branch.feature.rietveldserver'],),
1397 'https://codereview.chromium.org'),
1398 ((['SetFlag', 'commit', '1'], ), ''),
1399 ]
1400 self.assertEqual(0, git_cl.main(['set-commit']))
1401
1402 def test_cmd_set_commit_gerrit(self):
1403 self.mock(git_cl.gerrit_util, 'SetReview',
1404 lambda h, i, labels: self._mocked_call(
1405 ['SetReview', h, i, labels]))
1406 self.calls = [
1407 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1408 ((['git', 'config', 'branch.feature.rietveldissue'],), ''),
1409 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
1410 ((['git', 'config', 'branch.feature.gerritserver'],),
1411 'https://chromium-review.googlesource.com'),
1412 ((['SetReview', 'chromium-review.googlesource.com', 123,
1413 {'Commit-Queue': 1}],), ''),
1414 ]
tandrii@chromium.org1a8ef442016-04-13 18:41:37 +00001415 # TODO(tandrii): consider testing just set-commit and set-commit --clear,
1416 # but without copy-pasting tons of expectations, as modifying them later is
1417 # super tedious.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001418 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1419
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001420 def test_description_display(self):
1421 out = StringIO.StringIO()
1422 self.mock(git_cl.sys, 'stdout', out)
1423
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001424 self.mock(git_cl, 'Changelist', ChangelistMock)
1425 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001426
1427 self.assertEqual(0, git_cl.main(['description', '-d']))
1428 self.assertEqual('foo\n', out.getvalue())
1429
1430 def test_description_rietveld(self):
1431 out = StringIO.StringIO()
1432 self.mock(git_cl.sys, 'stdout', out)
1433 self.mock(git_cl.Changelist, 'GetDescription',
1434 lambda *args: 'foobar')
1435
1436 self.calls = [
1437 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1438 ((['git', 'config', 'rietveld.server'],), ''),
1439 ((['git', 'config', 'rietveld.server'],), ''),
1440 ]
1441 self.assertEqual(0, git_cl.main([
1442 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1443 self.assertEqual('foobar\n', out.getvalue())
1444
1445 def test_description_gerrit(self):
1446 out = StringIO.StringIO()
1447 self.mock(git_cl.sys, 'stdout', out)
1448 self.mock(git_cl.Changelist, 'GetDescription',
1449 lambda *args: 'foobar')
1450
1451 self.assertEqual(0, git_cl.main([
1452 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1453 self.assertEqual('foobar\n', out.getvalue())
1454
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001455 def test_description_set_raw(self):
1456 out = StringIO.StringIO()
1457 self.mock(git_cl.sys, 'stdout', out)
1458
1459 self.mock(git_cl, 'Changelist', ChangelistMock)
1460 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1461
1462 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1463 self.assertEqual('hihi', ChangelistMock.desc)
1464
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001465 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001466 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001467
1468 def RunEditor(desc, _, **kwargs):
1469 self.assertEquals(
1470 '# Enter a description of the change.\n'
1471 '# This will be displayed on the codereview site.\n'
1472 '# The first line will also be used as the subject of the review.\n'
1473 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001474 '--------------------\n'
1475 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001476 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001477 # Simulate user changing something.
1478 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001479
1480 def UpdateDescriptionRemote(_, desc):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001481 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001482
1483 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1484 self.mock(git_cl.Changelist, 'GetDescription',
1485 lambda *args: current_desc)
1486 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1487 UpdateDescriptionRemote)
1488 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1489
1490 self.calls = [
1491 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1492 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
1493 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1494 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
1495 ((['git', 'config', 'core.editor'],), 'vi'),
1496 ]
1497 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1498
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001499 def test_description_set_stdin(self):
1500 out = StringIO.StringIO()
1501 self.mock(git_cl.sys, 'stdout', out)
1502
1503 self.mock(git_cl, 'Changelist', ChangelistMock)
1504 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1505
1506 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1507 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1508
kmarshall3bff56b2016-06-06 18:31:47 -07001509 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07001510 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1511
kmarshall3bff56b2016-06-06 18:31:47 -07001512 self.calls = \
1513 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1514 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
1515 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1516 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1517 ((['git', 'config', 'rietveld.server'],), ''),
1518 ((['git', 'config', 'rietveld.server'],), ''),
1519 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
1520 ((['git', 'config', 'rietveld.server'],), ''),
1521 ((['git', 'config', 'rietveld.server'],), ''),
1522 ((['git', 'config', 'branch.bar.rietveldissue'],), ''),
1523 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
1524 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1525 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
1526 ((['git', 'branch', '-D', 'foo'],), '')]
1527
1528 class MockChangelist():
1529 def __init__(self, branch, issue):
1530 self.branch = branch
1531 self.issue = issue
1532 def GetBranch(self):
1533 return self.branch
1534 def GetIssue(self):
1535 return self.issue
1536
1537 self.mock(git_cl, 'get_cl_statuses',
1538 lambda branches, fine_grained, max_processes:
1539 [(MockChangelist('master', 1), 'open'),
1540 (MockChangelist('foo', 456), 'closed'),
1541 (MockChangelist('bar', 789), 'open')])
1542
1543 self.assertEqual(0, git_cl.main(['archive', '-f']))
1544
1545 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07001546 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07001547 self.calls = \
1548 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
1549 'refs/heads/master'),
1550 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
1551 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1552 ((['git', 'config', 'rietveld.server'],), ''),
1553 ((['git', 'config', 'rietveld.server'],), ''),
1554 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
1555
1556 class MockChangelist():
1557 def __init__(self, branch, issue):
1558 self.branch = branch
1559 self.issue = issue
1560 def GetBranch(self):
1561 return self.branch
1562 def GetIssue(self):
1563 return self.issue
1564
1565 self.mock(git_cl, 'get_cl_statuses',
1566 lambda branches, fine_grained, max_processes:
1567 [(MockChangelist('master', 1), 'closed')])
1568
1569 self.assertEqual(1, git_cl.main(['archive', '-f']))
1570
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001571 def test_cmd_issue_erase_existing(self):
1572 out = StringIO.StringIO()
1573 self.mock(git_cl.sys, 'stdout', out)
1574 self.calls = [
1575 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1576 ((['git', 'config', 'branch.feature.rietveldissue'],), ''),
1577 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
1578 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
1579 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
1580 # Let this command raise exception (retcode=1) - it should be ignored.
1581 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
1582 '', subprocess2.CalledProcessError(1, '', '', '', '')),
1583 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1584 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1585 ''),
1586 ]
1587 self.assertEqual(0, git_cl.main(['issue', '0']))
1588
tandrii16e0b4e2016-06-07 10:34:28 -07001589 def _common_GerritCommitMsgHookCheck(self):
1590 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1591 self.mock(git_cl.os.path, 'abspath',
1592 lambda path: self._mocked_call(['abspath', path]))
1593 self.mock(git_cl.os.path, 'exists',
1594 lambda path: self._mocked_call(['exists', path]))
1595 self.mock(git_cl.gclient_utils, 'FileRead',
1596 lambda path: self._mocked_call(['FileRead', path]))
1597 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
1598 lambda path: self._mocked_call(['rm_file_or_tree', path]))
1599 self.calls = [
1600 ((['git', 'rev-parse', '--show-cdup'],), '../'),
1601 ((['abspath', '../'],), '/abs/git_repo_root'),
1602 ]
1603 return git_cl.Changelist(codereview='gerrit', issue=123)
1604
1605 def test_GerritCommitMsgHookCheck_custom_hook(self):
1606 cl = self._common_GerritCommitMsgHookCheck()
1607 self.calls += [
1608 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1609 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1610 '#!/bin/sh\necho "custom hook"')
1611 ]
1612 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1613
1614 def test_GerritCommitMsgHookCheck_not_exists(self):
1615 cl = self._common_GerritCommitMsgHookCheck()
1616 self.calls += [
1617 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
1618 ]
1619 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1620
1621 def test_GerritCommitMsgHookCheck(self):
1622 cl = self._common_GerritCommitMsgHookCheck()
1623 self.calls += [
1624 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
1625 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1626 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
1627 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
1628 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
1629 ''),
1630 ]
1631 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
1632
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001633
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001634if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001635 git_cl.logging.basicConfig(
1636 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001637 unittest.main()