blob: 0084001888f2c78f3ee00f501d0ef0f44bcb1fb8 [file] [log] [blame]
[email protected]ddd59412011-11-30 14:20:381#!/usr/bin/env python
[email protected]eb5edbc2012-01-16 17:03:282# Copyright (c) 2012 The Chromium Authors. All rights reserved.
[email protected]ddd59412011-11-30 14:20:383# 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
[email protected]a3353652011-11-30 14:26:579import StringIO
[email protected]78c4b982012-02-14 02:20:2610import stat
[email protected]ddd59412011-11-30 14:20:3811import sys
12import unittest
[email protected]f86c7d32016-04-01 19:27:3013import urlparse
[email protected]ddd59412011-11-30 14:20:3814
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
[email protected]9e849272014-04-04 00:31:5520import git_common
[email protected]57d86542016-03-04 16:11:3221import git_footers
[email protected]ddd59412011-11-30 14:20:3822import subprocess2
[email protected]ddd59412011-11-30 14:20:3823
[email protected]d6648e22016-04-29 19:22:1624class 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
[email protected]2e72bb12012-01-17 15:18:3537class 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
[email protected]78936cb2013-04-11 00:17:5248
[email protected]2e72bb12012-01-17 15:18:3549 @staticmethod
50 def get_description(issue):
51 return 'Issue: %d' % issue
52
[email protected]78936cb2013-04-11 00:17:5253 @staticmethod
54 def get_issue_properties(_issue, _messages):
55 return {
56 'reviewers': ['[email protected]', '[email protected]'],
57 'messages': [
58 {
59 'approval': True,
60 'sender': '[email protected]',
61 },
62 ],
63 }
64
[email protected]2e72bb12012-01-17 15:18:3565
66class WatchlistsMock(object):
67 def __init__(self, _):
68 pass
69 @staticmethod
70 def GetWatchersForPaths(_):
71 return ['[email protected]']
72
73
[email protected]78c4b982012-02-14 02:20:2674class 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" +
[email protected]11f46eb2016-02-02 19:26:5180 "GERRIT_HOST: True\n")
[email protected]78c4b982012-02-14 02:20:2681
82
[email protected]eed4df32015-04-10 21:30:2083class AuthenticatorMock(object):
84 def __init__(self, *_args):
85 pass
86 def has_cached_credentials(self):
87 return True
88
89
[email protected]fe30f182016-04-13 12:15:0490def 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
[email protected]f86c7d32016-04-01 19:27:30118class 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
[email protected]ddd59412011-11-30 14:20:38212class TestGitCl(TestCase):
213 def setUp(self):
214 super(TestGitCl, self).setUp()
215 self.calls = []
216 self._calls_done = 0
[email protected]2e72bb12012-01-17 15:18:35217 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)
[email protected]a342c922016-03-16 07:08:25221 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
[email protected]71437c02015-04-09 19:29:40222 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
[email protected]9e849272014-04-04 00:31:55223 self.mock(git_common, 'get_or_create_merge_base',
224 lambda *a: (
225 self._mocked_call(['get_or_create_merge_base']+list(a))))
[email protected]8ba38ff2015-06-11 21:41:25226 self.mock(git_cl, 'BranchExists', lambda _: True)
[email protected]ddd59412011-11-30 14:20:38227 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
[email protected]2e72bb12012-01-17 15:18:35228 self.mock(git_cl, 'ask_for_data', self._mocked_call)
[email protected]ddd59412011-11-30 14:20:38229 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
[email protected]ddd59412011-11-30 14:20:38230 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
[email protected]4bac4b52012-11-27 20:33:52231 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
[email protected]ddd59412011-11-30 14:20:38232 self.mock(git_cl.upload, 'RealMain', self.fail)
[email protected]ddd59412011-11-30 14:20:38233 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
[email protected]eed4df32015-04-10 21:30:20234 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
[email protected]fe30f182016-04-13 12:15:04235 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
236 classmethod(lambda _: False))
[email protected]ddd59412011-11-30 14:20:38237 # It's important to reset settings to not have inter-tests interference.
238 git_cl.settings = None
239
[email protected]f86c7d32016-04-01 19:27:30240
[email protected]ddd59412011-11-30 14:20:38241 def tearDown(self):
[email protected]445c8962015-04-28 23:30:05242 try:
[email protected]f86c7d32016-04-01 19:27:30243 # 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.
[email protected]445c8962015-04-28 23:30:05246 if not self.has_failed():
247 self.assertEquals([], self.calls)
248 finally:
249 super(TestGitCl, self).tearDown()
[email protected]ddd59412011-11-30 14:20:38250
[email protected]9e849272014-04-04 00:31:55251 def _mocked_call(self, *args, **_kwargs):
[email protected]2e72bb12012-01-17 15:18:35252 self.assertTrue(
253 self.calls,
254 '@%d Expected: <Missing> Actual: %r' % (self._calls_done, args))
[email protected]a872e752015-04-28 23:42:18255 top = self.calls.pop(0)
256 if len(top) > 2 and top[2]:
257 raise top[2]
258 expected_args, result = top
259
[email protected]e52678e2013-04-26 18:34:44260 # 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)
[email protected]2e72bb12012-01-17 15:18:35267 self._calls_done += 1
268 return result
269
[email protected]a3353652011-11-30 14:26:57270 @classmethod
[email protected]512d79c2016-03-31 12:55:28271 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
[email protected]c1737d02013-05-29 14:17:28276 def _upload_calls(cls, similarity, find_copies, private):
[email protected]79540052012-10-19 23:15:26277 return (cls._git_base_calls(similarity, find_copies) +
[email protected]c1737d02013-05-29 14:17:28278 cls._git_upload_calls(private))
[email protected]a3353652011-11-30 14:26:57279
[email protected]0f58fa82012-11-05 01:45:20280 @classmethod
[email protected]615a2622013-05-03 13:20:14281 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
[email protected]0f58fa82012-11-05 01:45:20286 def _git_base_calls(cls, similarity, find_copies):
[email protected]53937ba2012-10-02 18:20:43287 if similarity is None:
288 similarity = '50'
[email protected]82b91cd2013-07-09 06:33:41289 similarity_call = ((['git', 'config', '--int', '--get',
[email protected]53937ba2012-10-02 18:20:43290 'branch.master.git-cl-similarity'],), '')
291 else:
[email protected]82b91cd2013-07-09 06:33:41292 similarity_call = ((['git', 'config', '--int',
[email protected]53937ba2012-10-02 18:20:43293 'branch.master.git-cl-similarity', similarity],), '')
[email protected]79540052012-10-19 23:15:26294
295 if find_copies is None:
296 find_copies = True
[email protected]82b91cd2013-07-09 06:33:41297 find_copies_call = ((['git', 'config', '--int', '--get',
[email protected]79540052012-10-19 23:15:26298 'branch.master.git-find-copies'],), '')
299 else:
300 val = str(int(find_copies))
[email protected]82b91cd2013-07-09 06:33:41301 find_copies_call = ((['git', 'config', '--int',
[email protected]79540052012-10-19 23:15:26302 'branch.master.git-find-copies', val],), '')
303
304 if find_copies:
[email protected]82b91cd2013-07-09 06:33:41305 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
[email protected]79540052012-10-19 23:15:26306 '--find-copies-harder', '-l100000', '-C'+similarity,
[email protected]5e07e062013-02-28 23:55:44307 'fake_ancestor_sha', 'HEAD'],), '+dat')
[email protected]79540052012-10-19 23:15:26308 else:
[email protected]82b91cd2013-07-09 06:33:41309 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
[email protected]5e07e062013-02-28 23:55:44310 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
[email protected]79540052012-10-19 23:15:26311
[email protected]ddd59412011-11-30 14:20:38312 return [
[email protected]82b91cd2013-07-09 06:33:41313 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
[email protected]87985d22016-03-24 17:33:33314 similarity_call,
315 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
316 find_copies_call,
[email protected]512d79c2016-03-31 12:55:28317 ] + cls._is_gerrit_calls() + [
[email protected]87985d22016-03-24 17:33:33318 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
[email protected]aa5ced12016-03-29 09:41:14319 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
320 ((['git', 'config', 'branch.master.gerritissue'],), ''),
[email protected]aa5ced12016-03-29 09:41:14321 ((['git', 'config', 'rietveld.server'],),
322 'codereview.example.com'),
[email protected]82b91cd2013-07-09 06:33:41323 ((['git', 'config', 'branch.master.merge'],), 'master'),
324 ((['git', 'config', 'branch.master.remote'],), 'origin'),
[email protected]9e849272014-04-04 00:31:55325 ((['get_or_create_merge_base', 'master', 'master'],),
[email protected]f267b0e2013-05-02 09:11:43326 'fake_ancestor_sha'),
[email protected]512d79c2016-03-31 12:55:28327 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
[email protected]82b91cd2013-07-09 06:33:41328 ((['git', 'rev-parse', '--show-cdup'],), ''),
329 ((['git', 'rev-parse', 'HEAD'],), '12345'),
330 ((['git', 'diff', '--name-status', '--no-renames', '-r',
[email protected]f267b0e2013-05-02 09:11:43331 'fake_ancestor_sha...', '.'],),
[email protected]2e72bb12012-01-17 15:18:35332 'M\t.gitignore\n'),
[email protected]82b91cd2013-07-09 06:33:41333 ((['git', 'config', 'branch.master.rietveldpatchset'],),
[email protected]f267b0e2013-05-02 09:11:43334 ''),
[email protected]82b91cd2013-07-09 06:33:41335 ((['git', 'log', '--pretty=format:%s%n%n%b',
[email protected]f267b0e2013-05-02 09:11:43336 'fake_ancestor_sha...'],),
[email protected]0f58fa82012-11-05 01:45:20337 'foo'),
[email protected]82b91cd2013-07-09 06:33:41338 ((['git', 'config', 'user.email'],), '[email protected]'),
[email protected]79540052012-10-19 23:15:26339 stat_call,
[email protected]82b91cd2013-07-09 06:33:41340 ((['git', 'log', '--pretty=format:%s\n\n%b',
[email protected]f267b0e2013-05-02 09:11:43341 'fake_ancestor_sha..HEAD'],),
[email protected]0f58fa82012-11-05 01:45:20342 'desc\n'),
[email protected]90752582014-01-14 21:04:50343 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
[email protected]a3353652011-11-30 14:26:57344 ]
345
[email protected]0f58fa82012-11-05 01:45:20346 @classmethod
[email protected]615a2622013-05-03 13:20:14347 def _git_upload_no_rev_calls(cls):
348 return [
[email protected]82b91cd2013-07-09 06:33:41349 ((['git', 'config', 'core.editor'],), ''),
[email protected]615a2622013-05-03 13:20:14350 ]
351
352 @classmethod
[email protected]c1737d02013-05-29 14:17:28353 def _git_upload_calls(cls, private):
354 if private:
[email protected]99918ab2013-09-30 06:17:28355 cc_call = []
[email protected]c1737d02013-05-29 14:17:28356 private_call = []
357 else:
[email protected]99918ab2013-09-30 06:17:28358 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
[email protected]c1737d02013-05-29 14:17:28359 private_call = [
[email protected]82b91cd2013-07-09 06:33:41360 ((['git', 'config', 'rietveld.private'],), '')]
[email protected]c1737d02013-05-29 14:17:28361
[email protected]a3353652011-11-30 14:26:57362 return [
[email protected]82b91cd2013-07-09 06:33:41363 ((['git', 'config', 'core.editor'],), ''),
[email protected]99918ab2013-09-30 06:17:28364 ] + cc_call + private_call + [
[email protected]82b91cd2013-07-09 06:33:41365 ((['git', 'config', 'branch.master.base-url'],), ''),
[email protected]566a02a2014-08-22 01:34:13366 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
[email protected]82b91cd2013-07-09 06:33:41367 ((['git',
[email protected]05fb9112014-07-07 09:30:23368 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
369 (('', None), 0)),
[email protected]7a54e812014-02-11 19:57:22370 ((['git', 'rev-parse', '--show-cdup'],), ''),
[email protected]82b91cd2013-07-09 06:33:41371 ((['git', 'svn', 'info'],), ''),
[email protected]152cf832014-06-11 21:37:49372 ((['git', 'config', 'rietveld.project'],), ''),
[email protected]82b91cd2013-07-09 06:33:41373 ((['git',
[email protected]c1737d02013-05-29 14:17:28374 'config', 'branch.master.rietveldissue', '1'],), ''),
[email protected]82b91cd2013-07-09 06:33:41375 ((['git', 'config', 'branch.master.rietveldserver',
[email protected]c1737d02013-05-29 14:17:28376 'https://codereview.example.com'],), ''),
[email protected]82b91cd2013-07-09 06:33:41377 ((['git',
[email protected]c1737d02013-05-29 14:17:28378 'config', 'branch.master.rietveldpatchset', '2'],), ''),
[email protected]1e67bb72016-02-11 12:15:49379 ] + cls._git_post_upload_calls()
380
381 @classmethod
382 def _git_post_upload_calls(cls):
383 return [
[email protected]82b91cd2013-07-09 06:33:41384 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
385 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
386 ((['git',
[email protected]c1737d02013-05-29 14:17:28387 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
[email protected]5626a922015-02-26 14:03:30388 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
[email protected]ddd59412011-11-30 14:20:38389 ]
390
[email protected]0f58fa82012-11-05 01:45:20391 @staticmethod
[email protected]fe30f182016-04-13 12:15:04392 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
[email protected]0f58fa82012-11-05 01:45:20393 fake_ancestor = 'fake_ancestor'
394 fake_cl = 'fake_cl_for_patch'
395 return [
[email protected]82b91cd2013-07-09 06:33:41396 ((['git',
[email protected]f267b0e2013-05-02 09:11:43397 'rev-parse', '--verify', diff_base],), fake_ancestor),
[email protected]82b91cd2013-07-09 06:33:41398 ((['git',
[email protected]f267b0e2013-05-02 09:11:43399 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
[email protected]82b91cd2013-07-09 06:33:41400 ((['git',
[email protected]f267b0e2013-05-02 09:11:43401 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
[email protected]0f58fa82012-11-05 01:45:20402 # Mock a config miss (error code 1)
[email protected]82b91cd2013-07-09 06:33:41403 ((['git',
[email protected]f267b0e2013-05-02 09:11:43404 'config', 'gitcl.remotebranch'],), (('', None), 1)),
[email protected]fe30f182016-04-13 12:15:04405 ] + ([
[email protected]0f58fa82012-11-05 01:45:20406 # Call to GetRemoteBranch()
[email protected]82b91cd2013-07-09 06:33:41407 ((['git',
[email protected]f267b0e2013-05-02 09:11:43408 'config', 'branch.%s.merge' % working_branch],),
[email protected]0f58fa82012-11-05 01:45:20409 'refs/heads/master'),
[email protected]82b91cd2013-07-09 06:33:41410 ((['git',
[email protected]f267b0e2013-05-02 09:11:43411 'config', 'branch.%s.remote' % working_branch],), 'origin'),
[email protected]fe30f182016-04-13 12:15:04412 ] if get_remote_branch else []) + [
[email protected]82b91cd2013-07-09 06:33:41413 ((['git', 'rev-list', '^' + fake_ancestor,
[email protected]0f58fa82012-11-05 01:45:20414 'refs/remotes/origin/master'],), ''),
[email protected]fe30f182016-04-13 12:15:04415 ]
[email protected]0f58fa82012-11-05 01:45:20416
[email protected]2e72bb12012-01-17 15:18:35417 @classmethod
418 def _dcommit_calls_1(cls):
419 return [
[email protected]566a02a2014-08-22 01:34:13420 ((['git', 'config', 'rietveld.autoupdate'],),
421 ''),
422 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
423 ''),
[email protected]82b91cd2013-07-09 06:33:41424 ((['git',
[email protected]05fb9112014-07-07 09:30:23425 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
[email protected]2e72bb12012-01-17 15:18:35426 ((('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)),
[email protected]82b91cd2013-07-09 06:33:41430 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
431 ((['git', 'config', '--int', '--get',
[email protected]53937ba2012-10-02 18:20:43432 'branch.working.git-cl-similarity'],), ''),
[email protected]82b91cd2013-07-09 06:33:41433 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
434 ((['git', 'config', '--int', '--get',
[email protected]79540052012-10-19 23:15:26435 'branch.working.git-find-copies'],), ''),
[email protected]82b91cd2013-07-09 06:33:41436 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
437 ((['git',
[email protected]aa5ced12016-03-29 09:41:14438 'config', 'branch.working.rietveldissue'],), '12345'),
439 ((['git',
440 'config', 'rietveld.server'],), 'codereview.example.com'),
441 ((['git',
[email protected]f267b0e2013-05-02 09:11:43442 'config', 'branch.working.merge'],), 'refs/heads/master'),
[email protected]82b91cd2013-07-09 06:33:41443 ((['git', 'config', 'branch.working.remote'],), 'origin'),
[email protected]5724c962014-04-11 09:32:56444 ((['git', 'config', 'branch.working.merge'],),
445 'refs/heads/master'),
446 ((['git', 'config', 'branch.working.remote'],), 'origin'),
[email protected]82b91cd2013-07-09 06:33:41447 ((['git', 'rev-list', '--merges',
[email protected]e84b7542012-06-15 21:26:58448 '--grep=^SVN changes up to revision [0-9]*$',
[email protected]9bb85e22012-06-13 20:28:23449 'refs/remotes/origin/master^!'],), ''),
[email protected]82b91cd2013-07-09 06:33:41450 ((['git', 'rev-list', '^refs/heads/working',
[email protected]2e72bb12012-01-17 15:18:35451 'refs/remotes/origin/master'],),
452 ''),
[email protected]82b91cd2013-07-09 06:33:41453 ((['git',
[email protected]f267b0e2013-05-02 09:11:43454 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
[email protected]2e72bb12012-01-17 15:18:35455 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
[email protected]82b91cd2013-07-09 06:33:41456 ((['git',
[email protected]f267b0e2013-05-02 09:11:43457 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
[email protected]2e72bb12012-01-17 15:18:35458 'refs/remotes/origin/master'],), ''),
[email protected]82b91cd2013-07-09 06:33:41459 ((['git',
[email protected]f267b0e2013-05-02 09:11:43460 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
[email protected]0f58fa82012-11-05 01:45:20461 'fake_ancestor_sha'),
[email protected]2e72bb12012-01-17 15:18:35462 ]
463
464 @classmethod
465 def _dcommit_calls_normal(cls):
466 return [
[email protected]82b91cd2013-07-09 06:33:41467 ((['git', 'rev-parse', '--show-cdup'],), ''),
468 ((['git', 'rev-parse', 'HEAD'],),
[email protected]2e72bb12012-01-17 15:18:35469 '00ff397798ea57439712ed7e04ab96e13969ef40'),
[email protected]82b91cd2013-07-09 06:33:41470 ((['git',
[email protected]9249f642013-06-03 21:36:18471 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
[email protected]2e72bb12012-01-17 15:18:35472 '.'],),
473 'M\tPRESUBMIT.py'),
[email protected]82b91cd2013-07-09 06:33:41474 ((['git',
[email protected]f267b0e2013-05-02 09:11:43475 'config', 'branch.working.rietveldpatchset'],), '31137'),
[email protected]82b91cd2013-07-09 06:33:41476 ((['git', 'config', 'branch.working.rietveldserver'],),
[email protected]2e72bb12012-01-17 15:18:35477 'codereview.example.com'),
[email protected]82b91cd2013-07-09 06:33:41478 ((['git', 'config', 'user.email'],), '[email protected]'),
479 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
[email protected]2e72bb12012-01-17 15:18:35480 ]
481
482 @classmethod
483 def _dcommit_calls_bypassed(cls):
484 return [
[email protected]82b91cd2013-07-09 06:33:41485 ((['git', 'config', 'branch.working.rietveldserver'],),
[email protected]2e72bb12012-01-17 15:18:35486 'codereview.example.com'),
[email protected]2e72bb12012-01-17 15:18:35487 ]
488
489 @classmethod
[email protected]7a54e812014-02-11 19:57:22490 def _dcommit_calls_3(cls):
491 return [
[email protected]82b91cd2013-07-09 06:33:41492 ((['git',
[email protected]f267b0e2013-05-02 09:11:43493 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
[email protected]0f58fa82012-11-05 01:45:20494 '-l100000', '-C50', 'fake_ancestor_sha',
[email protected]53937ba2012-10-02 18:20:43495 'refs/heads/working'],),
[email protected]2e72bb12012-01-17 15:18:35496 (' PRESUBMIT.py | 2 +-\n'
497 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
[email protected]82b91cd2013-07-09 06:33:41498 ((['git', 'show-ref', '--quiet', '--verify',
[email protected]2e72bb12012-01-17 15:18:35499 'refs/heads/git-cl-commit'],),
500 (('', None), 0)),
[email protected]82b91cd2013-07-09 06:33:41501 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
502 ((['git', 'show-ref', '--quiet', '--verify',
[email protected]9bb85e22012-06-13 20:28:23503 'refs/heads/git-cl-cherry-pick'],), ''),
[email protected]7a54e812014-02-11 19:57:22504 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
[email protected]82b91cd2013-07-09 06:33:41505 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
506 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
507 ((['git', 'commit', '-m',
[email protected]e52678e2013-04-26 18:34:44508 'Issue: 12345\n\[email protected]\n\n'
[email protected]4b39c5f2015-07-07 10:33:12509 'Review URL: https://codereview.example.com/12345 .'],),
[email protected]2e72bb12012-01-17 15:18:35510 ''),
[email protected]6abc6522014-12-02 07:34:49511 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
[email protected]82b91cd2013-07-09 06:33:41512 ((['git',
[email protected]f267b0e2013-05-02 09:11:43513 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
[email protected]53937ba2012-10-02 18:20:43514 (('', None), 0)),
[email protected]82b91cd2013-07-09 06:33:41515 ((['git', 'checkout', '-q', 'working'],), ''),
516 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
[email protected]7a54e812014-02-11 19:57:22517 ]
[email protected]2e72bb12012-01-17 15:18:35518
[email protected]ddd59412011-11-30 14:20:38519 @staticmethod
[email protected]c1737d02013-05-29 14:17:28520 def _cmd_line(description, args, similarity, find_copies, private):
[email protected]ddd59412011-11-30 14:20:38521 """Returns the upload command line passed to upload.RealMain()."""
[email protected]ddd59412011-11-30 14:20:38522 return [
523 'upload', '--assume_yes', '--server',
[email protected]eb5edbc2012-01-16 17:03:28524 'https://codereview.example.com',
[email protected]71e12a92012-02-14 02:34:15525 '--message', description
[email protected]ddd59412011-11-30 14:20:38526 ] + args + [
527 '--cc', '[email protected]',
[email protected]c1737d02013-05-29 14:17:28528 ] + (['--private'] if private else []) + [
[email protected]79540052012-10-19 23:15:26529 '--git_similarity', similarity or '50'
530 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
[email protected]5e07e062013-02-28 23:55:44531 'fake_ancestor_sha', 'HEAD'
[email protected]ddd59412011-11-30 14:20:38532 ]
533
534 def _run_reviewer_test(
535 self,
536 upload_args,
537 expected_description,
538 returned_description,
539 final_description,
[email protected]c1737d02013-05-29 14:17:28540 reviewers,
541 private=False):
[email protected]ddd59412011-11-30 14:20:38542 """Generic reviewer test framework."""
[email protected]28253532016-04-14 13:46:56543 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]53937ba2012-10-02 18:20:43544 try:
545 similarity = upload_args[upload_args.index('--similarity')+1]
546 except ValueError:
547 similarity = None
[email protected]79540052012-10-19 23:15:26548
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
[email protected]c1737d02013-05-29 14:17:28556 private = '--private' in upload_args
557
558 self.calls = self._upload_calls(similarity, find_copies, private)
[email protected]87884cc2014-01-03 22:23:41559
[email protected]615a2622013-05-03 13:20:14560 def RunEditor(desc, _, **kwargs):
[email protected]ddd59412011-11-30 14:20:38561 self.assertEquals(
562 '# Enter a description of the change.\n'
[email protected]104b2db2013-04-18 12:58:40563 '# This will be displayed on the codereview site.\n'
[email protected]63a4d7f2013-05-31 02:22:45564 '# The first line will also be used as the subject of the review.\n'
[email protected]bd1073e2013-06-01 00:34:38565 '#--------------------This line is 72 characters long'
566 '--------------------\n' +
[email protected]ddd59412011-11-30 14:20:38567 expected_description,
568 desc)
569 return returned_description
570 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
[email protected]87884cc2014-01-03 22:23:41571
[email protected]ddd59412011-11-30 14:20:38572 def check_upload(args):
[email protected]79540052012-10-19 23:15:26573 cmd_line = self._cmd_line(final_description, reviewers, similarity,
[email protected]c1737d02013-05-29 14:17:28574 find_copies, private)
[email protected]53937ba2012-10-02 18:20:43575 self.assertEquals(cmd_line, args)
[email protected]ddd59412011-11-30 14:20:38576 return 1, 2
577 self.mock(git_cl.upload, 'RealMain', check_upload)
[email protected]87884cc2014-01-03 22:23:41578
[email protected]ddd59412011-11-30 14:20:38579 git_cl.main(['upload'] + upload_args)
580
581 def test_no_reviewer(self):
582 self._run_reviewer_test(
583 [],
[email protected]78936cb2013-04-11 00:17:52584 'desc\n\nBUG=',
585 '# Blah blah comment.\ndesc\n\nBUG=',
586 'desc\n\nBUG=',
[email protected]ddd59412011-11-30 14:20:38587 [])
588
[email protected]53937ba2012-10-02 18:20:43589 def test_keep_similarity(self):
590 self._run_reviewer_test(
591 ['--similarity', '70'],
[email protected]78936cb2013-04-11 00:17:52592 'desc\n\nBUG=',
593 '# Blah blah comment.\ndesc\n\nBUG=',
594 'desc\n\nBUG=',
[email protected]53937ba2012-10-02 18:20:43595 [])
596
[email protected]79540052012-10-19 23:15:26597 def test_keep_find_copies(self):
598 self._run_reviewer_test(
599 ['--no-find-copies'],
[email protected]78936cb2013-04-11 00:17:52600 'desc\n\nBUG=',
[email protected]79540052012-10-19 23:15:26601 '# Blah blah comment.\ndesc\n\nBUG=\n',
[email protected]78936cb2013-04-11 00:17:52602 'desc\n\nBUG=',
[email protected]79540052012-10-19 23:15:26603 [])
604
[email protected]c1737d02013-05-29 14:17:28605 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
[email protected]ddd59412011-11-30 14:20:38613 def test_reviewers_cmd_line(self):
614 # Reviewer is passed as-is
[email protected]78936cb2013-04-11 00:17:52615 description = 'desc\n\[email protected]\nBUG='
[email protected]ddd59412011-11-30 14:20:38616 self._run_reviewer_test(
617 ['-r' '[email protected]'],
618 description,
619 '\n%s\n' % description,
620 description,
[email protected]78936cb2013-04-11 00:17:52621 ['[email protected]'])
[email protected]ddd59412011-11-30 14:20:38622
623 def test_reviewer_tbr_overriden(self):
624 # Reviewer is overriden with TBR
625 # Also verifies the regexp work without a trailing LF
[email protected]78936cb2013-04-11 00:17:52626 description = 'Foo Bar\n\[email protected]'
[email protected]ddd59412011-11-30 14:20:38627 self._run_reviewer_test(
628 ['-r' '[email protected]'],
[email protected]78936cb2013-04-11 00:17:52629 'desc\n\[email protected]\nBUG=',
[email protected]ddd59412011-11-30 14:20:38630 description.strip('\n'),
631 description,
[email protected]78936cb2013-04-11 00:17:52632 ['[email protected]'])
[email protected]ddd59412011-11-30 14:20:38633
634 def test_reviewer_multiple(self):
635 # Handles multiple R= or TBR= lines.
636 description = (
[email protected]78936cb2013-04-11 00:17:52637 'Foo Bar\[email protected]\nBUG=\[email protected]')
[email protected]ddd59412011-11-30 14:20:38638 self._run_reviewer_test(
639 [],
[email protected]78936cb2013-04-11 00:17:52640 'desc\n\nBUG=',
[email protected]ddd59412011-11-30 14:20:38641 description,
642 description,
[email protected]78936cb2013-04-11 00:17:52643 ['[email protected],[email protected]'])
[email protected]ddd59412011-11-30 14:20:38644
[email protected]a3353652011-11-30 14:26:57645 def test_reviewer_send_mail(self):
646 # --send-mail can be used without -r if R= is used
[email protected]78936cb2013-04-11 00:17:52647 description = 'Foo Bar\[email protected]'
[email protected]a3353652011-11-30 14:26:57648 self._run_reviewer_test(
649 ['--send-mail'],
[email protected]78936cb2013-04-11 00:17:52650 'desc\n\nBUG=',
[email protected]a3353652011-11-30 14:26:57651 description.strip('\n'),
652 description,
[email protected]78936cb2013-04-11 00:17:52653 ['[email protected]', '--send_mail'])
[email protected]a3353652011-11-30 14:26:57654
655 def test_reviewer_send_mail_no_rev(self):
656 # Fails without a reviewer.
[email protected]2e23ce32013-05-07 12:42:28657 stdout = StringIO.StringIO()
658 stderr = StringIO.StringIO()
[email protected]a3353652011-11-30 14:26:57659 try:
[email protected]615a2622013-05-03 13:20:14660 self.calls = self._upload_no_rev_calls(None, None)
661 def RunEditor(desc, _, **kwargs):
[email protected]a3353652011-11-30 14:26:57662 return desc
663 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
[email protected]2e23ce32013-05-07 12:42:28664 self.mock(sys, 'stdout', stdout)
665 self.mock(sys, 'stderr', stderr)
[email protected]a3353652011-11-30 14:26:57666 git_cl.main(['upload', '--send-mail'])
667 self.fail()
668 except SystemExit:
[email protected]2e23ce32013-05-07 12:42:28669 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())
[email protected]a3353652011-11-30 14:26:57675
[email protected]2e72bb12012-01-17 15:18:35676 def test_dcommit(self):
[email protected]28253532016-04-14 13:46:56677 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]2e72bb12012-01-17 15:18:35678 self.calls = (
679 self._dcommit_calls_1() +
[email protected]0f58fa82012-11-05 01:45:20680 self._git_sanity_checks('fake_ancestor_sha', 'working') +
[email protected]2e72bb12012-01-17 15:18:35681 self._dcommit_calls_normal() +
[email protected]7a54e812014-02-11 19:57:22682 self._dcommit_calls_3())
[email protected]2e72bb12012-01-17 15:18:35683 git_cl.main(['dcommit'])
684
685 def test_dcommit_bypass_hooks(self):
[email protected]28253532016-04-14 13:46:56686 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]2e72bb12012-01-17 15:18:35687 self.calls = (
688 self._dcommit_calls_1() +
689 self._dcommit_calls_bypassed() +
[email protected]7a54e812014-02-11 19:57:22690 self._dcommit_calls_3())
[email protected]2e72bb12012-01-17 15:18:35691 git_cl.main(['dcommit', '--bypass-hooks'])
692
[email protected]ddd59412011-11-30 14:20:38693
[email protected]0f58fa82012-11-05 01:45:20694 @classmethod
[email protected]28253532016-04-14 13:46:56695 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
[email protected]00dbccd2016-04-15 07:24:43696 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
[email protected]28253532016-04-14 13:46:56697 if skip_auth_check:
698 return [((cmd, ), 'true')]
699
700 calls = [((cmd, ), '', subprocess2.CalledProcessError(1, '', '', '', ''))]
[email protected]fe30f182016-04-13 12:15:04701 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
[email protected]512d79c2016-03-31 12:55:28716 def _gerrit_base_calls(cls, issue=None):
[email protected]e8077812012-02-03 03:41:46717 return [
[email protected]82b91cd2013-07-09 06:33:41718 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
719 ((['git', 'config', '--int', '--get',
[email protected]53937ba2012-10-02 18:20:43720 'branch.master.git-cl-similarity'],), ''),
[email protected]82b91cd2013-07-09 06:33:41721 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
722 ((['git', 'config', '--int', '--get',
[email protected]79540052012-10-19 23:15:26723 'branch.master.git-find-copies'],), ''),
[email protected]512d79c2016-03-31 12:55:28724 ] + cls._is_gerrit_calls(True) + [
[email protected]82b91cd2013-07-09 06:33:41725 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
[email protected]aa5ced12016-03-29 09:41:14726 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
[email protected]512d79c2016-03-31 12:55:28727 ((['git', 'config', 'branch.master.gerritissue'],),
728 '' if issue is None else str(issue)),
[email protected]fe30f182016-04-13 12:15:04729 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
[email protected]82b91cd2013-07-09 06:33:41730 ((['git', 'config', 'branch.master.remote'],), 'origin'),
[email protected]fe30f182016-04-13 12:15:04731 ((['get_or_create_merge_base', 'master',
732 'refs/remotes/origin/master'],),
[email protected]9e849272014-04-04 00:31:55733 'fake_ancestor_sha'),
[email protected]fe30f182016-04-13 12:15:04734 # 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)) + [
[email protected]82b91cd2013-07-09 06:33:41738 ((['git', 'rev-parse', '--show-cdup'],), ''),
739 ((['git', 'rev-parse', 'HEAD'],), '12345'),
[email protected]fe30f182016-04-13 12:15:04740
[email protected]82b91cd2013-07-09 06:33:41741 ((['git',
[email protected]9249f642013-06-03 21:36:18742 'diff', '--name-status', '--no-renames', '-r',
743 'fake_ancestor_sha...', '.'],),
[email protected]e8077812012-02-03 03:41:46744 'M\t.gitignore\n'),
[email protected]aa5ced12016-03-29 09:41:14745 ((['git', 'config', 'branch.master.gerritpatchset'],), ''),
[email protected]512d79c2016-03-31 12:55:28746 ] + ([] if issue else [
[email protected]82b91cd2013-07-09 06:33:41747 ((['git',
[email protected]f267b0e2013-05-02 09:11:43748 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
[email protected]0f58fa82012-11-05 01:45:20749 'foo'),
[email protected]512d79c2016-03-31 12:55:28750 ]) + [
[email protected]82b91cd2013-07-09 06:33:41751 ((['git', 'config', 'user.email'],), '[email protected]'),
752 ((['git',
[email protected]f267b0e2013-05-02 09:11:43753 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
[email protected]5e07e062013-02-28 23:55:44754 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
[email protected]e8077812012-02-03 03:41:46755 '+dat'),
[email protected]aa5ced12016-03-29 09:41:14756 ]
[email protected]e8077812012-02-03 03:41:46757
[email protected]1e67bb72016-02-11 12:15:49758 @classmethod
759 def _gerrit_upload_calls(cls, description, reviewers, squash,
[email protected]10625002016-03-04 20:03:47760 expected_upstream_ref='origin/refs/heads/master',
[email protected]8da45402016-05-24 23:11:03761 ref_suffix='', notify=False,
[email protected]512d79c2016-03-31 12:55:28762 post_amend_description=None, issue=None):
[email protected]10625002016-03-04 20:03:47763 if post_amend_description is None:
764 post_amend_description = description
[email protected]512d79c2016-03-31 12:55:28765
[email protected]e8077812012-02-03 03:41:46766 calls = [
[email protected]54b400c2016-01-14 10:08:25767 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
[email protected]512d79c2016-03-31 12:55:28768 ]
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)]
[email protected]57d86542016-03-04 16:11:32779 if not git_footers.get_footer_change_id(description) and not squash:
[email protected]aebe87f2012-10-22 20:34:21780 calls += [
[email protected]10625002016-03-04 20:03:47781 # DownloadGerritHook(False)
782 ((False, ),
783 ''),
784 # Amending of commit message to get the Change-Id.
[email protected]82b91cd2013-07-09 06:33:41785 ((['git', 'log', '--pretty=format:%s\n\n%b',
[email protected]5e07e062013-02-28 23:55:44786 'fake_ancestor_sha..HEAD'],),
[email protected]aebe87f2012-10-22 20:34:21787 description),
[email protected]82b91cd2013-07-09 06:33:41788 ((['git', 'commit', '--amend', '-m', description],),
[email protected]aebe87f2012-10-22 20:34:21789 ''),
[email protected]82b91cd2013-07-09 06:33:41790 ((['git', 'log', '--pretty=format:%s\n\n%b',
[email protected]5e07e062013-02-28 23:55:44791 'fake_ancestor_sha..HEAD'],),
[email protected]10625002016-03-04 20:03:47792 post_amend_description)
[email protected]aebe87f2012-10-22 20:34:21793 ]
[email protected]27386dd2015-02-16 10:45:39794 if squash:
[email protected]512d79c2016-03-31 12:55:28795 if not issue:
796 # Prompting to edit description on first upload.
797 calls += [
798 ((['git', 'config', 'core.editor'],), ''),
799 ((['RunEditor'],), description),
800 ]
[email protected]27386dd2015-02-16 10:45:39801 ref_to_push = 'abcdef0123456789'
802 calls += [
[email protected]27386dd2015-02-16 10:45:39803 ((['git', 'config', 'branch.master.merge'],),
804 'refs/heads/master'),
805 ((['git', 'config', 'branch.master.remote'],),
806 'origin'),
[email protected]fe30f182016-04-13 12:15:04807 ((['get_or_create_merge_base', 'master',
808 'refs/remotes/origin/master'],),
[email protected]27386dd2015-02-16 10:45:39809 'origin/master'),
810 ((['git', 'rev-parse', 'HEAD:'],),
811 '0123456789abcdef'),
812 ((['git', 'commit-tree', '0123456789abcdef', '-p',
[email protected]512d79c2016-03-31 12:55:28813 'origin/master', '-m', description],),
[email protected]27386dd2015-02-16 10:45:39814 ref_to_push),
815 ]
816 else:
817 ref_to_push = 'HEAD'
818
[email protected]aebe87f2012-10-22 20:34:21819 calls += [
[email protected]609f3952015-05-04 22:47:04820 ((['git', 'rev-list',
821 expected_upstream_ref + '..' + ref_to_push],), ''),
[email protected]82b91cd2013-07-09 06:33:41822 ((['git', 'config', 'rietveld.cc'],), '')
[email protected]e8077812012-02-03 03:41:46823 ]
[email protected]8acd8332016-04-13 12:56:03824 # Add cc from watch list.
[email protected]0b2d7072016-04-18 16:19:03825 # TODO(tandrii): bring this back after http://crbug.com/604377.
826 # if ref_suffix == '':
827 # ref_suffix = '%[email protected]'
828 # else:
829 # ref_suffix += ',[email protected]'
[email protected]8da45402016-05-24 23:11:03830
831 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
832 if ref_suffix:
833 ref_suffix += ',' + notify_suffix
834 else:
835 ref_suffix = '%' + notify_suffix
[email protected]e8077812012-02-03 03:41:46836 if reviewers:
[email protected]8da45402016-05-24 23:11:03837 ref_suffix += ',' + ','.join('r=%s' % email
838 for email in sorted(reviewers))
[email protected]e8077812012-02-03 03:41:46839 calls += [
[email protected]8acd8332016-04-13 12:56:03840 ((['git', 'push', 'origin',
[email protected]bf766ba2016-04-13 12:51:23841 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
[email protected]a342c922016-03-16 07:08:25842 ('remote:\n'
843 'remote: Processing changes: (\)\n'
844 'remote: Processing changes: (|)\n'
845 'remote: Processing changes: (/)\n'
846 'remote: Processing changes: (-)\n'
847 'remote: Processing changes: new: 1 (/)\n'
848 'remote: Processing changes: new: 1, done\n'
849 'remote:\n'
850 'remote: New Changes:\n'
851 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
852 'remote:\n'
853 'To https://chromium.googlesource.com/yyy/zzz\n'
854 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
[email protected]e8077812012-02-03 03:41:46855 ]
[email protected]27386dd2015-02-16 10:45:39856 if squash:
857 calls += [
[email protected]aa5ced12016-03-29 09:41:14858 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
[email protected]aa5ced12016-03-29 09:41:14859 ((['git', 'config', 'branch.master.gerritserver',
860 'https://chromium-review.googlesource.com'],), ''),
[email protected]512d79c2016-03-31 12:55:28861 ((['git', 'config', 'branch.master.gerritsquashhash',
862 'abcdef0123456789'],), ''),
[email protected]fe30f182016-04-13 12:15:04863 ]
[email protected]1e67bb72016-02-11 12:15:49864 calls += cls._git_post_upload_calls()
[email protected]e8077812012-02-03 03:41:46865 return calls
866
[email protected]aebe87f2012-10-22 20:34:21867 def _run_gerrit_upload_test(
[email protected]e8077812012-02-03 03:41:46868 self,
869 upload_args,
870 description,
[email protected]bf766ba2016-04-13 12:51:23871 reviewers=None,
[email protected]609f3952015-05-04 22:47:04872 squash=False,
[email protected]10625002016-03-04 20:03:47873 expected_upstream_ref='origin/refs/heads/master',
[email protected]bf766ba2016-04-13 12:51:23874 ref_suffix='',
[email protected]8da45402016-05-24 23:11:03875 notify=False,
[email protected]512d79c2016-03-31 12:55:28876 post_amend_description=None,
877 issue=None):
[email protected]aebe87f2012-10-22 20:34:21878 """Generic gerrit upload test framework."""
[email protected]bf766ba2016-04-13 12:51:23879 reviewers = reviewers or []
[email protected]28253532016-04-14 13:46:56880 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]fe30f182016-04-13 12:15:04881 self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
882 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
[email protected]512d79c2016-03-31 12:55:28883 self.calls = self._gerrit_base_calls(issue=issue)
[email protected]609f3952015-05-04 22:47:04884 self.calls += self._gerrit_upload_calls(
885 description, reviewers, squash,
[email protected]10625002016-03-04 20:03:47886 expected_upstream_ref=expected_upstream_ref,
[email protected]8da45402016-05-24 23:11:03887 ref_suffix=ref_suffix, notify=notify,
[email protected]512d79c2016-03-31 12:55:28888 post_amend_description=post_amend_description,
889 issue=issue)
[email protected]09d7a6a2016-03-04 15:44:48890 # Uncomment when debugging.
891 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
[email protected]e8077812012-02-03 03:41:46892 git_cl.main(['upload'] + upload_args)
893
[email protected]aebe87f2012-10-22 20:34:21894 def test_gerrit_upload_without_change_id(self):
[email protected]10625002016-03-04 20:03:47895 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
[email protected]aebe87f2012-10-22 20:34:21896 self._run_gerrit_upload_test(
[email protected]e8077812012-02-03 03:41:46897 [],
[email protected]35d1a842012-07-27 00:20:43898 'desc\n\nBUG=\n',
[email protected]10625002016-03-04 20:03:47899 [],
900 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
[email protected]e8077812012-02-03 03:41:46901
[email protected]aebe87f2012-10-22 20:34:21902 def test_gerrit_no_reviewer(self):
903 self._run_gerrit_upload_test(
904 [],
[email protected]09d7a6a2016-03-04 15:44:48905 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
[email protected]aebe87f2012-10-22 20:34:21906 [])
907
[email protected]bf766ba2016-04-13 12:51:23908 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
[email protected]e8077812012-02-03 03:41:46914 def test_gerrit_reviewers_cmd_line(self):
[email protected]aebe87f2012-10-22 20:34:21915 self._run_gerrit_upload_test(
[email protected]8da45402016-05-24 23:11:03916 ['-r', '[email protected]', '--send-mail'],
[email protected]09d7a6a2016-03-04 15:44:48917 'desc\n\nBUG=\n\nChange-Id: I123456789',
[email protected]8da45402016-05-24 23:11:03918 ['[email protected]'],
919 notify=True)
[email protected]e8077812012-02-03 03:41:46920
921 def test_gerrit_reviewer_multiple(self):
[email protected]aebe87f2012-10-22 20:34:21922 self._run_gerrit_upload_test(
[email protected]e8077812012-02-03 03:41:46923 [],
[email protected]09d7a6a2016-03-04 15:44:48924 'desc\[email protected]\nBUG=\[email protected]\n\n'
925 'Change-Id: 123456789\n',
[email protected]e8077812012-02-03 03:41:46926 ['[email protected]', '[email protected]'])
927
[email protected]512d79c2016-03-31 12:55:28928 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']))
[email protected]27386dd2015-02-16 10:45:39934 self._run_gerrit_upload_test(
935 ['--squash'],
[email protected]512d79c2016-03-31 12:55:28936 'desc\nBUG=\n\nChange-Id: 123456789',
[email protected]27386dd2015-02-16 10:45:39937 [],
[email protected]609f3952015-05-04 22:47:04938 squash=True,
939 expected_upstream_ref='origin/master')
[email protected]e8077812012-02-03 03:41:46940
[email protected]512d79c2016-03-31 12:55:28941 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
[email protected]2dd99862015-06-22 12:22:18958 def test_upload_branch_deps(self):
[email protected]28253532016-04-14 13:46:56959 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]2dd99862015-06-22 12:22:18960 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'
[email protected]4c72b082016-03-31 22:26:351001 def IsGerrit(self):
1002 return False
[email protected]2dd99862015-06-22 12:22:181003
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
[email protected]65874e12016-03-04 12:03:021009 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 <[email protected]> 1456848326 +0100'),
1017 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1018 'C D <[email protected]> 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
[email protected]78936cb2013-04-11 00:17:521025 def test_update_reviewers(self):
1026 data = [
1027 ('foo', [], 'foo'),
[email protected]42c20792013-09-12 17:34:491028 ('foo\nR=xx', [], 'foo\nR=xx'),
1029 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
[email protected]78936cb2013-04-11 00:17:521030 ('foo', ['a@c'], 'foo\n\nR=a@c'),
[email protected]42c20792013-09-12 17:34:491031 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1032 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1033 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
[email protected]78936cb2013-04-11 00:17:521034 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
[email protected]42c20792013-09-12 17:34:491035 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'),
[email protected]78936cb2013-04-11 00:17:521036 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
[email protected]c6f60e82013-04-19 17:01:571037 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1038 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1039 # Same as the line before, but full of whitespaces.
1040 (
1041 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1042 'foo\nBar\n\nR=c@c\n BUG =',
1043 ),
1044 # Whitespaces aren't interpreted as new lines.
1045 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
[email protected]78936cb2013-04-11 00:17:521046 ]
[email protected]c6f60e82013-04-19 17:01:571047 expected = [i[2] for i in data]
1048 actual = []
1049 for orig, reviewers, _expected in data:
[email protected]78936cb2013-04-11 00:17:521050 obj = git_cl.ChangeDescription(orig)
1051 obj.update_reviewers(reviewers)
[email protected]c6f60e82013-04-19 17:01:571052 actual.append(obj.description)
1053 self.assertEqual(expected, actual)
[email protected]78936cb2013-04-11 00:17:521054
[email protected]455dc922015-01-26 20:15:501055 def test_get_target_ref(self):
1056 # Check remote or remote branch not present.
1057 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
1058 self.assertEqual(None, git_cl.GetTargetRef(None,
1059 'refs/remotes/origin/master',
1060 'master', None))
[email protected]27386dd2015-02-16 10:45:391061
[email protected]455dc922015-01-26 20:15:501062 # Check default target refs for branches.
1063 self.assertEqual('refs/heads/master',
1064 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1065 None, None))
1066 self.assertEqual('refs/heads/master',
1067 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
1068 None, None))
1069 self.assertEqual('refs/heads/master',
1070 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
1071 None, None))
1072 self.assertEqual('refs/branch-heads/123',
1073 git_cl.GetTargetRef('origin',
1074 'refs/remotes/branch-heads/123',
1075 None, None))
1076 self.assertEqual('refs/diff/test',
1077 git_cl.GetTargetRef('origin',
1078 'refs/remotes/origin/refs/diff/test',
1079 None, None))
[email protected]c68112d2015-03-03 12:48:061080 self.assertEqual('refs/heads/chrome/m42',
1081 git_cl.GetTargetRef('origin',
1082 'refs/remotes/origin/chrome/m42',
1083 None, None))
[email protected]455dc922015-01-26 20:15:501084
1085 # Check target refs for user-specified target branch.
1086 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1087 'refs/remotes/branch-heads/123'):
1088 self.assertEqual('refs/branch-heads/123',
1089 git_cl.GetTargetRef('origin',
1090 'refs/remotes/origin/master',
1091 branch, None))
1092 for branch in ('origin/master', 'remotes/origin/master',
1093 'refs/remotes/origin/master'):
1094 self.assertEqual('refs/heads/master',
1095 git_cl.GetTargetRef('origin',
1096 'refs/remotes/branch-heads/123',
1097 branch, None))
1098 for branch in ('master', 'heads/master', 'refs/heads/master'):
1099 self.assertEqual('refs/heads/master',
1100 git_cl.GetTargetRef('origin',
1101 'refs/remotes/branch-heads/123',
1102 branch, None))
1103
1104 # Check target refs for pending prefix.
1105 self.assertEqual('prefix/heads/master',
1106 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
1107 None, 'prefix/'))
1108
[email protected]a872e752015-04-28 23:42:181109 def test_patch_when_dirty(self):
1110 # Patch when local tree is dirty
1111 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
[email protected]a872e752015-04-28 23:42:181112 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1113
1114 def test_diff_when_dirty(self):
1115 # Do 'git cl diff' when local tree is dirty
1116 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1117 self.assertNotEqual(git_cl.main(['diff']), 0)
1118
[email protected]dde64622016-04-13 17:11:211119 def _patch_common(self, is_gerrit=False, force_codereview=False):
[email protected]28253532016-04-14 13:46:561120 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]aa5ced12016-03-29 09:41:141121 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1122 lambda x: '60001')
1123 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
1124 lambda *args: None)
[email protected]f86c7d32016-04-01 19:27:301125 self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail',
1126 lambda *args: {
1127 'current_revision': '7777777777',
1128 'revisions': {
1129 '1111111111': {
1130 '_number': 1,
1131 'fetch': {'http': {
1132 'url': 'https://chromium.googlesource.com/my/repo',
1133 'ref': 'refs/changes/56/123456/1',
1134 }},
1135 },
1136 '7777777777': {
1137 '_number': 7,
1138 'fetch': {'http': {
1139 'url': 'https://chromium.googlesource.com/my/repo',
1140 'ref': 'refs/changes/56/123456/7',
1141 }},
1142 },
1143 },
1144 })
[email protected]aa5ced12016-03-29 09:41:141145 self.mock(git_cl.Changelist, 'GetDescription',
1146 lambda *args: 'Description')
[email protected]a872e752015-04-28 23:42:181147 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1148
[email protected]c2786d92016-05-31 19:53:501149 self.calls = self.calls or []
[email protected]dde64622016-04-13 17:11:211150 if not force_codereview:
1151 # These calls detect codereview to use.
[email protected]c2786d92016-05-31 19:53:501152 self.calls += [
[email protected]dde64622016-04-13 17:11:211153 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1154 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
1155 ((['git', 'config', 'branch.master.gerritissue'],), ''),
1156 ((['git', 'config', 'rietveld.autoupdate'],), ''),
[email protected]f86c7d32016-04-01 19:27:301157 ]
[email protected]dde64622016-04-13 17:11:211158
1159 if is_gerrit:
1160 if not force_codereview:
1161 self.calls += [
1162 ((['git', 'config', 'gerrit.host'],), 'true'),
1163 ]
1164 else:
[email protected]f86c7d32016-04-01 19:27:301165 self.calls += [
1166 ((['git', 'config', 'gerrit.host'],), ''),
1167 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1168 ((['git', 'rev-parse', '--show-cdup'],), ''),
1169 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
1170 ]
[email protected]a872e752015-04-28 23:42:181171
[email protected]c2786d92016-05-31 19:53:501172 def _common_patch_successful(self):
[email protected]a872e752015-04-28 23:42:181173 self._patch_common()
1174 self.calls += [
1175 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
1176 ((['git', 'commit', '-m',
[email protected]5b3bebb2015-05-28 21:41:431177 'Description\n\n' +
[email protected]a872e752015-04-28 23:42:181178 'patch from issue 123456 at patchset 60001 ' +
1179 '(http://crrev.com/123456#ps60001)'],), ''),
[email protected]f86c7d32016-04-01 19:27:301180 ((['git', 'config', 'branch.master.rietveldissue', '123456'],), ''),
[email protected]aa5ced12016-03-29 09:41:141181 ((['git', 'config', 'branch.master.rietveldserver'],), ''),
[email protected]f86c7d32016-04-01 19:27:301182 ((['git', 'config', 'branch.master.rietveldserver',
1183 'https://codereview.example.com'],), ''),
1184 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],), ''),
[email protected]a872e752015-04-28 23:42:181185 ]
[email protected]c2786d92016-05-31 19:53:501186
1187 def test_patch_successful(self):
1188 self._common_patch_successful()
[email protected]a872e752015-04-28 23:42:181189 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1190
[email protected]c2786d92016-05-31 19:53:501191 def test_patch_successful_new_branch(self):
1192 self.calls = [ ((['git', 'new-branch', 'master'],), ''), ]
1193 self._common_patch_successful()
1194 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1195
[email protected]a872e752015-04-28 23:42:181196 def test_patch_conflict(self):
1197 self._patch_common()
1198 self.calls += [
1199 ((['git', 'apply', '--index', '-p0', '--3way'],), '',
1200 subprocess2.CalledProcessError(1, '', '', '', '')),
1201 ]
1202 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
[email protected]455dc922015-01-26 20:15:501203
[email protected]f86c7d32016-04-01 19:27:301204 def test_gerrit_patch_successful(self):
1205 self._patch_common(is_gerrit=True)
1206 self.calls += [
1207 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1208 'refs/changes/56/123456/7'],), ''),
1209 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1210 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
1211 ((['git', 'config', 'branch.master.gerritserver'],), ''),
1212 ((['git', 'config', 'branch.master.merge'],), 'master'),
1213 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1214 ((['git', 'config', 'remote.origin.url'],),
1215 'https://chromium.googlesource.com/my/repo'),
1216 ((['git', 'config', 'branch.master.gerritserver',
1217 'https://chromium-review.googlesource.com'],), ''),
1218 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1219 ]
1220 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1221
[email protected]dde64622016-04-13 17:11:211222 def test_patch_force_codereview(self):
1223 self._patch_common(is_gerrit=True, force_codereview=True)
1224 self.calls += [
1225 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1226 'refs/changes/56/123456/7'],), ''),
1227 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1228 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
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', '--gerrit', '123456']), 0)
1240
[email protected]f86c7d32016-04-01 19:27:301241 def test_gerrit_patch_url_successful(self):
1242 self._patch_common(is_gerrit=True)
1243 self.calls += [
1244 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1245 'refs/changes/56/123456/1'],), ''),
1246 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1247 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
1248 ((['git', 'config', 'branch.master.gerritserver',
1249 'https://chromium-review.googlesource.com'],), ''),
1250 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1251 ]
1252 self.assertEqual(git_cl.main(
1253 ['patch', 'https://chromium-review.googlesource.com/#/c/123456/1']), 0)
1254
1255 def test_gerrit_patch_conflict(self):
1256 self._patch_common(is_gerrit=True)
1257 self.mock(git_cl, 'DieWithError',
1258 lambda msg: self._mocked_call(['DieWithError', msg]))
1259 class SystemExitMock(Exception):
1260 pass
1261 self.calls += [
1262 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1263 'refs/changes/56/123456/1'],), ''),
1264 ((['git', 'cherry-pick', 'FETCH_HEAD'],),
1265 '', subprocess2.CalledProcessError(1, '', '', '', '')),
1266 ((['DieWithError', 'git cherry-pick FETCH_HEAD" failed.\n'],),
1267 '', SystemExitMock()),
1268 ]
1269 with self.assertRaises(SystemExitMock):
1270 git_cl.main(['patch',
1271 'https://chromium-review.googlesource.com/#/c/123456/1'])
1272
[email protected]5df290f2016-04-11 16:12:291273 def _checkout_calls(self):
1274 return [
1275 ((['git', 'config', '--local', '--get-regexp',
1276 'branch\\..*\\.rietveldissue'], ),
1277 ('branch.retrying.rietveldissue 1111111111\n'
1278 'branch.some-fix.rietveldissue 2222222222\n')),
1279 ((['git', 'config', '--local', '--get-regexp',
1280 'branch\\..*\\.gerritissue'], ),
1281 ('branch.ger-branch.gerritissue 123456\n'
1282 'branch.gbranch654.gerritissue 654321\n')),
1283 ]
1284
1285 def test_checkout_gerrit(self):
1286 """Tests git cl checkout <issue>."""
1287 self.calls = self._checkout_calls()
1288 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1289 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1290
1291 def test_checkout_rietveld(self):
1292 """Tests git cl checkout <issue>."""
1293 self.calls = self._checkout_calls()
1294 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1295 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1296
1297 def test_checkout_not_found(self):
1298 """Tests git cl checkout <issue>."""
[email protected]28253532016-04-14 13:46:561299 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]5df290f2016-04-11 16:12:291300 self.calls = self._checkout_calls()
1301 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1302
[email protected]26c8fd22016-04-11 21:33:211303 def test_checkout_no_branch_issues(self):
1304 """Tests git cl checkout <issue>."""
[email protected]28253532016-04-14 13:46:561305 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]26c8fd22016-04-11 21:33:211306 self.calls = [
1307 ((['git', 'config', '--local', '--get-regexp',
1308 'branch\\..*\\.rietveldissue'], ), '',
1309 subprocess2.CalledProcessError(1, '', '', '', '')),
1310 ((['git', 'config', '--local', '--get-regexp',
1311 'branch\\..*\\.gerritissue'], ), '',
1312 subprocess2.CalledProcessError(1, '', '', '', '')),
1313
1314 ]
1315 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1316
[email protected]28253532016-04-14 13:46:561317 def _test_gerrit_ensure_authenticated_common(self, auth,
1318 skip_auth_check=False):
[email protected]fe30f182016-04-13 12:15:041319 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1320 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1321 self.mock(git_cl, 'DieWithError',
1322 lambda msg: self._mocked_call(['DieWithError', msg]))
1323 self.mock(git_cl, 'ask_for_data',
1324 lambda msg: self._mocked_call(['ask_for_data', msg]))
[email protected]28253532016-04-14 13:46:561325 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
[email protected]fe30f182016-04-13 12:15:041326 cl = git_cl.Changelist(codereview='gerrit')
[email protected]28253532016-04-14 13:46:561327 cl.branch = 'master'
1328 cl.branchref = 'refs/heads/master'
[email protected]fe30f182016-04-13 12:15:041329 cl.lookedup_issue = True
1330 return cl
1331
1332 def test_gerrit_ensure_authenticated_missing(self):
1333 cl = self._test_gerrit_ensure_authenticated_common(auth={
1334 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1335 })
1336 self.calls.append(
1337 ((['DieWithError',
1338 'Credentials for the following hosts are required:\n'
1339 ' chromium-review.googlesource.com\n'
1340 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1341 'You can (re)generate your credentails by visiting '
1342 'https://chromium-review.googlesource.com/new-password'],), ''),)
1343 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1344
1345 def test_gerrit_ensure_authenticated_conflict(self):
[email protected]28253532016-04-14 13:46:561346 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
[email protected]fe30f182016-04-13 12:15:041347 cl = self._test_gerrit_ensure_authenticated_common(auth={
1348 'chromium.googlesource.com': 'one',
1349 'chromium-review.googlesource.com': 'other',
1350 })
1351 self.calls.append(
1352 ((['ask_for_data', 'If you know what you are doing, '
1353 'press Enter to continue, Ctrl+C to abort.'],), ''))
1354 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1355
1356 def test_gerrit_ensure_authenticated_ok(self):
1357 cl = self._test_gerrit_ensure_authenticated_common(auth={
1358 'chromium.googlesource.com': 'same',
1359 'chromium-review.googlesource.com': 'same',
1360 })
1361 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1362
[email protected]28253532016-04-14 13:46:561363 def test_gerrit_ensure_authenticated_skipped(self):
1364 cl = self._test_gerrit_ensure_authenticated_common(
1365 auth={}, skip_auth_check=True)
1366 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1367
[email protected]fa330e82016-04-13 17:09:521368 def test_cmd_set_commit_rietveld(self):
1369 self.mock(git_cl._RietveldChangelistImpl, 'SetFlag',
1370 lambda _, f, v: self._mocked_call(['SetFlag', f, v]))
1371 self.calls = [
1372 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1373 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
1374 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1375 ((['git', 'config', 'rietveld.server'],), ''),
1376 ((['git', 'config', 'rietveld.server'],), ''),
1377 ((['git', 'config', 'branch.feature.rietveldserver'],),
1378 'https://codereview.chromium.org'),
1379 ((['SetFlag', 'commit', '1'], ), ''),
1380 ]
1381 self.assertEqual(0, git_cl.main(['set-commit']))
1382
1383 def test_cmd_set_commit_gerrit(self):
1384 self.mock(git_cl.gerrit_util, 'SetReview',
1385 lambda h, i, labels: self._mocked_call(
1386 ['SetReview', h, i, labels]))
1387 self.calls = [
1388 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1389 ((['git', 'config', 'branch.feature.rietveldissue'],), ''),
1390 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
1391 ((['git', 'config', 'branch.feature.gerritserver'],),
1392 'https://chromium-review.googlesource.com'),
1393 ((['SetReview', 'chromium-review.googlesource.com', 123,
1394 {'Commit-Queue': 1}],), ''),
1395 ]
[email protected]1a8ef442016-04-13 18:41:371396 # TODO(tandrii): consider testing just set-commit and set-commit --clear,
1397 # but without copy-pasting tons of expectations, as modifying them later is
1398 # super tedious.
[email protected]fa330e82016-04-13 17:09:521399 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1400
[email protected]2b55fe32016-04-26 20:28:541401 def test_description_display(self):
1402 out = StringIO.StringIO()
1403 self.mock(git_cl.sys, 'stdout', out)
1404
[email protected]d6648e22016-04-29 19:22:161405 self.mock(git_cl, 'Changelist', ChangelistMock)
1406 ChangelistMock.desc = 'foo\n'
[email protected]2b55fe32016-04-26 20:28:541407
1408 self.assertEqual(0, git_cl.main(['description', '-d']))
1409 self.assertEqual('foo\n', out.getvalue())
1410
1411 def test_description_rietveld(self):
1412 out = StringIO.StringIO()
1413 self.mock(git_cl.sys, 'stdout', out)
1414 self.mock(git_cl.Changelist, 'GetDescription',
1415 lambda *args: 'foobar')
1416
1417 self.calls = [
1418 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1419 ((['git', 'config', 'rietveld.server'],), ''),
1420 ((['git', 'config', 'rietveld.server'],), ''),
1421 ]
1422 self.assertEqual(0, git_cl.main([
1423 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
1424 self.assertEqual('foobar\n', out.getvalue())
1425
1426 def test_description_gerrit(self):
1427 out = StringIO.StringIO()
1428 self.mock(git_cl.sys, 'stdout', out)
1429 self.mock(git_cl.Changelist, 'GetDescription',
1430 lambda *args: 'foobar')
1431
1432 self.assertEqual(0, git_cl.main([
1433 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1434 self.assertEqual('foobar\n', out.getvalue())
1435
[email protected]d6648e22016-04-29 19:22:161436 def test_description_set_raw(self):
1437 out = StringIO.StringIO()
1438 self.mock(git_cl.sys, 'stdout', out)
1439
1440 self.mock(git_cl, 'Changelist', ChangelistMock)
1441 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1442
1443 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1444 self.assertEqual('hihi', ChangelistMock.desc)
1445
[email protected]d605a512016-06-03 09:55:001446 def test_description_appends_bug_line(self):
1447 current_desc = 'Some\n\nChange-Id: xxx'
1448
1449 def RunEditor(desc, _, **kwargs):
1450 self.assertEquals(
1451 '# Enter a description of the change.\n'
1452 '# This will be displayed on the codereview site.\n'
1453 '# The first line will also be used as the subject of the review.\n'
1454 '#--------------------This line is 72 characters long'
1455 '--------------------\n' +
1456 # TODO(tandrii): fix this http://crbug.com/614587.
1457 current_desc + '\n\nBUG=',
1458 desc)
1459 return current_desc + '\n\nBUG='
1460
1461 def UpdateDescriptionRemote(_, desc):
1462 # TODO(tandrii): fix this http://crbug.com/614587.
1463 self.assertEquals(desc, current_desc + '\n\nBUG=')
1464
1465 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1466 self.mock(git_cl.Changelist, 'GetDescription',
1467 lambda *args: current_desc)
1468 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1469 UpdateDescriptionRemote)
1470 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1471
1472 self.calls = [
1473 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1474 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
1475 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1476 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
1477 ((['git', 'config', 'core.editor'],), 'vi'),
1478 ]
1479 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1480
[email protected]d6648e22016-04-29 19:22:161481 def test_description_set_stdin(self):
1482 out = StringIO.StringIO()
1483 self.mock(git_cl.sys, 'stdout', out)
1484
1485 self.mock(git_cl, 'Changelist', ChangelistMock)
1486 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1487
1488 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1489 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
1490
[email protected]9b7fd712016-06-01 13:45:201491 def test_cmd_issue_erase_existing(self):
1492 out = StringIO.StringIO()
1493 self.mock(git_cl.sys, 'stdout', out)
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', '--unset', 'branch.feature.gerritissue'],), ''),
1499 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
1500 # Let this command raise exception (retcode=1) - it should be ignored.
1501 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
1502 '', subprocess2.CalledProcessError(1, '', '', '', '')),
1503 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
1504 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
1505 ''),
1506 ]
1507 self.assertEqual(0, git_cl.main(['issue', '0']))
1508
[email protected]f86c7d32016-04-01 19:27:301509
[email protected]ddd59412011-11-30 14:20:381510if __name__ == '__main__':
[email protected]78936cb2013-04-11 00:17:521511 git_cl.logging.basicConfig(
1512 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
[email protected]ddd59412011-11-30 14:20:381513 unittest.main()