blob: dbcb26af4bd35653d836d589e2cf7a4ab715fb6c [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
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
tandriide281ae2016-10-12 06:02:30 -07009import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010010import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000011import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000012import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000013import sys
14import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000015import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016
17sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
18
19from testing_support.auto_stub import TestCase
20
21import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000022import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000023import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000024import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025
tandrii5d48c322016-08-18 16:19:37 -070026def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
27 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
28
29
30CERR1 = callError(1)
31
32
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000033class ChangelistMock(object):
34 # A class variable so we can access it when we don't have access to the
35 # instance that's being set.
36 desc = ""
37 def __init__(self, **kwargs):
38 pass
39 def GetIssue(self):
40 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080041 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000042 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070043 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000044 ChangelistMock.desc = desc
45
tandrii5d48c322016-08-18 16:19:37 -070046
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000047class PresubmitMock(object):
48 def __init__(self, *args, **kwargs):
49 self.reviewers = []
50 @staticmethod
51 def should_continue():
52 return True
53
54
55class RietveldMock(object):
56 def __init__(self, *args, **kwargs):
57 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000058
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000059 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080060 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000061 return 'Issue: %d' % issue
62
maruel@chromium.org78936cb2013-04-11 00:17:52 +000063 @staticmethod
64 def get_issue_properties(_issue, _messages):
65 return {
66 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
67 'messages': [
68 {
69 'approval': True,
70 'sender': 'john@chromium.org',
71 },
72 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010073 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000074 }
75
iannuccie53c9352016-08-17 14:40:40 -070076 @staticmethod
77 def close_issue(_issue):
78 return 'Closed'
79
skobes6468b902016-10-24 08:45:10 -070080 @staticmethod
81 def get_patch(issue, patchset):
82 return 'patch set from issue %s patchset %s' % (issue, patchset)
83
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010084 @staticmethod
85 def update_description(_issue, _description):
86 return 'Updated'
87
88 @staticmethod
89 def add_comment(_issue, _comment):
90 return 'Commented'
91
92
93
skobes6468b902016-10-24 08:45:10 -070094
95class GitCheckoutMock(object):
96 def __init__(self, *args, **kwargs):
97 pass
98
99 @staticmethod
100 def reset():
101 GitCheckoutMock.conflict = False
102
103 def apply_patch(self, p):
104 if GitCheckoutMock.conflict:
105 raise Exception('failed')
106
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000107
108class WatchlistsMock(object):
109 def __init__(self, _):
110 pass
111 @staticmethod
112 def GetWatchersForPaths(_):
113 return ['joe@example.com']
114
115
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000116class CodereviewSettingsFileMock(object):
117 def __init__(self):
118 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800119 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000120 def read(self):
121 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000122 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000123
124
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000125class AuthenticatorMock(object):
126 def __init__(self, *_args):
127 pass
128 def has_cached_credentials(self):
129 return True
tandrii221ab252016-10-06 08:12:04 -0700130 def authorize(self, http):
131 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000132
133
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000134def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
135 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
136
137 Usage:
138 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
139 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
140
141 OR
142 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
143 CookiesAuthenticatorMockFactory(cookie='cookie'))
144 """
145 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800146 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 # Intentionally not calling super() because it reads actual cookie files.
148 pass
149 @classmethod
150 def get_gitcookies_path(cls):
151 return '~/.gitcookies'
152 @classmethod
153 def get_netrc_path(cls):
154 return '~/.netrc'
155 def get_auth_header(self, host):
156 if same_cookie:
157 return same_cookie
158 return (hosts_with_creds or {}).get(host)
159 return CookiesAuthenticatorMock
160
kmarshall9249e012016-08-23 12:02:16 -0700161class MockChangelistWithBranchAndIssue():
162 def __init__(self, branch, issue):
163 self.branch = branch
164 self.issue = issue
165 def GetBranch(self):
166 return self.branch
167 def GetIssue(self):
168 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000169
tandriic2405f52016-10-10 08:13:15 -0700170
171class SystemExitMock(Exception):
172 pass
173
174
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000175class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100176 def test_get_description(self):
177 cl = git_cl.Changelist(issue=1, codereview='rietveld',
178 codereview_host='host')
179 cl.description = 'x'
180 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800181 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100182 self.assertEquals(cl.GetDescription(), 'x')
183 self.assertEquals(cl.GetDescription(force=True), 'y')
184 self.assertEquals(cl.GetDescription(), 'y')
185
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000186 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
187 parsed = urlparse.urlparse(url)
188 result = func(parsed)
189 if fail:
190 self.assertIsNone(result)
191 return None
192 self.assertIsNotNone(result)
193 self.assertEqual(result.issue, issue)
194 self.assertEqual(result.patchset, patchset)
195 self.assertEqual(result.hostname, hostname)
196 return result
197
198 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700199 def test(url, issue=None, patchset=None, hostname=None, fail=None):
200 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000201 git_cl._RietveldChangelistImpl.ParseIssueURL,
202 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000203
204 test('http://codereview.chromium.org/123',
205 123, None, 'codereview.chromium.org')
206 test('https://codereview.chromium.org/123',
207 123, None, 'codereview.chromium.org')
208 test('https://codereview.chromium.org/123/',
209 123, None, 'codereview.chromium.org')
210 test('https://codereview.chromium.org/123/whatever',
211 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700212 test('https://codereview.chromium.org/123/#ps20001',
213 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000214 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700215 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000216 # This looks like bad Gerrit, but is actually valid Rietveld.
217 test('https://chrome-review.source.com/123/4/',
218 123, None, 'chrome-review.source.com')
219
220 test('https://codereview.chromium.org/deadbeaf', fail=True)
221 test('https://codereview.chromium.org/api/123', fail=True)
222 test('bad://codereview.chromium.org/123', fail=True)
223 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
224
225 def test_ParseIssueURL_gerrit(self):
226 def test(url, issue=None, patchset=None, hostname=None, fail=None):
227 self._test_ParseIssueUrl(
228 git_cl._GerritChangelistImpl.ParseIssueURL,
229 url, issue, patchset, hostname, fail)
230
231 test('http://chrome-review.source.com/c/123',
232 123, None, 'chrome-review.source.com')
233 test('https://chrome-review.source.com/c/123/',
234 123, None, 'chrome-review.source.com')
235 test('https://chrome-review.source.com/c/123/4',
236 123, 4, 'chrome-review.source.com')
237 test('https://chrome-review.source.com/#/c/123/4',
238 123, 4, 'chrome-review.source.com')
239 test('https://chrome-review.source.com/c/123/4',
240 123, 4, 'chrome-review.source.com')
241 test('https://chrome-review.source.com/123',
242 123, None, 'chrome-review.source.com')
243 test('https://chrome-review.source.com/123/4',
244 123, 4, 'chrome-review.source.com')
245
246 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
247 test('https://chrome-review.source.com/c/abc/', fail=True)
248 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
249
250 def test_ParseIssueNumberArgument(self):
251 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
252 result = git_cl.ParseIssueNumberArgument(arg)
253 self.assertIsNotNone(result)
254 if fail:
255 self.assertFalse(result.valid)
256 else:
257 self.assertEqual(result.issue, issue)
258 self.assertEqual(result.patchset, patchset)
259 self.assertEqual(result.hostname, hostname)
260
261 test('123', 123)
262 test('', fail=True)
263 test('abc', fail=True)
264 test('123/1', fail=True)
265 test('123a', fail=True)
266 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
267 # Rietveld.
268 test('https://codereview.source.com/123',
269 123, None, 'codereview.source.com')
270 test('https://codereview.source.com/www123', fail=True)
271 # Gerrrit.
272 test('https://chrome-review.source.com/c/123/4',
273 123, 4, 'chrome-review.source.com')
274 test('https://chrome-review.source.com/bad/123/4', fail=True)
275
tandriif9aefb72016-07-01 09:06:51 -0700276 def test_get_bug_line_values(self):
277 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
278 self.assertEqual(f('', ''), [])
279 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
280 self.assertEqual(f('v8', '456'), ['v8:456'])
281 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
282 # Not nice, but not worth carying.
283 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
284 ['v8:456', 'chromium:123', 'v8:123'])
285
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100286 def _test_git_number(self, parent_msg, dest_ref, child_msg,
287 parent_hash='parenthash'):
288 desc = git_cl.ChangeDescription(child_msg)
289 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
290 return desc.description
291
292 def assertEqualByLine(self, actual, expected):
293 self.assertEqual(actual.splitlines(), expected.splitlines())
294
295 def test_git_number_bad_parent(self):
296 with self.assertRaises(ValueError):
297 self._test_git_number('Parent', 'refs/heads/master', 'Child')
298
299 def test_git_number_bad_parent_footer(self):
300 with self.assertRaises(AssertionError):
301 self._test_git_number(
302 'Parent\n'
303 '\n'
304 'Cr-Commit-Position: wrong',
305 'refs/heads/master', 'Child')
306
307 def test_git_number_bad_lineage_ignored(self):
308 actual = self._test_git_number(
309 'Parent\n'
310 '\n'
311 'Cr-Commit-Position: refs/heads/master@{#1}\n'
312 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
313 'refs/heads/master', 'Child')
314 self.assertEqualByLine(
315 actual,
316 'Child\n'
317 '\n'
318 'Cr-Commit-Position: refs/heads/master@{#2}\n'
319 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
320
321 def test_git_number_same_branch(self):
322 actual = self._test_git_number(
323 'Parent\n'
324 '\n'
325 'Cr-Commit-Position: refs/heads/master@{#12}',
326 dest_ref='refs/heads/master',
327 child_msg='Child')
328 self.assertEqualByLine(
329 actual,
330 'Child\n'
331 '\n'
332 'Cr-Commit-Position: refs/heads/master@{#13}')
333
334 def test_git_number_same_branch_with_originals(self):
335 actual = self._test_git_number(
336 'Parent\n'
337 '\n'
338 'Cr-Commit-Position: refs/heads/master@{#12}',
339 dest_ref='refs/heads/master',
340 child_msg='Child\n'
341 '\n'
342 'Some users are smart and insert their own footers\n'
343 '\n'
344 'Cr-Whatever: value\n'
345 'Cr-Commit-Position: refs/copy/paste@{#22}')
346 self.assertEqualByLine(
347 actual,
348 'Child\n'
349 '\n'
350 'Some users are smart and insert their own footers\n'
351 '\n'
352 'Cr-Original-Whatever: value\n'
353 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
354 'Cr-Commit-Position: refs/heads/master@{#13}')
355
356 def test_git_number_new_branch(self):
357 actual = self._test_git_number(
358 'Parent\n'
359 '\n'
360 'Cr-Commit-Position: refs/heads/master@{#12}',
361 dest_ref='refs/heads/branch',
362 child_msg='Child')
363 self.assertEqualByLine(
364 actual,
365 'Child\n'
366 '\n'
367 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
368 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
369
370 def test_git_number_lineage(self):
371 actual = self._test_git_number(
372 'Parent\n'
373 '\n'
374 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
375 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
376 dest_ref='refs/heads/branch',
377 child_msg='Child')
378 self.assertEqualByLine(
379 actual,
380 'Child\n'
381 '\n'
382 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
383 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
384
385 def test_git_number_moooooooore_lineage(self):
386 actual = self._test_git_number(
387 'Parent\n'
388 '\n'
389 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
390 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
391 dest_ref='refs/heads/mooore',
392 child_msg='Child')
393 self.assertEqualByLine(
394 actual,
395 'Child\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
398 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
399 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
400
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100401 def test_git_number_ever_moooooooore_lineage(self):
402 self.maxDiff = 10000
403 actual = self._test_git_number(
404 'CQ commit on fresh new branch + numbering.\n'
405 '\n'
406 'NOTRY=True\n'
407 'NOPRESUBMIT=True\n'
408 'BUG=\n'
409 '\n'
410 'Review-Url: https://codereview.chromium.org/2577703003\n'
411 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
412 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
413 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
414 dest_ref='refs/heads/gnumb-test/cl',
415 child_msg='git cl on fresh new branch + numbering.\n'
416 '\n'
417 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
418 self.assertEqualByLine(
419 actual,
420 'git cl on fresh new branch + numbering.\n'
421 '\n'
422 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
423 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
424 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
425 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
426 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100427
428 def test_git_number_cherry_pick(self):
429 actual = self._test_git_number(
430 'Parent\n'
431 '\n'
432 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
433 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
434 dest_ref='refs/heads/branch',
435 child_msg='Child, which is cherry-pick from master\n'
436 '\n'
437 'Cr-Commit-Position: refs/heads/master@{#100}\n'
438 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
439 self.assertEqualByLine(
440 actual,
441 'Child, which is cherry-pick from master\n'
442 '\n'
443 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
444 '\n'
445 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
446 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
447 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
448
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000449
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000450class TestGitCl(TestCase):
451 def setUp(self):
452 super(TestGitCl, self).setUp()
453 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700454 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000455 self.mock(subprocess2, 'call', self._mocked_call)
456 self.mock(subprocess2, 'check_call', self._mocked_call)
457 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700458 self.mock(subprocess2, 'communicate',
459 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000460 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000461 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000462 self.mock(git_common, 'get_or_create_merge_base',
463 lambda *a: (
464 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000465 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000466 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100467 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
468 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700469 self.mock(git_cl, 'write_json', lambda path, contents:
470 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000471 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000472 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000473 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700474 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
475 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000476 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000477 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000478 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100479 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
480 lambda *args, **kwargs: self._mocked_call(
481 'GetChangeDetail', *args, **kwargs))
482 self.mock(git_cl.gerrit_util, 'AddReviewers',
483 lambda h, i, add, is_reviewer, notify: self._mocked_call(
484 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000485 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
486 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700487 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100488 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000489 # It's important to reset settings to not have inter-tests interference.
490 git_cl.settings = None
491
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000492
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000493 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000494 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100495 self.assertEquals([], self.calls)
496 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000497 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100498 raise
499 # Sadly, has_failed() returns True if this OR any other tests before this
500 # one have failed.
501 git_cl.logging.exception(
502 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
503 'There are un-consumed self.calls after this test has finished.\n'
504 'If you don\'t know which test this is, run:\n'
Mark Mentovai57c47212017-03-09 11:14:09 -0500505 ' tests/git_cl_test.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100506 '\n'
507 'If you are already running just this single test, then **first** '
508 'fix the problem whose exception is emitted below by unittest '
509 'runner.\n'
510 '\n'
511 'Else, to be sure what\'s going on, run this test **alone** with \n'
Mark Mentovai57c47212017-03-09 11:14:09 -0500512 ' tests/git_cl_test.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100513 'and follow instructions above.\n' +
514 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000515 finally:
516 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000517
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000518 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000519 self.assertTrue(
520 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700521 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000522 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000523 expected_args, result = top
524
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000525 # Also logs otherwise it could get caught in a try/finally and be hard to
526 # diagnose.
527 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700528 N = 5
529 prior_calls = '\n '.join(
530 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
531 for i, c in enumerate(self._calls_done[-N:]))
532 following_calls = '\n '.join(
533 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
534 for i, c in enumerate(self.calls[:N]))
535 extended_msg = (
536 'A few prior calls:\n %s\n\n'
537 'This (expected):\n @%d: %r\n'
538 'This (actual):\n @%d: %r\n\n'
539 'A few following expected calls:\n %s' %
540 (prior_calls, len(self._calls_done), expected_args,
541 len(self._calls_done), args, following_calls))
542 git_cl.logging.error(extended_msg)
543
tandrii99a72f22016-08-17 14:33:24 -0700544 self.fail('@%d\n'
545 ' Expected: %r\n'
546 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700547 len(self._calls_done), expected_args, args))
548
549 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700550 if isinstance(result, Exception):
551 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000552 return result
553
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100554 def test_ask_for_explicit_yes_true(self):
555 self.calls = [
556 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
557 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
558 ]
559 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
560
561 def test_ask_for_explicit_yes_true(self):
562 self.calls = [
563 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
564 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
565 ]
566 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
567
tandrii48df5812016-10-17 03:55:37 -0700568 def test_LoadCodereviewSettingsFromFile_gerrit(self):
569 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
570 self.calls = [
571 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
572 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
573 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
574 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
Mark Mentovai57c47212017-03-09 11:14:09 -0500575 ((['git', 'config', '--unset-all', 'rietveld.bug-line-format'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700576 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
577 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700578 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
579 CERR1),
580 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700581 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
582 CERR1),
583 ((['git', 'config', 'gerrit.host', 'true'],), ''),
584 ]
585 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
586
maruel@chromium.orga3353652011-11-30 14:26:57 +0000587 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000588 def _is_gerrit_calls(cls, gerrit=False):
589 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
590 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
591
592 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000593 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000594 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000595 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000596
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000597 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000598 def _upload_no_rev_calls(cls, similarity, find_copies):
599 return (cls._git_base_calls(similarity, find_copies) +
600 cls._git_upload_no_rev_calls())
601
602 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000603 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000604 if similarity is None:
605 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700606 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700607 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000608 else:
tandrii33a46ff2016-08-23 05:53:40 -0700609 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700610 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000611
612 if find_copies is None:
613 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700614 find_copies_call = ((['git', 'config', '--bool',
615 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000616 else:
tandrii5d48c322016-08-18 16:19:37 -0700617 val = str(find_copies).lower()
618 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000619 'branch.master.git-find-copies', val],), '')
620
621 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000622 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800623 '-l100000', '-C'+similarity,
624 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000625 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000626 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000627 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000628
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000629 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000630 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000631 similarity_call,
632 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
633 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000634 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000635 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700636 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
637 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000638 ((['git', 'config', 'rietveld.server'],),
639 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000640 ((['git', 'config', 'branch.master.merge'],), 'master'),
641 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000642 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000643 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000644 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000645 ((['git', 'rev-parse', '--show-cdup'],), ''),
646 ((['git', 'rev-parse', 'HEAD'],), '12345'),
647 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000648 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000649 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700650 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000651 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000652 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000653 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000654 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000655 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000656 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000657 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000658 'desc\n'),
Mark Mentovai57c47212017-03-09 11:14:09 -0500659 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
660 ((['git', 'config', 'rietveld.bug-line-format'],), CERR1),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000661 ]
662
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000663 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000664 def _git_upload_no_rev_calls(cls):
665 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000666 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000667 ]
668
669 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000670 def _git_upload_calls(cls, private):
671 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000672 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000673 private_call = []
674 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000675 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000676 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000677 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000678
maruel@chromium.orga3353652011-11-30 14:26:57 +0000679 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000680 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000681 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000682 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800683 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000684 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700685 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000686 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000687 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000688 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700689 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000690 ] + cls._git_post_upload_calls()
691
692 @classmethod
693 def _git_post_upload_calls(cls):
694 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000695 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
696 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
697 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000698 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000699 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000700 ]
701
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000702 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000703 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000704 fake_ancestor = 'fake_ancestor'
705 fake_cl = 'fake_cl_for_patch'
706 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000707 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000708 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000709 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000710 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000711 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000712 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000713 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000714 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700715 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000716 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000717 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000718 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000719 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000720 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000721 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000722 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000723 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000724 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000725 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000726 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000727
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000728 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700729 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000730 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000731 return [
732 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000733 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000734 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000735 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700736 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000737 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000738 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100739 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000740 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000741 ]
742
743 def _run_reviewer_test(
744 self,
745 upload_args,
746 expected_description,
747 returned_description,
748 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000749 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700750 private=False,
751 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000752 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000753 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000754 try:
755 similarity = upload_args[upload_args.index('--similarity')+1]
756 except ValueError:
757 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000758
759 if '--find-copies' in upload_args:
760 find_copies = True
761 elif '--no-find-copies' in upload_args:
762 find_copies = False
763 else:
764 find_copies = None
765
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000766 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700767 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000768
769 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000770
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000771 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000772 self.assertEquals(
773 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000774 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000775 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000776 '#--------------------This line is 72 characters long'
777 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000778 expected_description,
779 desc)
780 return returned_description
781 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000782
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000783 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000784 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700785 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000786 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000787 return 1, 2
788 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000789
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000790 git_cl.main(['upload'] + upload_args)
791
792 def test_no_reviewer(self):
793 self._run_reviewer_test(
794 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000795 'desc\n\nBUG=',
796 '# Blah blah comment.\ndesc\n\nBUG=',
797 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000798 [])
799
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000800 def test_keep_similarity(self):
801 self._run_reviewer_test(
802 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000803 'desc\n\nBUG=',
804 '# Blah blah comment.\ndesc\n\nBUG=',
805 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000806 [])
807
iannucci@chromium.org79540052012-10-19 23:15:26 +0000808 def test_keep_find_copies(self):
809 self._run_reviewer_test(
810 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000811 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000812 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000813 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000814 [])
815
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000816 def test_private(self):
817 self._run_reviewer_test(
818 ['--private'],
819 'desc\n\nBUG=',
820 '# Blah blah comment.\ndesc\n\nBUG=\n',
821 'desc\n\nBUG=',
822 [])
823
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000824 def test_reviewers_cmd_line(self):
825 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000826 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000827 self._run_reviewer_test(
828 ['-r' 'foo@example.com'],
829 description,
830 '\n%s\n' % description,
831 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000832 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000833
834 def test_reviewer_tbr_overriden(self):
835 # Reviewer is overriden with TBR
836 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000837 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 self._run_reviewer_test(
839 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000840 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000841 description.strip('\n'),
842 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000843 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000844
845 def test_reviewer_multiple(self):
846 # Handles multiple R= or TBR= lines.
847 description = (
bradnelsond975b302016-10-23 12:20:23 -0700848 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
849 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000850 self._run_reviewer_test(
851 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000852 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000853 description,
854 description,
bradnelsond975b302016-10-23 12:20:23 -0700855 ['--reviewers=another@example.com,reviewer@example.com'],
856 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000857
maruel@chromium.orga3353652011-11-30 14:26:57 +0000858 def test_reviewer_send_mail(self):
859 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000860 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000861 self._run_reviewer_test(
862 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000863 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000864 description.strip('\n'),
865 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000866 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000867
868 def test_reviewer_send_mail_no_rev(self):
869 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000870 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700871 self.calls = self._upload_no_rev_calls(None, None) + [
872 ((['DieWithError', 'Must specify reviewers to send email.'],),
873 SystemExitMock())
874 ]
875
876 def RunEditor(desc, _, **kwargs):
877 return desc
878 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
879 self.mock(sys, 'stdout', stdout)
880 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000881 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700882 self.assertEqual(
883 'Using 50% similarity for rename/copy detection. Override with '
884 '--similarity.\n',
885 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000886
tandriif9aefb72016-07-01 09:06:51 -0700887 def test_bug_on_cmd(self):
888 self._run_reviewer_test(
889 ['--bug=500658,proj:123'],
890 'desc\n\nBUG=500658\nBUG=proj:123',
891 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
892 'desc\n\nBUG=500658\nBUG=proj:1234',
893 [])
894
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100895 def _land_rietveld_common(self, debug=False):
896 if debug:
897 # Very useful due to finally clause in git cl land raising exceptions and
898 # shadowing real cause of failure.
899 self.mock(git_cl, '_IS_BEING_TESTED', True)
900 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100901 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100902
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100903 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
904 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100905 self.mock(RietveldMock, 'update_description', staticmethod(
906 lambda i, d: self._mocked_call(['update_description', i, d])))
907 self.mock(RietveldMock, 'add_comment', staticmethod(
908 lambda i, c: self._mocked_call(['add_comment', i, c])))
909 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100910 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
911 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
912 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
913 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
914 CERR1),
915 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
916 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800917 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100918 ((['git', 'config', 'rietveld.server'],),
919 'https://codereview.chromium.org'),
920 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
921 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
922 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
923 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100924 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
925 ''), # No commits to rebase, according to local view of origin.
926 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
927 'fake_ancestor_sha'),
928 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
929 ((['git', 'rev-parse', '--show-cdup'],), ''),
930 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
931 ((['git', 'diff', '--name-status', '--no-renames', '-r',
932 'fake_ancestor_sha...', '.'],),
933 'M\tfile1.cpp'),
934 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
935 ((['git', 'config', 'branch.feature.rietveldserver'],),
936 'https://codereview.chromium.org'),
937 ((['git', 'config', 'user.email'],), 'user@e.mail'),
938 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
939 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
940 'fake_ancestor_sha', 'feature'],),
941 # This command just prints smth like this:
942 # file1.cpp | 53 ++++++--
943 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
944 ''),
945 ((['git', 'show-ref', '--quiet', '--verify',
946 'refs/heads/git-cl-commit'],),
947 ''), # 0 return code means branch exists.
948 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
949 ((['git', 'show-ref', '--quiet', '--verify',
950 'refs/heads/git-cl-cherry-pick'],),
951 CERR1), # This means git-cl-cherry-pick branch does not exist.
952 ((['git', 'rev-parse', '--show-cdup'],), ''),
953 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
954 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
955 ((['git', 'commit', '-m',
956 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100957 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100958 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
959 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
960 ((['git', 'config', '--get', 'remote.origin.url'],),
961 'https://chromium.googlesource.com/infra/infra'),
962 ]
963
964 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100965 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100966 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100967 ((['git', 'config', 'remote.origin.url'],),
968 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100969 (('_is_git_numberer_enabled',
970 'https://chromium.googlesource.com/infra/infra',
971 'refs/heads/master'),
972 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100973 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
974 ''),
975 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
976 ((['git', 'checkout', '-q', 'feature'],), ''),
977 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
978 ((['git', 'config', 'rietveld.viewvc-url'],),
979 'https://chromium.googlesource.com/infra/infra/+/'),
980 ((['update_description', 123,
981 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
982 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
983 ''),
984 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
985 'fake_sha_rebased (presubmit successful).'],), ''),
986 ]
987 git_cl.main(['land'])
988
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100989 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100990 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100991
992 # Special mocks to check validity of timestamp.
993 original_git_amend_head = git_cl._git_amend_head
994 def _git_amend_head_mock(msg, tstamp):
995 self._mocked_call(['git_amend_head committer timestamp', tstamp])
996 return original_git_amend_head(msg, tstamp)
997 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
998
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100999 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001000 ((['git', 'config', 'remote.origin.url'],),
1001 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001002 (('_is_git_numberer_enabled',
1003 'https://chromium.googlesource.com/chromium/src',
1004 'refs/heads/master'),
1005 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001006 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1007 'This is parent commit.\n'
1008 '\n'
1009 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1010 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001011 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1012 '1480022355'), # Committer's unix timestamp.
1013 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1014 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001015
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001016 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001017 ((['git', 'commit', '--amend', '-m',
1018 'Issue: 123\n\nR=john@chromium.org\n'
1019 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001020 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001021 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1022 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1023
1024 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1025 ''),
1026 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1027 ((['git', 'checkout', '-q', 'feature'],), ''),
1028 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1029 ((['git', 'config', 'rietveld.viewvc-url'],),
1030 'https://chromium.googlesource.com/infra/infra/+/'),
1031 ((['update_description', 123,
1032 'Issue: 123\n\nR=john@chromium.org\n'
1033 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001034 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001035 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1036 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1037 'Committed: '
1038 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1039 ''),
1040 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1041 'fake_sha_rebased (presubmit successful).'],), ''),
1042 ]
1043 git_cl.main(['land'])
1044
1045 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001046 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001047 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001048 ((['git', 'config', 'remote.origin.url'],),
1049 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001050 (('_is_git_numberer_enabled',
1051 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1052 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001053
1054 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1055 'This is parent commit with no footer.'),
1056
1057 ((['git', 'checkout', '-q', 'feature'],), ''),
1058 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1059 ]
1060 with self.assertRaises(ValueError) as cm:
1061 git_cl.main(['land'])
1062 self.assertEqual(cm.exception.message,
1063 'Unable to infer commit position from footers')
1064
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001065 def test_git_numberer_not_whitelisted_repo(self):
1066 self.calls = []
1067 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001068 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1069 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001070 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001071
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001072 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001073 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1074 self.calls = [
1075 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001076 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001077 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001078 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001079 remote_url='https://chromium.googlesource.com/chromium/src',
1080 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001081 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001082
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001083 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001084 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001085 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001086 def fake_temporary_directory(**kwargs):
1087 yield tempdir
1088 self.mock(git_cl.gclient_utils, 'temporary_directory',
1089 fake_temporary_directory)
1090 self._test_GitNumbererState_valid_configs_inner(tempdir)
1091
1092 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001093 self.calls = [
1094 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001095 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001096 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1097 '''
1098 [plugin "git-numberer"]
1099 validate-enabled-refglob = refs/else/*
1100 validate-enabled-refglob = refs/heads/*
1101 validate-disabled-refglob = refs/heads/disabled
1102 validate-disabled-refglob = refs/branch-heads/*
1103 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001104 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1105 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001106 'refs/else/*\n'
1107 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001108 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1109 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001110 'refs/heads/disabled\n'
1111 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001112 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001113
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001114 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001115 remote_url='https://chromium.googlesource.com/chromium/src',
1116 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001117 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001118
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001119 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001120 remote_url='https://chromium.googlesource.com/chromium/src',
1121 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001122 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001123
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001124 # Validator is disabled by default, even if it's not explicitely in disabled
1125 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001126 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001127 remote_url='https://chromium.googlesource.com/chromium/src',
1128 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001129 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001130
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001131 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001132 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001133 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001134 if skip_auth_check:
1135 return [((cmd, ), 'true')]
1136
tandrii5d48c322016-08-18 16:19:37 -07001137 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001138 if issue:
1139 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001140 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001141 ])
1142 calls.extend([
1143 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1144 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1145 ((['git', 'config', 'remote.origin.url'],),
1146 'https://chromium.googlesource.com/my/repo'),
1147 ((['git', 'config', 'remote.origin.url'],),
1148 'https://chromium.googlesource.com/my/repo'),
1149 ])
1150 return calls
1151
1152 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001153 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
1154 fetched_status=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001155 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001156 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001157 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001158 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001159 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001160 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1161 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001162 ]
1163 calls += cls._is_gerrit_calls(True)
1164 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001165 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001166 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1167 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001168 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001169 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001170 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001171 ((['get_or_create_merge_base', 'master',
1172 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001173 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001174 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001175 ]
1176 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1177
1178 if issue:
1179 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001180 (('GetChangeDetail', 'chromium-review.googlesource.com',
1181 '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
1182 {
1183 'change_id': '123456789',
1184 'current_revision': 'sha1_of_current_revision',
1185 'revisions': { 'sha1_of_current_revision': {
1186 'commit': {'message': fetched_description},
1187 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001188 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001189 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001190 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001191 if fetched_status == 'ABANDONED':
1192 calls += [
1193 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1194 '123456 has been abandoned, new uploads are not '
1195 'allowed'), SystemExitMock()),
1196 ]
1197 return calls
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001198
1199 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1200 get_remote_branch=False)
1201 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001202 ((['git', 'rev-parse', '--show-cdup'],), ''),
1203 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001204
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001205 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001206 'diff', '--name-status', '--no-renames', '-r',
1207 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001208 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001209 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001210 ]
1211
1212 if not issue:
1213 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001214 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001215 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001216 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001217 ]
1218
1219 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001220 ((['git', 'config', 'user.email'],), 'me@example.com'),
1221 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001222 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1223 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001224 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001225 ]
1226 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001227
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001228 @classmethod
1229 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001230 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001231 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001232 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001233 post_amend_description=None, issue=None, cc=None,
1234 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001235 if post_amend_description is None:
1236 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001237 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001238 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001239
tandriia60502f2016-06-20 02:01:53 -07001240 if squash_mode == 'default':
1241 calls.extend([
1242 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1243 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1244 ])
1245 elif squash_mode in ('override_squash', 'override_nosquash'):
1246 calls.extend([
1247 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1248 'true' if squash_mode == 'override_squash' else 'false'),
1249 ])
1250 else:
1251 assert squash_mode in ('squash', 'nosquash')
1252
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001253 # If issue is given, then description is fetched from Gerrit instead.
1254 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001255 calls += [
1256 ((['git', 'log', '--pretty=format:%s\n\n%b',
1257 'fake_ancestor_sha..HEAD'],),
1258 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001259 if squash:
1260 title = 'Initial_upload'
1261 else:
1262 if not title:
1263 calls += [
1264 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001265 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001266 ]
1267 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001268 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001269 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001270 # DownloadGerritHook(False)
1271 ((False, ),
1272 ''),
1273 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001274 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001275 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001276 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001277 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001278 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001279 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001280 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001281 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001282 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001283 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001284 if not issue:
1285 # Prompting to edit description on first upload.
1286 calls += [
1287 ((['git', 'config', 'core.editor'],), ''),
1288 ((['RunEditor'],), description),
1289 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001290 ref_to_push = 'abcdef0123456789'
1291 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001292 ((['git', 'config', 'branch.master.merge'],),
1293 'refs/heads/master'),
1294 ((['git', 'config', 'branch.master.remote'],),
1295 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001296 ((['get_or_create_merge_base', 'master',
1297 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001298 'origin/master'),
1299 ((['git', 'rev-parse', 'HEAD:'],),
1300 '0123456789abcdef'),
1301 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001302 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001303 ref_to_push),
1304 ]
1305 else:
1306 ref_to_push = 'HEAD'
1307
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001308 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001309 ((['git', 'rev-list',
1310 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001311 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001312
Aaron Gable9b713dd2016-12-14 16:04:21 -08001313 if title:
1314 if ref_suffix:
1315 ref_suffix += ',m=' + title
1316 else:
1317 ref_suffix = '%m=' + title
1318
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001319 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1320 if ref_suffix:
1321 ref_suffix += ',' + notify_suffix
1322 else:
1323 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001324
ukai@chromium.orge8077812012-02-03 03:41:46 +00001325 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001326 ref_suffix += ',' + ','.join('r=%s' % email
1327 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001328
1329 if git_mirror is None:
1330 calls += [
1331 ((['git', 'config', 'remote.origin.url'],),
1332 'https://chromium.googlesource.com/yyy/zzz'),
1333 ]
1334 else:
1335 calls += [
1336 ((['git', 'config', 'remote.origin.url'],),
1337 '/cache/this-dir-exists'),
1338 (('os.path.isdir', '/cache/this-dir-exists'),
1339 True),
1340 # Runs in /cache/this-dir-exists.
1341 ((['git', 'config', 'remote.origin.url'],),
1342 'https://chromium.googlesource.com/yyy/zzz'),
1343 ]
1344
ukai@chromium.orge8077812012-02-03 03:41:46 +00001345 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001346 ((['git', 'push',
1347 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001348 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001349 ('remote:\n'
1350 'remote: Processing changes: (\)\n'
1351 'remote: Processing changes: (|)\n'
1352 'remote: Processing changes: (/)\n'
1353 'remote: Processing changes: (-)\n'
1354 'remote: Processing changes: new: 1 (/)\n'
1355 'remote: Processing changes: new: 1, done\n'
1356 'remote:\n'
1357 'remote: New Changes:\n'
1358 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1359 'remote:\n'
1360 'To https://chromium.googlesource.com/yyy/zzz\n'
1361 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001362 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001363 if squash:
1364 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001365 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001366 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001367 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001368 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001369 ((['git', 'config', 'branch.master.gerritsquashhash',
1370 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001371 ]
tandrii88189772016-09-29 04:29:57 -07001372 calls += [
1373 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001374 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001375 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001376 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001377 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001378 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001379 return calls
1380
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001381 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001382 self,
1383 upload_args,
1384 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001385 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001386 squash=True,
1387 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001388 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001389 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001390 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001391 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001392 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001393 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001394 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001395 git_mirror=None,
1396 fetched_status=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001397 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001398 if squash_mode is None:
1399 if '--no-squash' in upload_args:
1400 squash_mode = 'nosquash'
1401 elif '--squash' in upload_args:
1402 squash_mode = 'squash'
1403 else:
1404 squash_mode = 'default'
1405
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001406 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001407 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001408 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001409 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001410 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001411 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1412 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001413 self.mock(git_cl.gclient_utils, 'RunEditor',
1414 lambda *_, **__: self._mocked_call(['RunEditor']))
1415 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1416
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001417 original_os_path_isdir = os.path.isdir
1418 def selective_os_path_isdir_mock(path):
1419 if path == '/cache/this-dir-exists':
1420 return self._mocked_call('os.path.isdir', path)
1421 return original_os_path_isdir(path)
1422 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1423
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001424 self.calls = self._gerrit_base_calls(
1425 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001426 fetched_description=description,
1427 fetched_status=fetched_status)
1428 if fetched_status != 'ABANDONED':
1429 self.calls += self._gerrit_upload_calls(
1430 description, reviewers, squash,
1431 squash_mode=squash_mode,
1432 expected_upstream_ref=expected_upstream_ref,
1433 ref_suffix=ref_suffix, title=title, notify=notify,
1434 post_amend_description=post_amend_description,
1435 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001436 # Uncomment when debugging.
1437 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001438 git_cl.main(['upload'] + upload_args)
1439
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001440 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001441 self._run_gerrit_upload_test(
1442 ['--no-squash'],
1443 'desc\n\nBUG=\n',
1444 [],
1445 squash=False,
1446 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1447
1448 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001449 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001450 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001451 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001452 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001453 [],
tandriia60502f2016-06-20 02:01:53 -07001454 squash=False,
1455 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001456 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001457
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001458 def test_gerrit_no_reviewer(self):
1459 self._run_gerrit_upload_test(
1460 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001461 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001462 [],
1463 squash=False,
1464 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001465
tandriieefe8322016-08-17 10:12:24 -07001466 def test_gerrit_patch_bad_chars(self):
1467 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001468 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001469 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001470 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001471 squash=False,
1472 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001473 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001474 self.assertIn(
1475 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001476 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1477 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001478 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001479
ukai@chromium.orge8077812012-02-03 03:41:46 +00001480 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001481 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001482 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001483 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001484 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001485 squash=False,
1486 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001487 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001488
1489 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001490 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001491 [],
bradnelsond975b302016-10-23 12:20:23 -07001492 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1493 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001494 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001495 ['reviewer@example.com', 'another@example.com'],
1496 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001497 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001498 ref_suffix='%l=Code-Review+1',
1499 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001500
1501 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001502 self._run_gerrit_upload_test(
1503 [],
1504 'desc\nBUG=\n\nChange-Id: 123456789',
1505 [],
1506 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001507
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001508 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001509 self._run_gerrit_upload_test(
1510 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001511 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001512 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001513 squash=True,
1514 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001515
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001516 def test_gerrit_upload_squash_first_with_mirror(self):
1517 self._run_gerrit_upload_test(
1518 ['--squash'],
1519 'desc\nBUG=\n\nChange-Id: 123456789',
1520 [],
1521 squash=True,
1522 expected_upstream_ref='origin/master',
1523 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1524
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001525 def test_gerrit_upload_squash_reupload(self):
1526 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001527 self._run_gerrit_upload_test(
1528 ['--squash'],
1529 description,
1530 [],
1531 squash=True,
1532 expected_upstream_ref='origin/master',
1533 issue=123456)
1534
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001535 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1536 self.mock(git_cl, 'DieWithError',
1537 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1538 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1539 with self.assertRaises(SystemExitMock):
1540 self._run_gerrit_upload_test(
1541 ['--squash'],
1542 description,
1543 [],
1544 squash=True,
1545 expected_upstream_ref='origin/master',
1546 issue=123456,
1547 fetched_status='ABANDONED')
1548
rmistry@google.com2dd99862015-06-22 12:22:18 +00001549 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001550 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001551 def mock_run_git(*args, **_kwargs):
1552 if args[0] == ['for-each-ref',
1553 '--format=%(refname:short) %(upstream:short)',
1554 'refs/heads']:
1555 # Create a local branch dependency tree that looks like this:
1556 # test1 -> test2 -> test3 -> test4 -> test5
1557 # -> test3.1
1558 # test6 -> test0
1559 branch_deps = [
1560 'test2 test1', # test1 -> test2
1561 'test3 test2', # test2 -> test3
1562 'test3.1 test2', # test2 -> test3.1
1563 'test4 test3', # test3 -> test4
1564 'test5 test4', # test4 -> test5
1565 'test6 test0', # test0 -> test6
1566 'test7', # test7
1567 ]
1568 return '\n'.join(branch_deps)
1569 self.mock(git_cl, 'RunGit', mock_run_git)
1570
1571 class RecordCalls:
1572 times_called = 0
1573 record_calls = RecordCalls()
1574 def mock_CMDupload(*args, **_kwargs):
1575 record_calls.times_called += 1
1576 return 0
1577 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1578
1579 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001580 (('ask_for_data', 'This command will checkout all dependent branches '
1581 'and run "git cl upload". Press Enter to continue, '
1582 'or Ctrl+C to abort'), ''),
1583 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001584
1585 class MockChangelist():
1586 def __init__(self):
1587 pass
1588 def GetBranch(self):
1589 return 'test1'
1590 def GetIssue(self):
1591 return '123'
1592 def GetPatchset(self):
1593 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001594 def IsGerrit(self):
1595 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001596
1597 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1598 # CMDupload should have been called 5 times because of 5 dependent branches.
1599 self.assertEquals(5, record_calls.times_called)
1600 self.assertEquals(0, ret)
1601
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001602 def test_gerrit_change_id(self):
1603 self.calls = [
1604 ((['git', 'write-tree'], ),
1605 'hashtree'),
1606 ((['git', 'rev-parse', 'HEAD~0'], ),
1607 'branch-parent'),
1608 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1609 'A B <a@b.org> 1456848326 +0100'),
1610 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1611 'C D <c@d.org> 1456858326 +0100'),
1612 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1613 'hashchange'),
1614 ]
1615 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1616 self.assertEqual(change_id, 'Ihashchange')
1617
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001618 def test_desecription_append_footer(self):
1619 for init_desc, footer_line, expected_desc in [
1620 # Use unique desc first lines for easy test failure identification.
1621 ('foo', 'R=one', 'foo\n\nR=one'),
1622 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1623 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1624 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1625 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1626 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1627 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1628 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1629 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1630 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1631 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1632 ]:
1633 desc = git_cl.ChangeDescription(init_desc)
1634 desc.append_footer(footer_line)
1635 self.assertEqual(desc.description, expected_desc)
1636
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001637 def test_update_reviewers(self):
1638 data = [
1639 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001640 ('foo\nR=xx', [], 'foo\nR=xx'),
1641 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001642 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001643 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1644 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1645 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001646 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001647 ('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 +00001648 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001649 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1650 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1651 # Same as the line before, but full of whitespaces.
1652 (
1653 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1654 'foo\nBar\n\nR=c@c\n BUG =',
1655 ),
1656 # Whitespaces aren't interpreted as new lines.
1657 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001658 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001659 expected = [i[2] for i in data]
1660 actual = []
1661 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001662 obj = git_cl.ChangeDescription(orig)
1663 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001664 actual.append(obj.description)
1665 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001666
wittman@chromium.org455dc922015-01-26 20:15:50 +00001667 def test_get_target_ref(self):
1668 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001669 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001670 self.assertEqual(None, git_cl.GetTargetRef(None,
1671 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001672 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001673
wittman@chromium.org455dc922015-01-26 20:15:50 +00001674 # Check default target refs for branches.
1675 self.assertEqual('refs/heads/master',
1676 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001677 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001678 self.assertEqual('refs/heads/master',
1679 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001680 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001681 self.assertEqual('refs/heads/master',
1682 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001683 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001684 self.assertEqual('refs/branch-heads/123',
1685 git_cl.GetTargetRef('origin',
1686 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001687 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001688 self.assertEqual('refs/diff/test',
1689 git_cl.GetTargetRef('origin',
1690 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001691 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001692 self.assertEqual('refs/heads/chrome/m42',
1693 git_cl.GetTargetRef('origin',
1694 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001695 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001696
1697 # Check target refs for user-specified target branch.
1698 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1699 'refs/remotes/branch-heads/123'):
1700 self.assertEqual('refs/branch-heads/123',
1701 git_cl.GetTargetRef('origin',
1702 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001703 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001704 for branch in ('origin/master', 'remotes/origin/master',
1705 'refs/remotes/origin/master'):
1706 self.assertEqual('refs/heads/master',
1707 git_cl.GetTargetRef('origin',
1708 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001709 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001710 for branch in ('master', 'heads/master', 'refs/heads/master'):
1711 self.assertEqual('refs/heads/master',
1712 git_cl.GetTargetRef('origin',
1713 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001714 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001715
wychen@chromium.orga872e752015-04-28 23:42:18 +00001716 def test_patch_when_dirty(self):
1717 # Patch when local tree is dirty
1718 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1719 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1720
1721 def test_diff_when_dirty(self):
1722 # Do 'git cl diff' when local tree is dirty
1723 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1724 self.assertNotEqual(git_cl.main(['diff']), 0)
1725
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001726 @staticmethod
1727 def _get_gerrit_codereview_server_calls(branch, value=None,
1728 git_short_host='host',
1729 detect_branch=True):
1730 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1731
1732 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1733 """
1734 calls = []
1735 if detect_branch:
1736 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1737 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1738 CERR1 if value is None else value))
1739 if value is None:
1740 calls += [
1741 ((['git', 'config', 'branch.' + branch + '.merge'],),
1742 'refs/heads' + branch),
1743 ((['git', 'config', 'branch.' + branch + '.remote'],),
1744 'origin'),
1745 ((['git', 'config', 'remote.origin.url'],),
1746 'https://%s.googlesource.com/my/repo' % git_short_host),
1747 ]
1748 return calls
1749
tandriidf09a462016-08-18 16:23:55 -07001750 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001751 new_branch=False, git_short_host='host',
1752 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001753 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001754 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1755 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001756 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001757 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001758 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1759
tandriidf09a462016-08-18 16:23:55 -07001760 if new_branch:
1761 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1762 else:
1763 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001764
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001765 if not force_codereview:
1766 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001767 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001768 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001769 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1770 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001771 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001772 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001773
1774 if is_gerrit:
1775 if not force_codereview:
1776 self.calls += [
1777 ((['git', 'config', 'gerrit.host'],), 'true'),
1778 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001779 if detect_gerrit_server:
1780 self.calls += self._get_gerrit_codereview_server_calls(
1781 'master', git_short_host=git_short_host,
1782 detect_branch=not new_branch and force_codereview)
1783
1784 self.calls += [
1785 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001786 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001787 {
1788 'current_revision': '7777777777',
1789 'revisions': {
1790 '1111111111': {
1791 '_number': 1,
1792 'fetch': {'http': {
1793 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1794 'ref': 'refs/changes/56/123456/1',
1795 }},
1796 },
1797 '7777777777': {
1798 '_number': 7,
1799 'fetch': {'http': {
1800 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1801 'ref': 'refs/changes/56/123456/7',
1802 }},
1803 },
1804 },
1805 }),
1806 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001807 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001808 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001809 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001810 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001811 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001812 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001813 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001814
tandriidf09a462016-08-18 16:23:55 -07001815 def _common_patch_successful(self, new_branch=False):
1816 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001817 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001818 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001819 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001820 'patch from issue 123456 at patchset 60001 ' +
1821 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001822 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001823 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001824 ((['git', 'config', 'branch.master.rietveldserver',
1825 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001826 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001827 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001828 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001829
1830 def test_patch_successful(self):
1831 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001832 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1833
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001834 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001835 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001836 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1837
wychen@chromium.orga872e752015-04-28 23:42:18 +00001838 def test_patch_conflict(self):
1839 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001840 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001841 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001842
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001843 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001844 self._patch_common(is_gerrit=True, git_short_host='chromium',
1845 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001846 self.calls += [
1847 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1848 'refs/changes/56/123456/7'],), ''),
1849 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001850 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001851 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001852 ((['git', 'config', 'branch.master.gerritserver',
1853 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001854 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001855 ]
1856 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1857
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001858 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001859 self._patch_common(is_gerrit=True, force_codereview=True,
1860 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001861 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001862 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001863 'refs/changes/56/123456/7'],), ''),
1864 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001865 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001866 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001867 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001868 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001869 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001870 ]
1871 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1872
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001873 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001874 self._patch_common(is_gerrit=True, git_short_host='else',
1875 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001876 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001877 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001878 'refs/changes/56/123456/1'],), ''),
1879 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001880 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001881 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001882 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001883 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001884 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001885 ]
1886 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001887 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001888
1889 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001890 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1891 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001892 self.calls += [
1893 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1894 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001895 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1896 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1897 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001898 ]
1899 with self.assertRaises(SystemExitMock):
1900 git_cl.main(['patch',
1901 'https://chromium-review.googlesource.com/#/c/123456/1'])
1902
tandriic2405f52016-10-10 08:13:15 -07001903 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001904 def notExists(_issue, *_, **kwargs):
1905 self.assertFalse(kwargs['ignore_404'])
1906 raise git_cl.gerrit_util.GerritError(404, '')
1907 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1908
tandriic2405f52016-10-10 08:13:15 -07001909 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001910 self.calls = [
1911 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1912 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1913 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1914 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1915 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1916 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001917 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001918 'or you have no access to it'],), SystemExitMock()),
1919 ]
1920 with self.assertRaises(SystemExitMock):
1921 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1922
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001923 def _checkout_calls(self):
1924 return [
1925 ((['git', 'config', '--local', '--get-regexp',
1926 'branch\\..*\\.rietveldissue'], ),
1927 ('branch.retrying.rietveldissue 1111111111\n'
1928 'branch.some-fix.rietveldissue 2222222222\n')),
1929 ((['git', 'config', '--local', '--get-regexp',
1930 'branch\\..*\\.gerritissue'], ),
1931 ('branch.ger-branch.gerritissue 123456\n'
1932 'branch.gbranch654.gerritissue 654321\n')),
1933 ]
1934
1935 def test_checkout_gerrit(self):
1936 """Tests git cl checkout <issue>."""
1937 self.calls = self._checkout_calls()
1938 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1939 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1940
1941 def test_checkout_rietveld(self):
1942 """Tests git cl checkout <issue>."""
1943 self.calls = self._checkout_calls()
1944 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1945 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1946
1947 def test_checkout_not_found(self):
1948 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001949 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001950 self.calls = self._checkout_calls()
1951 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1952
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001953 def test_checkout_no_branch_issues(self):
1954 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001955 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001956 self.calls = [
1957 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001958 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001959 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001960 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001961 ]
1962 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1963
tandrii@chromium.org28253532016-04-14 13:46:56 +00001964 def _test_gerrit_ensure_authenticated_common(self, auth,
1965 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001966 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1967 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1968 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001969 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001970 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001971 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001972 cl.branch = 'master'
1973 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001974 cl.lookedup_issue = True
1975 return cl
1976
1977 def test_gerrit_ensure_authenticated_missing(self):
1978 cl = self._test_gerrit_ensure_authenticated_common(auth={
1979 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1980 })
1981 self.calls.append(
1982 ((['DieWithError',
1983 'Credentials for the following hosts are required:\n'
1984 ' chromium-review.googlesource.com\n'
1985 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1986 'You can (re)generate your credentails by visiting '
1987 'https://chromium-review.googlesource.com/new-password'],), ''),)
1988 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1989
1990 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001991 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001992 cl = self._test_gerrit_ensure_authenticated_common(auth={
1993 'chromium.googlesource.com': 'one',
1994 'chromium-review.googlesource.com': 'other',
1995 })
1996 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001997 (('ask_for_data', 'If you know what you are doing '
1998 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001999 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2000
2001 def test_gerrit_ensure_authenticated_ok(self):
2002 cl = self._test_gerrit_ensure_authenticated_common(auth={
2003 'chromium.googlesource.com': 'same',
2004 'chromium-review.googlesource.com': 'same',
2005 })
2006 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2007
tandrii@chromium.org28253532016-04-14 13:46:56 +00002008 def test_gerrit_ensure_authenticated_skipped(self):
2009 cl = self._test_gerrit_ensure_authenticated_common(
2010 auth={}, skip_auth_check=True)
2011 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2012
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002013 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002014 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2015 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002016 self.calls = [
2017 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002018 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002019 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2020 ((['git', 'config', 'rietveld.server'],), ''),
2021 ((['git', 'config', 'rietveld.server'],), ''),
2022 ((['git', 'config', 'branch.feature.rietveldserver'],),
2023 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002024 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002025 ]
2026 self.assertEqual(0, git_cl.main(['set-commit']))
2027
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002028 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002029 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002030 lambda h, i, labels, notify=None:
2031 self._mocked_call(['SetReview', h, i, labels, notify]))
2032
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002033 self.calls = [
2034 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002035 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2036 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002037 ((['git', 'config', 'branch.feature.gerritserver'],),
2038 'https://chromium-review.googlesource.com'),
2039 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002040 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002041 ]
tandriid9e5ce52016-07-13 02:32:59 -07002042
2043 def test_cmd_set_commit_gerrit_clear(self):
2044 self._cmd_set_commit_gerrit_common(0)
2045 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2046
2047 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002048 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002049 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2050
tandriid9e5ce52016-07-13 02:32:59 -07002051 def test_cmd_set_commit_gerrit(self):
2052 self._cmd_set_commit_gerrit_common(2)
2053 self.assertEqual(0, git_cl.main(['set-commit']))
2054
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002055 def test_description_display(self):
2056 out = StringIO.StringIO()
2057 self.mock(git_cl.sys, 'stdout', out)
2058
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002059 self.mock(git_cl, 'Changelist', ChangelistMock)
2060 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002061
2062 self.assertEqual(0, git_cl.main(['description', '-d']))
2063 self.assertEqual('foo\n', out.getvalue())
2064
2065 def test_description_rietveld(self):
2066 out = StringIO.StringIO()
2067 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002068 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002069
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002070 self.assertEqual(0, git_cl.main([
2071 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2072 self.assertEqual('foobar\n', out.getvalue())
2073
iannucci3c972b92016-08-17 13:24:10 -07002074 def test_StatusFieldOverrideIssueMissingArgs(self):
2075 out = StringIO.StringIO()
2076 self.mock(git_cl.sys, 'stderr', out)
2077
2078 try:
2079 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2080 except SystemExit as ex:
2081 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002082 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002083
2084 out = StringIO.StringIO()
2085 self.mock(git_cl.sys, 'stderr', out)
2086
2087 try:
2088 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2089 except SystemExit as ex:
2090 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002091 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002092
2093 def test_StatusFieldOverrideIssue(self):
2094 out = StringIO.StringIO()
2095 self.mock(git_cl.sys, 'stdout', out)
2096
2097 def assertIssue(cl_self, *_args):
2098 self.assertEquals(cl_self.issue, 1)
2099 return 'foobar'
2100
2101 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2102 self.calls = [
2103 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2104 ((['git', 'config', 'rietveld.server'],), ''),
2105 ((['git', 'config', 'rietveld.server'],), ''),
2106 ]
iannuccie53c9352016-08-17 14:40:40 -07002107 self.assertEqual(
2108 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2109 0)
iannucci3c972b92016-08-17 13:24:10 -07002110 self.assertEqual(out.getvalue(), 'foobar\n')
2111
iannuccie53c9352016-08-17 14:40:40 -07002112 def test_SetCloseOverrideIssue(self):
2113 def assertIssue(cl_self, *_args):
2114 self.assertEquals(cl_self.issue, 1)
2115 return 'foobar'
2116
2117 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2118 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2119 self.calls = [
2120 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2121 ((['git', 'config', 'rietveld.server'],), ''),
2122 ((['git', 'config', 'rietveld.server'],), ''),
2123 ]
2124 self.assertEqual(
2125 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2126
2127 def test_SetCommitOverrideIssue(self):
2128 def assertIssue(cl_self, *_args):
2129 self.assertEquals(cl_self.issue, 1)
2130 return 'foobar'
2131
2132 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2133 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2134 self.calls = [
2135 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2136 ((['git', 'config', 'rietveld.server'],), ''),
2137 ((['git', 'config', 'rietveld.server'],), ''),
2138 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2139 ((['git', 'config', 'rietveld.server'],), ''),
2140 ((['git', 'config', 'rietveld.server'],), ''),
2141 ]
2142 self.assertEqual(
2143 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2144
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002145 def test_description_gerrit(self):
2146 out = StringIO.StringIO()
2147 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002148 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002149 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002150 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2151 {
2152 'current_revision': 'sha1',
2153 'revisions': {'sha1': {
2154 'commit': {'message': 'foobar'},
2155 }},
2156 }),
2157 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002158 self.assertEqual(0, git_cl.main([
2159 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2160 self.assertEqual('foobar\n', out.getvalue())
2161
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002162 def test_description_set_raw(self):
2163 out = StringIO.StringIO()
2164 self.mock(git_cl.sys, 'stdout', out)
2165
2166 self.mock(git_cl, 'Changelist', ChangelistMock)
2167 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2168
2169 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2170 self.assertEqual('hihi', ChangelistMock.desc)
2171
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002172 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002173 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002174
2175 def RunEditor(desc, _, **kwargs):
2176 self.assertEquals(
2177 '# Enter a description of the change.\n'
2178 '# This will be displayed on the codereview site.\n'
2179 '# The first line will also be used as the subject of the review.\n'
2180 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002181 '--------------------\n'
2182 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002183 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002184 # Simulate user changing something.
2185 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002186
dsansomee2d6fd92016-09-08 00:10:47 -07002187 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002188 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002189
2190 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2191 self.mock(git_cl.Changelist, 'GetDescription',
2192 lambda *args: current_desc)
2193 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2194 UpdateDescriptionRemote)
2195 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2196
2197 self.calls = [
2198 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002199 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002200 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2201 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
Mark Mentovai57c47212017-03-09 11:14:09 -05002202 ((['git', 'config', 'rietveld.bug-line-format'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002203 ((['git', 'config', 'core.editor'],), 'vi'),
2204 ]
2205 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2206
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002207 def test_description_set_stdin(self):
2208 out = StringIO.StringIO()
2209 self.mock(git_cl.sys, 'stdout', out)
2210
2211 self.mock(git_cl, 'Changelist', ChangelistMock)
2212 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2213
2214 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2215 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2216
kmarshall3bff56b2016-06-06 18:31:47 -07002217 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002218 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2219
kmarshall3bff56b2016-06-06 18:31:47 -07002220 self.calls = \
2221 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2222 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002223 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002224 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2225 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002226 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2227 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2228 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002229 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2230 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2231 ((['git', 'branch', '-D', 'foo'],), '')]
2232
kmarshall3bff56b2016-06-06 18:31:47 -07002233 self.mock(git_cl, 'get_cl_statuses',
2234 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002235 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2236 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2237 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002238
2239 self.assertEqual(0, git_cl.main(['archive', '-f']))
2240
2241 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002242 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002243 self.calls = \
2244 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2245 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002246 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002247 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2248 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002249 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2250
kmarshall9249e012016-08-23 12:02:16 -07002251 self.mock(git_cl, 'get_cl_statuses',
2252 lambda branches, fine_grained, max_processes:
2253 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2254
2255 self.assertEqual(1, git_cl.main(['archive', '-f']))
2256
2257 def test_archive_dry_run(self):
2258 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2259
2260 self.calls = \
2261 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2262 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2263 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2264 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2265 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2266 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2267 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2268 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2269 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002270
2271 self.mock(git_cl, 'get_cl_statuses',
2272 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002273 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2274 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2275 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002276
kmarshall9249e012016-08-23 12:02:16 -07002277 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2278
2279 def test_archive_no_tags(self):
2280 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2281
2282 self.calls = \
2283 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2284 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2285 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2286 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2287 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2288 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2289 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2290 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2291 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2292 ((['git', 'branch', '-D', 'foo'],), '')]
2293
2294 self.mock(git_cl, 'get_cl_statuses',
2295 lambda branches, fine_grained, max_processes:
2296 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2297 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2298 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2299
2300 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002301
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002302 def test_cmd_issue_erase_existing(self):
2303 out = StringIO.StringIO()
2304 self.mock(git_cl.sys, 'stdout', out)
2305 self.calls = [
2306 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002307 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2308 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002309 # Let this command raise exception (retcode=1) - it should be ignored.
2310 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002311 CERR1),
2312 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2313 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002314 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2315 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2316 ''),
2317 ]
2318 self.assertEqual(0, git_cl.main(['issue', '0']))
2319
phajdan.jre328cf92016-08-22 04:12:17 -07002320 def test_cmd_issue_json(self):
2321 out = StringIO.StringIO()
2322 self.mock(git_cl.sys, 'stdout', out)
2323 self.calls = [
2324 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002325 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002326 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2327 ((['git', 'config', 'rietveld.server'],),
2328 'https://codereview.chromium.org'),
2329 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2330 (('write_json', 'output.json',
2331 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2332 ''),
2333 ]
2334 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2335
tandriide281ae2016-10-12 06:02:30 -07002336 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002337 self.mock(git_cl.Changelist, 'GetChange',
2338 lambda _, *a: (
2339 self._mocked_call(['GetChange']+list(a))))
2340 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2341 lambda *_, **__: (
2342 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002343 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2344 lambda _, s: self._mocked_call(['SetCQState', s]))
2345 self.calls = [
2346 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002347 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002348 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2349 ((['git', 'config', 'rietveld.server'],),
2350 'https://codereview.chromium.org'),
2351 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2352 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2353 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2354 ((['get_or_create_merge_base', 'feature', 'feature'],),
2355 'fake_ancestor_sha'),
2356 ((['GetChange', 'fake_ancestor_sha', None], ),
2357 git_cl.presubmit_support.GitChange(
2358 '', '', '', '', '', '', '', '')),
2359 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2360 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002361 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2362 ]
2363 out = StringIO.StringIO()
2364 self.mock(git_cl.sys, 'stdout', out)
2365 self.assertEqual(0, git_cl.main(['try']))
2366 self.assertEqual(
2367 out.getvalue(),
2368 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2369
tandrii8c5a3532016-11-04 07:52:02 -07002370 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2371 self.mock(git_cl.Changelist, 'GetChange',
2372 lambda _, *a: (
2373 self._mocked_call(['GetChange']+list(a))))
2374 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2375 lambda *_, **__: (
2376 self._mocked_call(['DoGetTryMasters'])))
2377 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2378 lambda _, s: self._mocked_call(['SetCQState', s]))
2379
tandrii8c5a3532016-11-04 07:52:02 -07002380 self.calls = [
2381 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2382 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2383 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2384 ((['git', 'config', 'branch.feature.gerritserver'],),
2385 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002386 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2387 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2388 'project': 'depot_tools',
2389 'status': 'OPEN',
2390 'owner': {'email': 'owner@e.mail'},
2391 'revisions': {
2392 'deadbeaf': {
2393 '_number': 6,
2394 },
2395 'beeeeeef': {
2396 '_number': 7,
2397 'fetch': {'http': {
2398 'url': 'https://chromium.googlesource.com/depot_tools',
2399 'ref': 'refs/changes/56/123456/7'
2400 }},
2401 },
2402 },
2403 }),
tandrii8c5a3532016-11-04 07:52:02 -07002404 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2405 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2406 ((['get_or_create_merge_base', 'feature', 'feature'],),
2407 'fake_ancestor_sha'),
2408 ((['GetChange', 'fake_ancestor_sha', None], ),
2409 git_cl.presubmit_support.GitChange(
2410 '', '', '', '', '', '', '', '')),
2411 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2412 ((['DoGetTryMasters'], ), None),
2413 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2414 ]
2415 out = StringIO.StringIO()
2416 self.mock(git_cl.sys, 'stdout', out)
2417 self.assertEqual(0, git_cl.main(['try']))
2418 self.assertEqual(
2419 out.getvalue(),
2420 'scheduled CQ Dry Run on '
2421 'https://chromium-review.googlesource.com/123456\n')
2422
2423 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2424 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2425 lambda _: {
2426 'owner_email': 'owner@e.mail',
2427 'private': False,
2428 'closed': False,
2429 'project': 'depot_tools',
2430 'patchsets': [20001],
2431 })
tandriide281ae2016-10-12 06:02:30 -07002432 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2433 self.calls = [
2434 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2435 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2436 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2437 ((['git', 'config', 'rietveld.server'],),
2438 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002439 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002440 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002441 ]
2442
2443 def _buildbucket_retry(*_, **kw):
2444 # self.maxDiff = 10000
2445 body = json.loads(kw['body'])
2446 self.assertEqual(len(body['builds']), 1)
2447 build = body['builds'][0]
2448 params = json.loads(build.pop('parameters_json'))
2449 self.assertEqual(params, {
2450 u'builder_name': u'win',
2451 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2452 u'revision': None}],
2453 u'properties': {
2454 u'category': u'git_cl_try',
2455 u'issue': 123,
2456 u'key': u'val',
2457 u'json': [{u'a': 1}, None],
2458 u'master': u'tryserver.chromium',
2459 u'patch_project': u'depot_tools',
2460 u'patch_storage': u'rietveld',
2461 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002462 u'rietveld': u'https://codereview.chromium.org',
2463 }
2464 })
2465 self.assertEqual(build, {
2466 u'bucket': u'master.tryserver.chromium',
2467 u'client_operation_id': u'uuid4',
2468 u'tags': [u'builder:win',
2469 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002470 u'user_agent:git_cl_try',
2471 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002472 })
2473
2474 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2475
2476 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2477 self.assertEqual(0, git_cl.main([
2478 'try', '-m', 'tryserver.chromium', '-b', 'win',
2479 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2480 self.assertRegexpMatches(
2481 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002482 'Tried jobs on:\nBucket: master.tryserver.chromium')
2483
tandrii8c5a3532016-11-04 07:52:02 -07002484 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2485 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2486 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2487
tandrii8c5a3532016-11-04 07:52:02 -07002488 self.calls = [
2489 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2490 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2491 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2492 ((['git', 'config', 'branch.feature.gerritserver'],),
2493 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002494 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002495 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002496 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002497 'status': 'OPEN',
2498 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002499 'revisions': {
2500 'deadbeaf': {
2501 '_number': 6,
2502 },
2503 'beeeeeef': {
2504 '_number': 7,
2505 'fetch': {'http': {
2506 'url': 'https://chromium.googlesource.com/depot_tools',
2507 'ref': 'refs/changes/56/123456/7'
2508 }},
2509 },
2510 },
2511 }),
2512 ]
2513
2514 def _buildbucket_retry(*_, **kw):
2515 # self.maxDiff = 10000
2516 body = json.loads(kw['body'])
2517 self.assertEqual(len(body['builds']), 1)
2518 build = body['builds'][0]
2519 params = json.loads(build.pop('parameters_json'))
2520 self.assertEqual(params, {
2521 u'builder_name': u'win',
2522 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2523 u'revision': None}],
2524 u'properties': {
2525 u'category': u'git_cl_try',
2526 u'key': u'val',
2527 u'json': [{u'a': 1}, None],
2528 u'master': u'tryserver.chromium',
2529
2530 u'patch_gerrit_url':
2531 u'https://chromium-review.googlesource.com',
2532 u'patch_issue': 123456,
2533 u'patch_project': u'depot_tools',
2534 u'patch_ref': u'refs/changes/56/123456/7',
2535 u'patch_repository_url':
2536 u'https://chromium.googlesource.com/depot_tools',
2537 u'patch_set': 7,
2538 u'patch_storage': u'gerrit',
2539 }
2540 })
2541 self.assertEqual(build, {
2542 u'bucket': u'master.tryserver.chromium',
2543 u'client_operation_id': u'uuid4',
2544 u'tags': [
2545 u'builder:win',
2546 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2547 u'user_agent:git_cl_try',
2548 u'master:tryserver.chromium'],
2549 })
2550
2551 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2552
2553 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2554 self.assertEqual(0, git_cl.main([
2555 'try', '-m', 'tryserver.chromium', '-b', 'win',
2556 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2557 self.assertRegexpMatches(
2558 git_cl.sys.stdout.getvalue(),
2559 'Tried jobs on:\nBucket: master.tryserver.chromium')
2560
borenet6c0efe62016-10-19 08:13:29 -07002561 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002562 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2563 lambda _: {
2564 'owner_email': 'owner@e.mail',
2565 'private': False,
2566 'closed': False,
2567 'project': 'depot_tools',
2568 'patchsets': [20001],
2569 })
borenet6c0efe62016-10-19 08:13:29 -07002570 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2571 self.calls = [
2572 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2573 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2574 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2575 ((['git', 'config', 'rietveld.server'],),
2576 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002577 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002578 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002579 ]
2580
2581 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002582 body = json.loads(kw['body'])
2583 self.assertEqual(len(body['builds']), 1)
2584 build = body['builds'][0]
2585 params = json.loads(build.pop('parameters_json'))
2586 self.assertEqual(params, {
2587 u'builder_name': u'win',
2588 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2589 u'revision': None}],
2590 u'properties': {
2591 u'category': u'git_cl_try',
2592 u'issue': 123,
2593 u'patch_project': u'depot_tools',
2594 u'patch_storage': u'rietveld',
2595 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002596 u'rietveld': u'https://codereview.chromium.org',
2597 }
2598 })
2599 self.assertEqual(build, {
2600 u'bucket': u'test.bucket',
2601 u'client_operation_id': u'uuid4',
2602 u'tags': [u'builder:win',
2603 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2604 u'user_agent:git_cl_try'],
2605 })
2606
2607 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2608
2609 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2610 self.assertEqual(0, git_cl.main([
2611 'try', '-B', 'test.bucket', '-b', 'win']))
2612 self.assertRegexpMatches(
2613 git_cl.sys.stdout.getvalue(),
2614 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002615
qyearsley123a4682016-10-26 09:12:17 -07002616 def test_git_cl_try_bots_on_multiple_masters(self):
2617 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2618 self.calls = [
2619 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2620 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2621 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2622 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002623 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002624 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2625 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2626 ]
2627
2628 def _buildbucket_retry(*_, **kw):
2629 body = json.loads(kw['body'])
2630 self.assertEqual(len(body['builds']), 2)
2631
2632 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2633 self.assertEqual(first_build_params['builder_name'], 'builder1')
2634 self.assertEqual(first_build_params['properties']['master'], 'master1')
2635
2636 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2637 self.assertEqual(first_build_params['builder_name'], 'builder2')
2638 self.assertEqual(first_build_params['properties']['master'], 'master2')
2639
2640 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2641
2642 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2643 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2644
2645 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2646 self.assertEqual(
2647 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2648 self.assertEqual(
2649 git_cl.sys.stdout.getvalue(),
2650 'Tried jobs on:\n'
2651 'Bucket: master.master1\n'
2652 ' builder1: []\n'
2653 'Bucket: master.master2\n'
2654 ' builder2: []\n'
2655 'To see results here, run: git cl try-results\n'
2656 'To see results in browser, run: git cl web\n')
2657
tandrii16e0b4e2016-06-07 10:34:28 -07002658 def _common_GerritCommitMsgHookCheck(self):
2659 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2660 self.mock(git_cl.os.path, 'abspath',
2661 lambda path: self._mocked_call(['abspath', path]))
2662 self.mock(git_cl.os.path, 'exists',
2663 lambda path: self._mocked_call(['exists', path]))
2664 self.mock(git_cl.gclient_utils, 'FileRead',
2665 lambda path: self._mocked_call(['FileRead', path]))
2666 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2667 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2668 self.calls = [
2669 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2670 ((['abspath', '../'],), '/abs/git_repo_root'),
2671 ]
2672 return git_cl.Changelist(codereview='gerrit', issue=123)
2673
2674 def test_GerritCommitMsgHookCheck_custom_hook(self):
2675 cl = self._common_GerritCommitMsgHookCheck()
2676 self.calls += [
2677 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2678 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2679 '#!/bin/sh\necho "custom hook"')
2680 ]
2681 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2682
2683 def test_GerritCommitMsgHookCheck_not_exists(self):
2684 cl = self._common_GerritCommitMsgHookCheck()
2685 self.calls += [
2686 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2687 ]
2688 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2689
2690 def test_GerritCommitMsgHookCheck(self):
2691 cl = self._common_GerritCommitMsgHookCheck()
2692 self.calls += [
2693 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2694 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2695 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002696 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002697 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2698 ''),
2699 ]
2700 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2701
tandriic4344b52016-08-29 06:04:54 -07002702 def test_GerritCmdLand(self):
2703 self.calls += [
2704 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2705 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2706 'deadbeaf'),
2707 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2708 ((['git', 'config', 'branch.feature.gerritserver'],),
2709 'chromium-review.googlesource.com'),
2710 ]
2711 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2712 cl._codereview_impl._GetChangeDetail = lambda _: {
2713 'labels': {},
2714 'current_revision': 'deadbeaf',
2715 }
agable32978d92016-11-01 12:55:02 -07002716 cl._codereview_impl._GetChangeCommit = lambda: {
2717 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002718 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002719 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2720 }
tandriic4344b52016-08-29 06:04:54 -07002721 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002722 out = StringIO.StringIO()
2723 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002724 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002725 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002726 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002727
tandrii221ab252016-10-06 08:12:04 -07002728 BUILDBUCKET_BUILDS_MAP = {
2729 '9000': {
2730 'id': '9000',
2731 'status': 'STARTED',
2732 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2733 'result_details_json': '{"properties": {}}',
2734 'bucket': 'master.x.y',
2735 'created_by': 'user:someone@chromium.org',
2736 'created_ts': '147200002222000',
2737 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2738 },
2739 '8000': {
2740 'id': '8000',
2741 'status': 'COMPLETED',
2742 'result': 'FAILURE',
2743 'failure_reason': 'BUILD_FAILURE',
2744 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2745 'result_details_json': '{"properties": {}}',
2746 'bucket': 'master.x.y',
2747 'created_by': 'user:someone@chromium.org',
2748 'created_ts': '147200001111000',
2749 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2750 },
2751 }
2752
2753 def test_write_try_results_json(self):
2754 expected_output = [
2755 {
2756 'buildbucket_id': '8000',
2757 'bucket': 'master.x.y',
2758 'builder_name': 'my-builder',
2759 'status': 'COMPLETED',
2760 'result': 'FAILURE',
2761 'failure_reason': 'BUILD_FAILURE',
2762 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2763 },
2764 {
2765 'buildbucket_id': '9000',
2766 'bucket': 'master.x.y',
2767 'builder_name': 'my-builder',
2768 'status': 'STARTED',
2769 'result': None,
2770 'failure_reason': None,
2771 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2772 }
2773 ]
2774 self.calls = [(('write_json', 'output.json', expected_output), '')]
2775 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2776
tandrii45b2a582016-10-11 03:14:16 -07002777 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002778 out = StringIO.StringIO()
2779 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002780 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2781 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002782 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2783 self._mocked_call(['get_authenticator_for_host', host]))
2784 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2785 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002786
2787 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2788 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002789 self.calls += [
2790 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2791 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2792 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2793 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2794 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2795 ((['git', 'config', 'branch.feature.rietveldserver'],),
2796 'codereview.example.com'),
2797 ((['get_authenticator_for_host', 'codereview.example.com'],),
2798 AuthenticatorMock()),
2799 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2800
2801 def test_fetch_try_jobs_none_rietveld(self):
2802 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002803 # Simulate that user isn't logged in.
2804 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002805 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002806 self.assertRegexpMatches(sys.stdout.getvalue(),
2807 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002808 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2809
2810 def test_fetch_try_jobs_some_rietveld(self):
2811 self._setup_fetch_try_jobs_rietveld({
2812 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2813 })
2814 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002815 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2816 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2817 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2818
2819 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2820 self._setup_fetch_try_jobs(most_recent_patchset=13)
2821 self.calls += [
2822 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2823 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2824 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002825 # TODO(tandrii): Uncomment the below if we decide to support checking
2826 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002827 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002828 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002829 ((['git', 'config', 'branch.feature.gerritserver'],),
2830 'https://x-review.googlesource.com'),
2831 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2832 AuthenticatorMock()),
2833 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2834
2835 def test_fetch_try_jobs_none_gerrit(self):
2836 self._setup_fetch_try_jobs_gerrit({})
2837 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002838 # TODO(tandrii): Uncomment the below if we decide to support checking
2839 # patchsets for Gerrit.
2840 # self.assertRegexpMatches(
2841 # sys.stdout.getvalue(),
2842 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002843 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2844
2845 def test_fetch_try_jobs_some_gerrit(self):
2846 self._setup_fetch_try_jobs_gerrit({
2847 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2848 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002849 # TODO(tandrii): Uncomment the below if we decide to support checking
2850 # patchsets for Gerrit.
2851 # self.calls.remove(
2852 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002853 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2854
2855 # ... and doesn't result in warning.
2856 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2857 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002858 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2859 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2860
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002861 def _mock_gerrit_changes_for_detail_cache(self):
2862 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002863
2864 def test_gerrit_change_detail_cache_normalize(self):
2865 self._mock_gerrit_changes_for_detail_cache()
2866 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002867 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002868 ]
2869 cl = git_cl.Changelist(codereview='gerrit')
2870 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2871 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2872 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2873 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2874
2875 def test_gerrit_change_detail_cache_simple(self):
2876 self._mock_gerrit_changes_for_detail_cache()
2877 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002878 (('GetChangeDetail', 'host', '1', []), 'a'),
2879 (('GetChangeDetail', 'host', '2', []), 'b'),
2880 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002881 ]
2882 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2883 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2884 self.assertEqual(cl._GetChangeDetail(), 'a')
2885 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002886 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002887 self.assertEqual(cl._GetChangeDetail(), 'a')
2888 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2889
2890 def test_gerrit_change_detail_cache_options(self):
2891 self._mock_gerrit_changes_for_detail_cache()
2892 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002893 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2894 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2895 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2896 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002897 ]
2898 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2899 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2900 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2901 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2902 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2903 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2904 self.assertEqual(cl._GetChangeDetail(), 'cab')
2905
2906 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2907 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2908 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2909 self.assertEqual(cl._GetChangeDetail(), 'cab')
2910
2911 # Finally, no_cache should invalidate all caches for given change.
2912 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2913 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2914
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002915 def test_gerrit_description_caching(self):
2916 def gen_detail(rev, desc):
2917 return {
2918 'current_revision': rev,
2919 'revisions': {rev: {'commit': {'message': desc}}}
2920 }
2921 self.calls = [
2922 (('GetChangeDetail', 'host', '1',
2923 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2924 gen_detail('rev1', 'desc1')),
2925 (('GetChangeDetail', 'host', '1',
2926 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2927 gen_detail('rev2', 'desc2')),
2928 ]
2929
2930 self._mock_gerrit_changes_for_detail_cache()
2931 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2932 self.assertEqual(cl.GetDescription(), 'desc1')
2933 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
2934 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002935
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002936if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01002937 logging.basicConfig(
2938 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002939 unittest.main()