blob: 068729d1456b6ae2dae28f40541f8377e3cb2a02 [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
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01009import datetime
tandriide281ae2016-10-12 06:02:30 -070010import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010011import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000013import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014import sys
15import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000016import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017
18sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
19
20from testing_support.auto_stub import TestCase
21
22import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000023import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000024import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026
tandrii5d48c322016-08-18 16:19:37 -070027def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
28 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
29
30
31CERR1 = callError(1)
32
33
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000034class ChangelistMock(object):
35 # A class variable so we can access it when we don't have access to the
36 # instance that's being set.
37 desc = ""
38 def __init__(self, **kwargs):
39 pass
40 def GetIssue(self):
41 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080042 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070044 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000045 ChangelistMock.desc = desc
46
tandrii5d48c322016-08-18 16:19:37 -070047
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000048class PresubmitMock(object):
49 def __init__(self, *args, **kwargs):
50 self.reviewers = []
51 @staticmethod
52 def should_continue():
53 return True
54
55
56class RietveldMock(object):
57 def __init__(self, *args, **kwargs):
58 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000059
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000060 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080061 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000062 return 'Issue: %d' % issue
63
maruel@chromium.org78936cb2013-04-11 00:17:52 +000064 @staticmethod
65 def get_issue_properties(_issue, _messages):
66 return {
67 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
68 'messages': [
69 {
70 'approval': True,
71 'sender': 'john@chromium.org',
72 },
73 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010074 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000075 }
76
iannuccie53c9352016-08-17 14:40:40 -070077 @staticmethod
78 def close_issue(_issue):
79 return 'Closed'
80
skobes6468b902016-10-24 08:45:10 -070081 @staticmethod
82 def get_patch(issue, patchset):
83 return 'patch set from issue %s patchset %s' % (issue, patchset)
84
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010085 @staticmethod
86 def update_description(_issue, _description):
87 return 'Updated'
88
89 @staticmethod
90 def add_comment(_issue, _comment):
91 return 'Commented'
92
93
94
skobes6468b902016-10-24 08:45:10 -070095
96class GitCheckoutMock(object):
97 def __init__(self, *args, **kwargs):
98 pass
99
100 @staticmethod
101 def reset():
102 GitCheckoutMock.conflict = False
103
104 def apply_patch(self, p):
105 if GitCheckoutMock.conflict:
106 raise Exception('failed')
107
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000108
109class WatchlistsMock(object):
110 def __init__(self, _):
111 pass
112 @staticmethod
113 def GetWatchersForPaths(_):
114 return ['joe@example.com']
115
116
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000117class CodereviewSettingsFileMock(object):
118 def __init__(self):
119 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800120 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000121 def read(self):
122 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000123 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000124
125
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000126class AuthenticatorMock(object):
127 def __init__(self, *_args):
128 pass
129 def has_cached_credentials(self):
130 return True
tandrii221ab252016-10-06 08:12:04 -0700131 def authorize(self, http):
132 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000133
134
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100135def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000136 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
137
138 Usage:
139 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100140 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000141
142 OR
143 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100144 CookiesAuthenticatorMockFactory(
145 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000146 """
147 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800148 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000149 # Intentionally not calling super() because it reads actual cookie files.
150 pass
151 @classmethod
152 def get_gitcookies_path(cls):
153 return '~/.gitcookies'
154 @classmethod
155 def get_netrc_path(cls):
156 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100157 def _get_auth_for_host(self, host):
158 if same_auth:
159 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000160 return (hosts_with_creds or {}).get(host)
161 return CookiesAuthenticatorMock
162
kmarshall9249e012016-08-23 12:02:16 -0700163class MockChangelistWithBranchAndIssue():
164 def __init__(self, branch, issue):
165 self.branch = branch
166 self.issue = issue
167 def GetBranch(self):
168 return self.branch
169 def GetIssue(self):
170 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000171
tandriic2405f52016-10-10 08:13:15 -0700172
173class SystemExitMock(Exception):
174 pass
175
176
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000177class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100178 def test_get_description(self):
179 cl = git_cl.Changelist(issue=1, codereview='rietveld',
180 codereview_host='host')
181 cl.description = 'x'
182 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800183 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100184 self.assertEquals(cl.GetDescription(), 'x')
185 self.assertEquals(cl.GetDescription(force=True), 'y')
186 self.assertEquals(cl.GetDescription(), 'y')
187
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000188 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
189 parsed = urlparse.urlparse(url)
190 result = func(parsed)
191 if fail:
192 self.assertIsNone(result)
193 return None
194 self.assertIsNotNone(result)
195 self.assertEqual(result.issue, issue)
196 self.assertEqual(result.patchset, patchset)
197 self.assertEqual(result.hostname, hostname)
198 return result
199
200 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700201 def test(url, issue=None, patchset=None, hostname=None, fail=None):
202 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000203 git_cl._RietveldChangelistImpl.ParseIssueURL,
204 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000205
206 test('http://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/',
211 123, None, 'codereview.chromium.org')
212 test('https://codereview.chromium.org/123/whatever',
213 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700214 test('https://codereview.chromium.org/123/#ps20001',
215 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000216 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700217 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000218 # This looks like bad Gerrit, but is actually valid Rietveld.
219 test('https://chrome-review.source.com/123/4/',
220 123, None, 'chrome-review.source.com')
221
222 test('https://codereview.chromium.org/deadbeaf', fail=True)
223 test('https://codereview.chromium.org/api/123', fail=True)
224 test('bad://codereview.chromium.org/123', fail=True)
225 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
226
227 def test_ParseIssueURL_gerrit(self):
228 def test(url, issue=None, patchset=None, hostname=None, fail=None):
229 self._test_ParseIssueUrl(
230 git_cl._GerritChangelistImpl.ParseIssueURL,
231 url, issue, patchset, hostname, fail)
232
233 test('http://chrome-review.source.com/c/123',
234 123, None, 'chrome-review.source.com')
235 test('https://chrome-review.source.com/c/123/',
236 123, None, '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/c/123/4',
242 123, 4, 'chrome-review.source.com')
243 test('https://chrome-review.source.com/123',
244 123, None, 'chrome-review.source.com')
245 test('https://chrome-review.source.com/123/4',
246 123, 4, 'chrome-review.source.com')
247
248 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
249 test('https://chrome-review.source.com/c/abc/', fail=True)
250 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
251
252 def test_ParseIssueNumberArgument(self):
253 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
254 result = git_cl.ParseIssueNumberArgument(arg)
255 self.assertIsNotNone(result)
256 if fail:
257 self.assertFalse(result.valid)
258 else:
259 self.assertEqual(result.issue, issue)
260 self.assertEqual(result.patchset, patchset)
261 self.assertEqual(result.hostname, hostname)
262
263 test('123', 123)
264 test('', fail=True)
265 test('abc', fail=True)
266 test('123/1', fail=True)
267 test('123a', fail=True)
268 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
269 # Rietveld.
270 test('https://codereview.source.com/123',
271 123, None, 'codereview.source.com')
272 test('https://codereview.source.com/www123', fail=True)
273 # Gerrrit.
274 test('https://chrome-review.source.com/c/123/4',
275 123, 4, 'chrome-review.source.com')
276 test('https://chrome-review.source.com/bad/123/4', fail=True)
277
tandriif9aefb72016-07-01 09:06:51 -0700278 def test_get_bug_line_values(self):
279 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
280 self.assertEqual(f('', ''), [])
281 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
282 self.assertEqual(f('v8', '456'), ['v8:456'])
283 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
284 # Not nice, but not worth carying.
285 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
286 ['v8:456', 'chromium:123', 'v8:123'])
287
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100288 def _test_git_number(self, parent_msg, dest_ref, child_msg,
289 parent_hash='parenthash'):
290 desc = git_cl.ChangeDescription(child_msg)
291 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
292 return desc.description
293
294 def assertEqualByLine(self, actual, expected):
295 self.assertEqual(actual.splitlines(), expected.splitlines())
296
297 def test_git_number_bad_parent(self):
298 with self.assertRaises(ValueError):
299 self._test_git_number('Parent', 'refs/heads/master', 'Child')
300
301 def test_git_number_bad_parent_footer(self):
302 with self.assertRaises(AssertionError):
303 self._test_git_number(
304 'Parent\n'
305 '\n'
306 'Cr-Commit-Position: wrong',
307 'refs/heads/master', 'Child')
308
309 def test_git_number_bad_lineage_ignored(self):
310 actual = self._test_git_number(
311 'Parent\n'
312 '\n'
313 'Cr-Commit-Position: refs/heads/master@{#1}\n'
314 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
315 'refs/heads/master', 'Child')
316 self.assertEqualByLine(
317 actual,
318 'Child\n'
319 '\n'
320 'Cr-Commit-Position: refs/heads/master@{#2}\n'
321 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
322
323 def test_git_number_same_branch(self):
324 actual = self._test_git_number(
325 'Parent\n'
326 '\n'
327 'Cr-Commit-Position: refs/heads/master@{#12}',
328 dest_ref='refs/heads/master',
329 child_msg='Child')
330 self.assertEqualByLine(
331 actual,
332 'Child\n'
333 '\n'
334 'Cr-Commit-Position: refs/heads/master@{#13}')
335
336 def test_git_number_same_branch_with_originals(self):
337 actual = self._test_git_number(
338 'Parent\n'
339 '\n'
340 'Cr-Commit-Position: refs/heads/master@{#12}',
341 dest_ref='refs/heads/master',
342 child_msg='Child\n'
343 '\n'
344 'Some users are smart and insert their own footers\n'
345 '\n'
346 'Cr-Whatever: value\n'
347 'Cr-Commit-Position: refs/copy/paste@{#22}')
348 self.assertEqualByLine(
349 actual,
350 'Child\n'
351 '\n'
352 'Some users are smart and insert their own footers\n'
353 '\n'
354 'Cr-Original-Whatever: value\n'
355 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
356 'Cr-Commit-Position: refs/heads/master@{#13}')
357
358 def test_git_number_new_branch(self):
359 actual = self._test_git_number(
360 'Parent\n'
361 '\n'
362 'Cr-Commit-Position: refs/heads/master@{#12}',
363 dest_ref='refs/heads/branch',
364 child_msg='Child')
365 self.assertEqualByLine(
366 actual,
367 'Child\n'
368 '\n'
369 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
370 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
371
372 def test_git_number_lineage(self):
373 actual = self._test_git_number(
374 'Parent\n'
375 '\n'
376 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
377 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
378 dest_ref='refs/heads/branch',
379 child_msg='Child')
380 self.assertEqualByLine(
381 actual,
382 'Child\n'
383 '\n'
384 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
385 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
386
387 def test_git_number_moooooooore_lineage(self):
388 actual = self._test_git_number(
389 'Parent\n'
390 '\n'
391 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
392 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
393 dest_ref='refs/heads/mooore',
394 child_msg='Child')
395 self.assertEqualByLine(
396 actual,
397 'Child\n'
398 '\n'
399 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
400 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
401 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
402
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100403 def test_git_number_ever_moooooooore_lineage(self):
404 self.maxDiff = 10000
405 actual = self._test_git_number(
406 'CQ commit on fresh new branch + numbering.\n'
407 '\n'
408 'NOTRY=True\n'
409 'NOPRESUBMIT=True\n'
410 'BUG=\n'
411 '\n'
412 'Review-Url: https://codereview.chromium.org/2577703003\n'
413 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
414 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
415 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
416 dest_ref='refs/heads/gnumb-test/cl',
417 child_msg='git cl on fresh new branch + numbering.\n'
418 '\n'
419 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
420 self.assertEqualByLine(
421 actual,
422 'git cl on fresh new branch + numbering.\n'
423 '\n'
424 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
425 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
426 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
427 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
428 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100429
430 def test_git_number_cherry_pick(self):
431 actual = self._test_git_number(
432 'Parent\n'
433 '\n'
434 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
435 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
436 dest_ref='refs/heads/branch',
437 child_msg='Child, which is cherry-pick from master\n'
438 '\n'
439 'Cr-Commit-Position: refs/heads/master@{#100}\n'
440 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
441 self.assertEqualByLine(
442 actual,
443 'Child, which is cherry-pick from master\n'
444 '\n'
445 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
446 '\n'
447 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
448 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
449 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
450
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000451
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100452class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100453 def setUp(self):
454 super(GitCookiesCheckerTest, self).setUp()
455 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100456 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100457
458 def mock_hosts_creds(self, subhost_identity_pairs):
459 def ensure_googlesource(h):
460 if not h.endswith(self.c._GOOGLESOURCE):
461 assert not h.endswith('.')
462 return h + '.' + self.c._GOOGLESOURCE
463 return h
464 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
465 for h, i in subhost_identity_pairs]
466
467 def test_analysis_nothing(self):
468 self.c._all_hosts = []
469 self.assertFalse(self.c.has_generic_host())
470 self.assertEqual(set(), self.c.get_conflicting_hosts())
471 self.assertEqual(set(), self.c.get_duplicated_hosts())
472 self.assertEqual(set(), self.c.get_partially_configured_hosts())
473 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
474
475 def test_analysis(self):
476 self.mock_hosts_creds([
477 ('.googlesource.com', 'git-example.chromium.org'),
478
479 ('chromium', 'git-example.google.com'),
480 ('chromium-review', 'git-example.google.com'),
481 ('chrome-internal', 'git-example.chromium.org'),
482 ('chrome-internal-review', 'git-example.chromium.org'),
483 ('conflict', 'git-example.google.com'),
484 ('conflict-review', 'git-example.chromium.org'),
485 ('dup', 'git-example.google.com'),
486 ('dup', 'git-example.google.com'),
487 ('dup-review', 'git-example.google.com'),
488 ('partial', 'git-example.google.com'),
489 ])
490 self.assertTrue(self.c.has_generic_host())
491 self.assertEqual(set(['conflict.googlesource.com']),
492 self.c.get_conflicting_hosts())
493 self.assertEqual(set(['dup.googlesource.com']),
494 self.c.get_duplicated_hosts())
495 self.assertEqual(set(['partial.googlesource.com']),
496 self.c.get_partially_configured_hosts())
497 self.assertEqual(set(['chromium.googlesource.com',
498 'chrome-internal.googlesource.com']),
499 self.c.get_hosts_with_wrong_identities())
500
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100501 def test_report_no_problems(self):
502 self.test_analysis_nothing()
503 self.mock(sys, 'stdout', StringIO.StringIO())
504 self.assertFalse(self.c.find_and_report_problems())
505 self.assertEqual(sys.stdout.getvalue(), '')
506
507 def test_report(self):
508 self.test_analysis()
509 self.mock(sys, 'stdout', StringIO.StringIO())
510 self.assertTrue(self.c.find_and_report_problems())
511 with open(os.path.join(os.path.dirname(__file__),
512 'git_cl_creds_check_report.txt')) as f:
513 expected = f.read()
514 def by_line(text):
515 return [l.rstrip() for l in text.rstrip().splitlines()]
516 self.assertEqual(by_line(sys.stdout.getvalue()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100517
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000518class TestGitCl(TestCase):
519 def setUp(self):
520 super(TestGitCl, self).setUp()
521 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700522 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000523 self.mock(subprocess2, 'call', self._mocked_call)
524 self.mock(subprocess2, 'check_call', self._mocked_call)
525 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700526 self.mock(subprocess2, 'communicate',
527 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000528 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000529 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000530 self.mock(git_common, 'get_or_create_merge_base',
531 lambda *a: (
532 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000533 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000534 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100535 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
536 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700537 self.mock(git_cl, 'write_json', lambda path, contents:
538 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000539 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000540 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000541 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700542 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
543 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000544 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000545 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000546 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100547 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
548 lambda *args, **kwargs: self._mocked_call(
549 'GetChangeDetail', *args, **kwargs))
550 self.mock(git_cl.gerrit_util, 'AddReviewers',
551 lambda h, i, add, is_reviewer, notify: self._mocked_call(
552 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000553 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
554 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700555 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100556 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000557 # It's important to reset settings to not have inter-tests interference.
558 git_cl.settings = None
559
560 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000561 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100562 self.assertEquals([], self.calls)
563 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000564 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100565 raise
566 # Sadly, has_failed() returns True if this OR any other tests before this
567 # one have failed.
568 git_cl.logging.exception(
569 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
570 'There are un-consumed self.calls after this test has finished.\n'
571 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700572 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100573 '\n'
574 'If you are already running just this single test, then **first** '
575 'fix the problem whose exception is emitted below by unittest '
576 'runner.\n'
577 '\n'
578 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700579 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100580 'and follow instructions above.\n' +
581 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000582 finally:
583 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000584
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000585 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000586 self.assertTrue(
587 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700588 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000589 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000590 expected_args, result = top
591
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000592 # Also logs otherwise it could get caught in a try/finally and be hard to
593 # diagnose.
594 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700595 N = 5
596 prior_calls = '\n '.join(
597 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
598 for i, c in enumerate(self._calls_done[-N:]))
599 following_calls = '\n '.join(
600 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
601 for i, c in enumerate(self.calls[:N]))
602 extended_msg = (
603 'A few prior calls:\n %s\n\n'
604 'This (expected):\n @%d: %r\n'
605 'This (actual):\n @%d: %r\n\n'
606 'A few following expected calls:\n %s' %
607 (prior_calls, len(self._calls_done), expected_args,
608 len(self._calls_done), args, following_calls))
609 git_cl.logging.error(extended_msg)
610
tandrii99a72f22016-08-17 14:33:24 -0700611 self.fail('@%d\n'
612 ' Expected: %r\n'
613 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700614 len(self._calls_done), expected_args, args))
615
616 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700617 if isinstance(result, Exception):
618 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000619 return result
620
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100621 def test_ask_for_explicit_yes_true(self):
622 self.calls = [
623 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
624 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
625 ]
626 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
627
628 def test_ask_for_explicit_yes_true(self):
629 self.calls = [
630 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
631 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
632 ]
633 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
634
tandrii48df5812016-10-17 03:55:37 -0700635 def test_LoadCodereviewSettingsFromFile_gerrit(self):
636 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
637 self.calls = [
638 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
639 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
640 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
641 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
642 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
643 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700644 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
645 CERR1),
646 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700647 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
648 CERR1),
649 ((['git', 'config', 'gerrit.host', 'true'],), ''),
650 ]
651 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
652
maruel@chromium.orga3353652011-11-30 14:26:57 +0000653 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000654 def _is_gerrit_calls(cls, gerrit=False):
655 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
656 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
657
658 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000659 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000660 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000661 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000662
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000663 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000664 def _upload_no_rev_calls(cls, similarity, find_copies):
665 return (cls._git_base_calls(similarity, find_copies) +
666 cls._git_upload_no_rev_calls())
667
668 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000669 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000670 if similarity is None:
671 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700672 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700673 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000674 else:
tandrii33a46ff2016-08-23 05:53:40 -0700675 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700676 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000677
678 if find_copies is None:
679 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700680 find_copies_call = ((['git', 'config', '--bool',
681 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000682 else:
tandrii5d48c322016-08-18 16:19:37 -0700683 val = str(find_copies).lower()
684 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000685 'branch.master.git-find-copies', val],), '')
686
687 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000688 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800689 '-l100000', '-C'+similarity,
690 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000691 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000692 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000693 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000694
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000695 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000696 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000697 similarity_call,
698 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
699 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000700 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000701 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700702 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
703 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000704 ((['git', 'config', 'rietveld.server'],),
705 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000706 ((['git', 'config', 'branch.master.merge'],), 'master'),
707 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000708 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000709 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000710 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000711 ((['git', 'rev-parse', '--show-cdup'],), ''),
712 ((['git', 'rev-parse', 'HEAD'],), '12345'),
713 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000714 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000715 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700716 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000717 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000718 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000719 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000720 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000721 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000722 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000723 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000724 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700725 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000726 ]
727
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000728 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000729 def _git_upload_no_rev_calls(cls):
730 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000731 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000732 ]
733
734 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000735 def _git_upload_calls(cls, private):
736 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000737 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000738 private_call = []
739 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000740 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000741 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000742 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000743
maruel@chromium.orga3353652011-11-30 14:26:57 +0000744 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000745 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000746 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000747 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800748 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000749 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700750 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000751 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000752 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000753 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700754 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000755 ] + cls._git_post_upload_calls()
756
757 @classmethod
758 def _git_post_upload_calls(cls):
759 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000760 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
761 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
762 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000763 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000764 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000765 ]
766
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000767 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000768 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000769 fake_ancestor = 'fake_ancestor'
770 fake_cl = 'fake_cl_for_patch'
771 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000772 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000773 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000774 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000775 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000776 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000777 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000778 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000779 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700780 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000781 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000782 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000784 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000785 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000786 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000787 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000788 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000789 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000790 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000791 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000792
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000793 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700794 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000795 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000796 return [
797 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000798 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000799 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000800 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700801 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000802 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000803 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100804 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000805 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000806 ]
807
808 def _run_reviewer_test(
809 self,
810 upload_args,
811 expected_description,
812 returned_description,
813 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000814 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700815 private=False,
816 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000817 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000818 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000819 try:
820 similarity = upload_args[upload_args.index('--similarity')+1]
821 except ValueError:
822 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000823
824 if '--find-copies' in upload_args:
825 find_copies = True
826 elif '--no-find-copies' in upload_args:
827 find_copies = False
828 else:
829 find_copies = None
830
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000831 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700832 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000833
834 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000835
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000836 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000837 self.assertEquals(
838 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000839 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000840 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000841 '#--------------------This line is 72 characters long'
842 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000843 expected_description,
844 desc)
845 return returned_description
846 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000847
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000848 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000849 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700850 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000851 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000852 return 1, 2
853 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000854
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000855 git_cl.main(['upload'] + upload_args)
856
857 def test_no_reviewer(self):
858 self._run_reviewer_test(
859 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000860 'desc\n\nBUG=',
861 '# Blah blah comment.\ndesc\n\nBUG=',
862 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000863 [])
864
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000865 def test_keep_similarity(self):
866 self._run_reviewer_test(
867 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000868 'desc\n\nBUG=',
869 '# Blah blah comment.\ndesc\n\nBUG=',
870 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000871 [])
872
iannucci@chromium.org79540052012-10-19 23:15:26 +0000873 def test_keep_find_copies(self):
874 self._run_reviewer_test(
875 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000876 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000877 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000878 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000879 [])
880
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000881 def test_private(self):
882 self._run_reviewer_test(
883 ['--private'],
884 'desc\n\nBUG=',
885 '# Blah blah comment.\ndesc\n\nBUG=\n',
886 'desc\n\nBUG=',
887 [])
888
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000889 def test_reviewers_cmd_line(self):
890 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000891 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000892 self._run_reviewer_test(
893 ['-r' 'foo@example.com'],
894 description,
895 '\n%s\n' % description,
896 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000897 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000898
899 def test_reviewer_tbr_overriden(self):
900 # Reviewer is overriden with TBR
901 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000902 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000903 self._run_reviewer_test(
904 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000905 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000906 description.strip('\n'),
907 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000908 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000909
910 def test_reviewer_multiple(self):
911 # Handles multiple R= or TBR= lines.
912 description = (
bradnelsond975b302016-10-23 12:20:23 -0700913 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
914 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000915 self._run_reviewer_test(
916 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000917 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000918 description,
919 description,
bradnelsond975b302016-10-23 12:20:23 -0700920 ['--reviewers=another@example.com,reviewer@example.com'],
921 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000922
maruel@chromium.orga3353652011-11-30 14:26:57 +0000923 def test_reviewer_send_mail(self):
924 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000925 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000926 self._run_reviewer_test(
927 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000928 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000929 description.strip('\n'),
930 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000931 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000932
933 def test_reviewer_send_mail_no_rev(self):
934 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000935 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700936 self.calls = self._upload_no_rev_calls(None, None) + [
937 ((['DieWithError', 'Must specify reviewers to send email.'],),
938 SystemExitMock())
939 ]
940
941 def RunEditor(desc, _, **kwargs):
942 return desc
943 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
944 self.mock(sys, 'stdout', stdout)
945 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000946 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700947 self.assertEqual(
948 'Using 50% similarity for rename/copy detection. Override with '
949 '--similarity.\n',
950 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000951
tandriif9aefb72016-07-01 09:06:51 -0700952 def test_bug_on_cmd(self):
953 self._run_reviewer_test(
954 ['--bug=500658,proj:123'],
955 'desc\n\nBUG=500658\nBUG=proj:123',
956 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
957 'desc\n\nBUG=500658\nBUG=proj:1234',
958 [])
959
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100960 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
961 parent_msg=None,
962 new_msg=None,
963 fail_after_parent_msg=False,
964 fail_cherry_pick=False,
965 fail_push_count=0,
966 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100967 if debug:
968 # Very useful due to finally clause in git cl land raising exceptions and
969 # shadowing real cause of failure.
970 self.mock(git_cl, '_IS_BEING_TESTED', True)
971 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100972 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100973
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100974 if git_numberer_enabled:
975 # Special mocks to check validity of timestamp.
976 original_git_amend_head = git_cl._git_amend_head
977 def _git_amend_head_mock(msg, tstamp):
978 self._mocked_call(['git_amend_head committer timestamp', tstamp])
979 return original_git_amend_head(msg, tstamp)
980 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
981
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100982 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
983 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100984 self.mock(RietveldMock, 'update_description', staticmethod(
985 lambda i, d: self._mocked_call(['update_description', i, d])))
986 self.mock(RietveldMock, 'add_comment', staticmethod(
987 lambda i, c: self._mocked_call(['add_comment', i, c])))
988 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100989 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
990 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
991 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
992 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
993 CERR1),
994 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
995 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800996 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100997 ((['git', 'config', 'rietveld.server'],),
998 'https://codereview.chromium.org'),
999 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1000 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1001 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1002 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001003 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1004 ''), # No commits to rebase, according to local view of origin.
1005 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1006 'fake_ancestor_sha'),
1007 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1008 ((['git', 'rev-parse', '--show-cdup'],), ''),
1009 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1010 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1011 'fake_ancestor_sha...', '.'],),
1012 'M\tfile1.cpp'),
1013 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1014 ((['git', 'config', 'branch.feature.rietveldserver'],),
1015 'https://codereview.chromium.org'),
1016 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1017 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1018 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1019 'fake_ancestor_sha', 'feature'],),
1020 # This command just prints smth like this:
1021 # file1.cpp | 53 ++++++--
1022 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1023 ''),
1024 ((['git', 'show-ref', '--quiet', '--verify',
1025 'refs/heads/git-cl-commit'],),
1026 ''), # 0 return code means branch exists.
1027 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1028 ((['git', 'show-ref', '--quiet', '--verify',
1029 'refs/heads/git-cl-cherry-pick'],),
1030 CERR1), # This means git-cl-cherry-pick branch does not exist.
1031 ((['git', 'rev-parse', '--show-cdup'],), ''),
1032 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1033 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1034 ((['git', 'commit', '-m',
1035 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001036 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001037 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1038 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1039 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001040 repo_url),
1041
1042 ((['git', 'config', 'remote.origin.url'],), repo_url),
1043 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1044 git_numberer_enabled),
1045
1046 # Auto-rebase init.
1047 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1048 ]
1049 # Auto-rebase loops.
1050 for attempt in xrange(fail_push_count + 1):
1051 self.calls += [
1052 # Auto-rebase loop start.
1053 ((['git', 'retry', 'fetch', 'origin',
1054 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1055 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1056 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1057 # different in each loop iteration for truly realistic test.
1058 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1059 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1060 callError(1, 'failed to cherry pick') if fail_cherry_pick
1061 else ''),
1062 ]
1063 if fail_cherry_pick:
1064 return
1065
1066 if git_numberer_enabled:
1067 assert parent_msg
1068 self.calls += [
1069 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1070 parent_msg),
1071 ]
1072 if fail_after_parent_msg:
1073 return
1074 assert new_msg
1075 self.calls += [
1076 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1077 '1480022355'), # Committer's unix timestamp.
1078 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1079 '1480024000'),
1080 ((['git_amend_head committer timestamp', 1480024000],), ''),
1081 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1082 ]
1083 self.calls += [
1084 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1085 CERR1 if attempt < fail_push_count else ''),
1086 ]
1087 # End of autorebase + push.
1088
1089 self.calls += [
1090 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1091 ]
1092 if git_numberer_enabled:
1093 self.calls += [
1094 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1095 ]
1096
1097 # Cleanup calls.
1098 self.calls += [
1099 ((['git', 'checkout', '-q', 'feature'],), ''),
1100 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1101 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001102 ]
1103
1104 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001105 self._land_rietveld_calls(
1106 repo_url='https://chromium.googlesource.com/infra/infra',
1107 git_numberer_enabled=False,
1108 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001109 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001110 ((['git', 'config', 'rietveld.viewvc-url'],),
1111 'https://chromium.googlesource.com/infra/infra/+/'),
1112 ((['update_description', 123,
1113 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001114 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001115 ''),
1116 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001117 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001118 ]
1119 git_cl.main(['land'])
1120
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001121 def test_land_rietveld_fail_cherry_pick(self):
1122 self._land_rietveld_calls(
1123 repo_url='https://chromium.googlesource.com/infra/infra',
1124 git_numberer_enabled=False,
1125 fail_cherry_pick=True,
1126 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001127 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001128 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1129 'U path/file1\n'
1130 'U file2.cpp\n'),
1131 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001132 ((['git', 'checkout', '-q', 'feature'],), ''),
1133 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001134 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1135 ]
1136 git_cl.main(['land'])
1137
1138 def test_land_rietveld_git_numberer_fail_1_push(self):
1139 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1140
1141 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1142 self._land_rietveld_calls(
1143 repo_url='https://chromium.googlesource.com/chromium/src',
1144 git_numberer_enabled=True,
1145 parent_msg=('This is parent commit.\n'
1146 '\n'
1147 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1148 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1149 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1150 '\n'
1151 'Review-Url: https://codereview.chromium.org/123 .\n'
1152 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1153 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1154 fail_push_count=fail_push_count,
1155 debug=False)
1156
1157 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001158 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001159 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001160 ((['update_description', 123,
1161 'Issue: 123\n\nR=john@chromium.org\n'
1162 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001163 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001164 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1165 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1166 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001167 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001168 ''),
1169 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001170 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001171 ]
1172 git_cl.main(['land'])
1173
1174 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001175 self._land_rietveld_calls(
1176 repo_url='https://chromium.googlesource.com/v8/v8',
1177 git_numberer_enabled=True,
1178 parent_msg='This is parent commit with no footer.',
1179 fail_after_parent_msg=True,
1180 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001181 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001182 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001183 ((['git', 'checkout', '-q', 'feature'],), ''),
1184 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001185 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001186 ]
1187 with self.assertRaises(ValueError) as cm:
1188 git_cl.main(['land'])
1189 self.assertEqual(cm.exception.message,
1190 'Unable to infer commit position from footers')
1191
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001192 def test_git_numberer_not_whitelisted_repo(self):
1193 self.calls = []
1194 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001195 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1196 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001197 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001198
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001199 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001200 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1201 self.calls = [
1202 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001203 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001204 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001205 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001206 remote_url='https://chromium.googlesource.com/chromium/src',
1207 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001208 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001209
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001210 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001211 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001212 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001213 def fake_temporary_directory(**kwargs):
1214 yield tempdir
1215 self.mock(git_cl.gclient_utils, 'temporary_directory',
1216 fake_temporary_directory)
1217 self._test_GitNumbererState_valid_configs_inner(tempdir)
1218
1219 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001220 self.calls = [
1221 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001222 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001223 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1224 '''
1225 [plugin "git-numberer"]
1226 validate-enabled-refglob = refs/else/*
1227 validate-enabled-refglob = refs/heads/*
1228 validate-disabled-refglob = refs/heads/disabled
1229 validate-disabled-refglob = refs/branch-heads/*
1230 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001231 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1232 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001233 'refs/else/*\n'
1234 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001235 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1236 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001237 'refs/heads/disabled\n'
1238 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001239 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001240
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001241 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001242 remote_url='https://chromium.googlesource.com/chromium/src',
1243 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001244 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001245
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001246 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001247 remote_url='https://chromium.googlesource.com/chromium/src',
1248 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001249 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001250
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001251 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001252 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001253 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001254 remote_url='https://chromium.googlesource.com/chromium/src',
1255 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001256 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001257
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001258 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001259 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001260 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001261 if skip_auth_check:
1262 return [((cmd, ), 'true')]
1263
tandrii5d48c322016-08-18 16:19:37 -07001264 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001265 if issue:
1266 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001267 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001268 ])
1269 calls.extend([
1270 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1271 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1272 ((['git', 'config', 'remote.origin.url'],),
1273 'https://chromium.googlesource.com/my/repo'),
1274 ((['git', 'config', 'remote.origin.url'],),
1275 'https://chromium.googlesource.com/my/repo'),
1276 ])
1277 return calls
1278
1279 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001280 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001281 fetched_status=None, other_cl_owner=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001282 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001283 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001284 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001285 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001286 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001287 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1288 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001289 ]
1290 calls += cls._is_gerrit_calls(True)
1291 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001292 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001293 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1294 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001295 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001296 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001297 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001298 ((['get_or_create_merge_base', 'master',
1299 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001300 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001301 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001302 ]
1303 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1304
1305 if issue:
1306 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001307 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001308 '123456',
1309 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001310 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001311 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001312 'change_id': '123456789',
1313 'current_revision': 'sha1_of_current_revision',
1314 'revisions': { 'sha1_of_current_revision': {
1315 'commit': {'message': fetched_description},
1316 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001317 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001318 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001319 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001320 if fetched_status == 'ABANDONED':
1321 calls += [
1322 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1323 '123456 has been abandoned, new uploads are not '
1324 'allowed'), SystemExitMock()),
1325 ]
1326 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001327 if other_cl_owner:
1328 calls += [
1329 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1330 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001331
1332 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1333 get_remote_branch=False)
1334 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001335 ((['git', 'rev-parse', '--show-cdup'],), ''),
1336 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001337
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001338 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001339 'diff', '--name-status', '--no-renames', '-r',
1340 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001341 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001342 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001343 ]
1344
1345 if not issue:
1346 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001347 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001348 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001349 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001350 ]
1351
1352 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001353 ((['git', 'config', 'user.email'],), 'me@example.com'),
1354 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001355 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1356 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001357 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001358 ]
1359 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001360
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001361 @classmethod
1362 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001363 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001364 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001365 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001366 post_amend_description=None, issue=None, cc=None,
1367 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001368 if post_amend_description is None:
1369 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001370 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001371 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001372
tandriia60502f2016-06-20 02:01:53 -07001373 if squash_mode == 'default':
1374 calls.extend([
1375 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1376 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1377 ])
1378 elif squash_mode in ('override_squash', 'override_nosquash'):
1379 calls.extend([
1380 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1381 'true' if squash_mode == 'override_squash' else 'false'),
1382 ])
1383 else:
1384 assert squash_mode in ('squash', 'nosquash')
1385
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001386 # If issue is given, then description is fetched from Gerrit instead.
1387 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001388 calls += [
1389 ((['git', 'log', '--pretty=format:%s\n\n%b',
1390 'fake_ancestor_sha..HEAD'],),
1391 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001392 if squash:
1393 title = 'Initial_upload'
1394 else:
1395 if not title:
1396 calls += [
1397 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001398 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001399 ]
1400 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001401 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001402 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001403 # DownloadGerritHook(False)
1404 ((False, ),
1405 ''),
1406 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001407 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001408 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001409 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001410 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001411 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001412 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001413 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001414 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001415 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001416 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001417 if not issue:
1418 # Prompting to edit description on first upload.
1419 calls += [
1420 ((['git', 'config', 'core.editor'],), ''),
1421 ((['RunEditor'],), description),
1422 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001423 ref_to_push = 'abcdef0123456789'
1424 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001425 ((['git', 'config', 'branch.master.merge'],),
1426 'refs/heads/master'),
1427 ((['git', 'config', 'branch.master.remote'],),
1428 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001429 ((['get_or_create_merge_base', 'master',
1430 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001431 'origin/master'),
1432 ((['git', 'rev-parse', 'HEAD:'],),
1433 '0123456789abcdef'),
1434 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001435 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001436 ref_to_push),
1437 ]
1438 else:
1439 ref_to_push = 'HEAD'
1440
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001441 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001442 ((['git', 'rev-list',
1443 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001444 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001445
Aaron Gable9b713dd2016-12-14 16:04:21 -08001446 if title:
1447 if ref_suffix:
1448 ref_suffix += ',m=' + title
1449 else:
1450 ref_suffix = '%m=' + title
1451
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001452 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1453 if ref_suffix:
1454 ref_suffix += ',' + notify_suffix
1455 else:
1456 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001457
ukai@chromium.orge8077812012-02-03 03:41:46 +00001458 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001459 ref_suffix += ',' + ','.join('r=%s' % email
1460 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001461
1462 if git_mirror is None:
1463 calls += [
1464 ((['git', 'config', 'remote.origin.url'],),
1465 'https://chromium.googlesource.com/yyy/zzz'),
1466 ]
1467 else:
1468 calls += [
1469 ((['git', 'config', 'remote.origin.url'],),
1470 '/cache/this-dir-exists'),
1471 (('os.path.isdir', '/cache/this-dir-exists'),
1472 True),
1473 # Runs in /cache/this-dir-exists.
1474 ((['git', 'config', 'remote.origin.url'],),
1475 'https://chromium.googlesource.com/yyy/zzz'),
1476 ]
1477
ukai@chromium.orge8077812012-02-03 03:41:46 +00001478 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001479 ((['git', 'push',
1480 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001481 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001482 ('remote:\n'
1483 'remote: Processing changes: (\)\n'
1484 'remote: Processing changes: (|)\n'
1485 'remote: Processing changes: (/)\n'
1486 'remote: Processing changes: (-)\n'
1487 'remote: Processing changes: new: 1 (/)\n'
1488 'remote: Processing changes: new: 1, done\n'
1489 'remote:\n'
1490 'remote: New Changes:\n'
1491 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1492 'remote:\n'
1493 'To https://chromium.googlesource.com/yyy/zzz\n'
1494 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001495 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001496 if squash:
1497 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001498 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001499 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001500 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001501 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001502 ((['git', 'config', 'branch.master.gerritsquashhash',
1503 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001504 ]
tandrii88189772016-09-29 04:29:57 -07001505 calls += [
1506 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001507 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001508 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001509 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001510 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001511 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001512 return calls
1513
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001514 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001515 self,
1516 upload_args,
1517 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001518 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001519 squash=True,
1520 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001521 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001522 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001523 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001524 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001525 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001526 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001527 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001528 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001529 fetched_status=None,
1530 other_cl_owner=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001531 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001532 if squash_mode is None:
1533 if '--no-squash' in upload_args:
1534 squash_mode = 'nosquash'
1535 elif '--squash' in upload_args:
1536 squash_mode = 'squash'
1537 else:
1538 squash_mode = 'default'
1539
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001540 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001541 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001542 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001543 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001544 CookiesAuthenticatorMockFactory(
1545 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001546 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1547 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001548 self.mock(git_cl.gclient_utils, 'RunEditor',
1549 lambda *_, **__: self._mocked_call(['RunEditor']))
1550 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1551
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001552 original_os_path_isdir = os.path.isdir
1553 def selective_os_path_isdir_mock(path):
1554 if path == '/cache/this-dir-exists':
1555 return self._mocked_call('os.path.isdir', path)
1556 return original_os_path_isdir(path)
1557 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1558
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001559 self.calls = self._gerrit_base_calls(
1560 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001561 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001562 fetched_status=fetched_status,
1563 other_cl_owner=other_cl_owner)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001564 if fetched_status != 'ABANDONED':
1565 self.calls += self._gerrit_upload_calls(
1566 description, reviewers, squash,
1567 squash_mode=squash_mode,
1568 expected_upstream_ref=expected_upstream_ref,
1569 ref_suffix=ref_suffix, title=title, notify=notify,
1570 post_amend_description=post_amend_description,
1571 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001572 # Uncomment when debugging.
1573 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001574 git_cl.main(['upload'] + upload_args)
1575
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001576 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001577 self._run_gerrit_upload_test(
1578 ['--no-squash'],
1579 'desc\n\nBUG=\n',
1580 [],
1581 squash=False,
1582 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1583
1584 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001585 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001586 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001587 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001588 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001589 [],
tandriia60502f2016-06-20 02:01:53 -07001590 squash=False,
1591 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001592 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001593
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001594 def test_gerrit_no_reviewer(self):
1595 self._run_gerrit_upload_test(
1596 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001597 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001598 [],
1599 squash=False,
1600 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001601
tandriieefe8322016-08-17 10:12:24 -07001602 def test_gerrit_patch_bad_chars(self):
1603 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001604 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001605 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001606 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001607 squash=False,
1608 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001609 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001610 self.assertIn(
1611 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001612 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1613 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001614 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001615
ukai@chromium.orge8077812012-02-03 03:41:46 +00001616 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001617 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001618 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001619 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001620 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001621 squash=False,
1622 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001623 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001624
1625 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001626 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001627 [],
bradnelsond975b302016-10-23 12:20:23 -07001628 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1629 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001630 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001631 ['reviewer@example.com', 'another@example.com'],
1632 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001633 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001634 ref_suffix='%l=Code-Review+1',
1635 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001636
1637 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001638 self._run_gerrit_upload_test(
1639 [],
1640 'desc\nBUG=\n\nChange-Id: 123456789',
1641 [],
1642 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001643
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001644 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001645 self._run_gerrit_upload_test(
1646 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001647 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001648 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001649 squash=True,
1650 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001651
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001652 def test_gerrit_upload_squash_first_with_mirror(self):
1653 self._run_gerrit_upload_test(
1654 ['--squash'],
1655 'desc\nBUG=\n\nChange-Id: 123456789',
1656 [],
1657 squash=True,
1658 expected_upstream_ref='origin/master',
1659 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1660
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001661 def test_gerrit_upload_squash_reupload(self):
1662 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001663 self._run_gerrit_upload_test(
1664 ['--squash'],
1665 description,
1666 [],
1667 squash=True,
1668 expected_upstream_ref='origin/master',
1669 issue=123456)
1670
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001671 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1672 self.mock(git_cl, 'DieWithError',
1673 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1674 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1675 with self.assertRaises(SystemExitMock):
1676 self._run_gerrit_upload_test(
1677 ['--squash'],
1678 description,
1679 [],
1680 squash=True,
1681 expected_upstream_ref='origin/master',
1682 issue=123456,
1683 fetched_status='ABANDONED')
1684
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001685 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1686 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1687 lambda *_, **__: {'email': 'yet-another@example.com'})
1688 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1689 self._run_gerrit_upload_test(
1690 ['--squash'],
1691 description,
1692 [],
1693 squash=True,
1694 expected_upstream_ref='origin/master',
1695 issue=123456,
1696 other_cl_owner='other@example.com')
1697 self.assertIn(
1698 'WARNING: change 123456 is owned by other@example.com, but you '
1699 'authenticate to Gerrit as yet-another@example.com.\n'
1700 'Uploading may fail due to lack of permissions',
1701 git_cl.sys.stdout.getvalue())
1702
rmistry@google.com2dd99862015-06-22 12:22:18 +00001703 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001704 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001705 def mock_run_git(*args, **_kwargs):
1706 if args[0] == ['for-each-ref',
1707 '--format=%(refname:short) %(upstream:short)',
1708 'refs/heads']:
1709 # Create a local branch dependency tree that looks like this:
1710 # test1 -> test2 -> test3 -> test4 -> test5
1711 # -> test3.1
1712 # test6 -> test0
1713 branch_deps = [
1714 'test2 test1', # test1 -> test2
1715 'test3 test2', # test2 -> test3
1716 'test3.1 test2', # test2 -> test3.1
1717 'test4 test3', # test3 -> test4
1718 'test5 test4', # test4 -> test5
1719 'test6 test0', # test0 -> test6
1720 'test7', # test7
1721 ]
1722 return '\n'.join(branch_deps)
1723 self.mock(git_cl, 'RunGit', mock_run_git)
1724
1725 class RecordCalls:
1726 times_called = 0
1727 record_calls = RecordCalls()
1728 def mock_CMDupload(*args, **_kwargs):
1729 record_calls.times_called += 1
1730 return 0
1731 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1732
1733 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001734 (('ask_for_data', 'This command will checkout all dependent branches '
1735 'and run "git cl upload". Press Enter to continue, '
1736 'or Ctrl+C to abort'), ''),
1737 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001738
1739 class MockChangelist():
1740 def __init__(self):
1741 pass
1742 def GetBranch(self):
1743 return 'test1'
1744 def GetIssue(self):
1745 return '123'
1746 def GetPatchset(self):
1747 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001748 def IsGerrit(self):
1749 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001750
1751 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1752 # CMDupload should have been called 5 times because of 5 dependent branches.
1753 self.assertEquals(5, record_calls.times_called)
1754 self.assertEquals(0, ret)
1755
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001756 def test_gerrit_change_id(self):
1757 self.calls = [
1758 ((['git', 'write-tree'], ),
1759 'hashtree'),
1760 ((['git', 'rev-parse', 'HEAD~0'], ),
1761 'branch-parent'),
1762 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1763 'A B <a@b.org> 1456848326 +0100'),
1764 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1765 'C D <c@d.org> 1456858326 +0100'),
1766 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1767 'hashchange'),
1768 ]
1769 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1770 self.assertEqual(change_id, 'Ihashchange')
1771
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001772 def test_desecription_append_footer(self):
1773 for init_desc, footer_line, expected_desc in [
1774 # Use unique desc first lines for easy test failure identification.
1775 ('foo', 'R=one', 'foo\n\nR=one'),
1776 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1777 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1778 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1779 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1780 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1781 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1782 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1783 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1784 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1785 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1786 ]:
1787 desc = git_cl.ChangeDescription(init_desc)
1788 desc.append_footer(footer_line)
1789 self.assertEqual(desc.description, expected_desc)
1790
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001791 def test_update_reviewers(self):
1792 data = [
1793 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001794 ('foo\nR=xx', [], 'foo\nR=xx'),
1795 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001796 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001797 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1798 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1799 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001800 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001801 ('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 +00001802 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001803 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1804 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1805 # Same as the line before, but full of whitespaces.
1806 (
1807 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1808 'foo\nBar\n\nR=c@c\n BUG =',
1809 ),
1810 # Whitespaces aren't interpreted as new lines.
1811 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001812 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001813 expected = [i[2] for i in data]
1814 actual = []
1815 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001816 obj = git_cl.ChangeDescription(orig)
1817 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001818 actual.append(obj.description)
1819 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001820
wittman@chromium.org455dc922015-01-26 20:15:50 +00001821 def test_get_target_ref(self):
1822 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001823 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001824 self.assertEqual(None, git_cl.GetTargetRef(None,
1825 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001826 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001827
wittman@chromium.org455dc922015-01-26 20:15:50 +00001828 # Check default target refs for branches.
1829 self.assertEqual('refs/heads/master',
1830 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001831 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001832 self.assertEqual('refs/heads/master',
1833 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001834 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001835 self.assertEqual('refs/heads/master',
1836 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001837 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001838 self.assertEqual('refs/branch-heads/123',
1839 git_cl.GetTargetRef('origin',
1840 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001841 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001842 self.assertEqual('refs/diff/test',
1843 git_cl.GetTargetRef('origin',
1844 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001845 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001846 self.assertEqual('refs/heads/chrome/m42',
1847 git_cl.GetTargetRef('origin',
1848 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001849 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001850
1851 # Check target refs for user-specified target branch.
1852 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1853 'refs/remotes/branch-heads/123'):
1854 self.assertEqual('refs/branch-heads/123',
1855 git_cl.GetTargetRef('origin',
1856 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001857 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001858 for branch in ('origin/master', 'remotes/origin/master',
1859 'refs/remotes/origin/master'):
1860 self.assertEqual('refs/heads/master',
1861 git_cl.GetTargetRef('origin',
1862 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001863 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001864 for branch in ('master', 'heads/master', 'refs/heads/master'):
1865 self.assertEqual('refs/heads/master',
1866 git_cl.GetTargetRef('origin',
1867 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001868 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001869
wychen@chromium.orga872e752015-04-28 23:42:18 +00001870 def test_patch_when_dirty(self):
1871 # Patch when local tree is dirty
1872 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1873 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1874
1875 def test_diff_when_dirty(self):
1876 # Do 'git cl diff' when local tree is dirty
1877 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1878 self.assertNotEqual(git_cl.main(['diff']), 0)
1879
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001880 @staticmethod
1881 def _get_gerrit_codereview_server_calls(branch, value=None,
1882 git_short_host='host',
1883 detect_branch=True):
1884 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1885
1886 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1887 """
1888 calls = []
1889 if detect_branch:
1890 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1891 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1892 CERR1 if value is None else value))
1893 if value is None:
1894 calls += [
1895 ((['git', 'config', 'branch.' + branch + '.merge'],),
1896 'refs/heads' + branch),
1897 ((['git', 'config', 'branch.' + branch + '.remote'],),
1898 'origin'),
1899 ((['git', 'config', 'remote.origin.url'],),
1900 'https://%s.googlesource.com/my/repo' % git_short_host),
1901 ]
1902 return calls
1903
tandriidf09a462016-08-18 16:23:55 -07001904 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001905 new_branch=False, git_short_host='host',
1906 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001907 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001908 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1909 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001910 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001911 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001912 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1913
tandriidf09a462016-08-18 16:23:55 -07001914 if new_branch:
1915 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1916 else:
1917 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001918
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001919 if not force_codereview:
1920 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001921 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001922 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001923 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1924 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001925 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001926 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001927
1928 if is_gerrit:
1929 if not force_codereview:
1930 self.calls += [
1931 ((['git', 'config', 'gerrit.host'],), 'true'),
1932 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001933 if detect_gerrit_server:
1934 self.calls += self._get_gerrit_codereview_server_calls(
1935 'master', git_short_host=git_short_host,
1936 detect_branch=not new_branch and force_codereview)
1937
1938 self.calls += [
1939 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001940 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001941 {
1942 'current_revision': '7777777777',
1943 'revisions': {
1944 '1111111111': {
1945 '_number': 1,
1946 'fetch': {'http': {
1947 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1948 'ref': 'refs/changes/56/123456/1',
1949 }},
1950 },
1951 '7777777777': {
1952 '_number': 7,
1953 'fetch': {'http': {
1954 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1955 'ref': 'refs/changes/56/123456/7',
1956 }},
1957 },
1958 },
1959 }),
1960 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001961 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001962 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001963 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001964 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001965 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001966 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001967 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001968
tandriidf09a462016-08-18 16:23:55 -07001969 def _common_patch_successful(self, new_branch=False):
1970 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001971 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001972 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001973 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001974 ((['git', 'config', 'branch.master.rietveldserver',
1975 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001976 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001977 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001978 ((['git', 'commit', '-m',
1979 'Description\n\n' +
1980 'patch from issue 123456 at patchset 60001 ' +
1981 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001982 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001983
1984 def test_patch_successful(self):
1985 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001986 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1987
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001988 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001989 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001990 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1991
wychen@chromium.orga872e752015-04-28 23:42:18 +00001992 def test_patch_conflict(self):
1993 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001994 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001995 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001996
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001997 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001998 self._patch_common(is_gerrit=True, git_short_host='chromium',
1999 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002000 self.calls += [
2001 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2002 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002003 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002004 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002005 ((['git', 'config', 'branch.master.gerritserver',
2006 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002007 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002008 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002009 ]
2010 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2011
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002012 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002013 self._patch_common(is_gerrit=True, force_codereview=True,
2014 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002015 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002016 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002017 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002018 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002019 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002020 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002021 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002022 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002023 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002024 ]
2025 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2026
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002027 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002028 self._patch_common(is_gerrit=True, git_short_host='else',
2029 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002030 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002031 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002032 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002033 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002034 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002035 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002036 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002037 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002038 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002039 ]
2040 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002041 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002042
2043 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002044 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
2045 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002046 self.calls += [
2047 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2048 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002049 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2050 ''),
2051 ((['git', 'config', 'branch.master.gerritserver',
2052 'https://chromium-review.googlesource.com'],), ''),
2053 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002054 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2055 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2056 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002057 ]
2058 with self.assertRaises(SystemExitMock):
2059 git_cl.main(['patch',
2060 'https://chromium-review.googlesource.com/#/c/123456/1'])
2061
tandriic2405f52016-10-10 08:13:15 -07002062 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002063 def notExists(_issue, *_, **kwargs):
2064 self.assertFalse(kwargs['ignore_404'])
2065 raise git_cl.gerrit_util.GerritError(404, '')
2066 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2067
tandriic2405f52016-10-10 08:13:15 -07002068 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07002069 self.calls = [
2070 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2071 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2072 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2073 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2074 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2075 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08002076 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07002077 'or you have no access to it'],), SystemExitMock()),
2078 ]
2079 with self.assertRaises(SystemExitMock):
2080 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
2081
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002082 def _checkout_calls(self):
2083 return [
2084 ((['git', 'config', '--local', '--get-regexp',
2085 'branch\\..*\\.rietveldissue'], ),
2086 ('branch.retrying.rietveldissue 1111111111\n'
2087 'branch.some-fix.rietveldissue 2222222222\n')),
2088 ((['git', 'config', '--local', '--get-regexp',
2089 'branch\\..*\\.gerritissue'], ),
2090 ('branch.ger-branch.gerritissue 123456\n'
2091 'branch.gbranch654.gerritissue 654321\n')),
2092 ]
2093
2094 def test_checkout_gerrit(self):
2095 """Tests git cl checkout <issue>."""
2096 self.calls = self._checkout_calls()
2097 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2098 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2099
2100 def test_checkout_rietveld(self):
2101 """Tests git cl checkout <issue>."""
2102 self.calls = self._checkout_calls()
2103 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2104 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2105
2106 def test_checkout_not_found(self):
2107 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002108 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002109 self.calls = self._checkout_calls()
2110 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2111
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002112 def test_checkout_no_branch_issues(self):
2113 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002114 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002115 self.calls = [
2116 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002117 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002118 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002119 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002120 ]
2121 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2122
tandrii@chromium.org28253532016-04-14 13:46:56 +00002123 def _test_gerrit_ensure_authenticated_common(self, auth,
2124 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002125 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2126 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2127 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002128 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002129 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002130 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002131 cl.branch = 'master'
2132 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002133 cl.lookedup_issue = True
2134 return cl
2135
2136 def test_gerrit_ensure_authenticated_missing(self):
2137 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002138 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002139 })
2140 self.calls.append(
2141 ((['DieWithError',
2142 'Credentials for the following hosts are required:\n'
2143 ' chromium-review.googlesource.com\n'
2144 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002145 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002146 'https://chromium-review.googlesource.com/new-password'],), ''),)
2147 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2148
2149 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002150 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002151 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002152 'chromium.googlesource.com':
2153 ('git-one.example.com', None, 'secret1'),
2154 'chromium-review.googlesource.com':
2155 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002156 })
2157 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002158 (('ask_for_data', 'If you know what you are doing '
2159 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002160 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2161
2162 def test_gerrit_ensure_authenticated_ok(self):
2163 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002164 'chromium.googlesource.com':
2165 ('git-same.example.com', None, 'secret'),
2166 'chromium-review.googlesource.com':
2167 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002168 })
2169 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2170
tandrii@chromium.org28253532016-04-14 13:46:56 +00002171 def test_gerrit_ensure_authenticated_skipped(self):
2172 cl = self._test_gerrit_ensure_authenticated_common(
2173 auth={}, skip_auth_check=True)
2174 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2175
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002176 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002177 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2178 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002179 self.calls = [
2180 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002181 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002182 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2183 ((['git', 'config', 'rietveld.server'],), ''),
2184 ((['git', 'config', 'rietveld.server'],), ''),
2185 ((['git', 'config', 'branch.feature.rietveldserver'],),
2186 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002187 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002188 ]
2189 self.assertEqual(0, git_cl.main(['set-commit']))
2190
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002191 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002192 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002193 lambda h, i, labels, notify=None:
2194 self._mocked_call(['SetReview', h, i, labels, notify]))
2195
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002196 self.calls = [
2197 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002198 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2199 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002200 ((['git', 'config', 'branch.feature.gerritserver'],),
2201 'https://chromium-review.googlesource.com'),
2202 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002203 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002204 ]
tandriid9e5ce52016-07-13 02:32:59 -07002205
2206 def test_cmd_set_commit_gerrit_clear(self):
2207 self._cmd_set_commit_gerrit_common(0)
2208 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2209
2210 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002211 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002212 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2213
tandriid9e5ce52016-07-13 02:32:59 -07002214 def test_cmd_set_commit_gerrit(self):
2215 self._cmd_set_commit_gerrit_common(2)
2216 self.assertEqual(0, git_cl.main(['set-commit']))
2217
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002218 def test_description_display(self):
2219 out = StringIO.StringIO()
2220 self.mock(git_cl.sys, 'stdout', out)
2221
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002222 self.mock(git_cl, 'Changelist', ChangelistMock)
2223 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002224
2225 self.assertEqual(0, git_cl.main(['description', '-d']))
2226 self.assertEqual('foo\n', out.getvalue())
2227
2228 def test_description_rietveld(self):
2229 out = StringIO.StringIO()
2230 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002231 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002232
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002233 self.assertEqual(0, git_cl.main([
2234 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2235 self.assertEqual('foobar\n', out.getvalue())
2236
iannucci3c972b92016-08-17 13:24:10 -07002237 def test_StatusFieldOverrideIssueMissingArgs(self):
2238 out = StringIO.StringIO()
2239 self.mock(git_cl.sys, 'stderr', out)
2240
2241 try:
2242 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2243 except SystemExit as ex:
2244 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002245 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002246
2247 out = StringIO.StringIO()
2248 self.mock(git_cl.sys, 'stderr', out)
2249
2250 try:
2251 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2252 except SystemExit as ex:
2253 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002254 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002255
2256 def test_StatusFieldOverrideIssue(self):
2257 out = StringIO.StringIO()
2258 self.mock(git_cl.sys, 'stdout', out)
2259
2260 def assertIssue(cl_self, *_args):
2261 self.assertEquals(cl_self.issue, 1)
2262 return 'foobar'
2263
2264 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2265 self.calls = [
2266 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2267 ((['git', 'config', 'rietveld.server'],), ''),
2268 ((['git', 'config', 'rietveld.server'],), ''),
2269 ]
iannuccie53c9352016-08-17 14:40:40 -07002270 self.assertEqual(
2271 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2272 0)
iannucci3c972b92016-08-17 13:24:10 -07002273 self.assertEqual(out.getvalue(), 'foobar\n')
2274
iannuccie53c9352016-08-17 14:40:40 -07002275 def test_SetCloseOverrideIssue(self):
2276 def assertIssue(cl_self, *_args):
2277 self.assertEquals(cl_self.issue, 1)
2278 return 'foobar'
2279
2280 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2281 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2282 self.calls = [
2283 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2284 ((['git', 'config', 'rietveld.server'],), ''),
2285 ((['git', 'config', 'rietveld.server'],), ''),
2286 ]
2287 self.assertEqual(
2288 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2289
2290 def test_SetCommitOverrideIssue(self):
2291 def assertIssue(cl_self, *_args):
2292 self.assertEquals(cl_self.issue, 1)
2293 return 'foobar'
2294
2295 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2296 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2297 self.calls = [
2298 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2299 ((['git', 'config', 'rietveld.server'],), ''),
2300 ((['git', 'config', 'rietveld.server'],), ''),
2301 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2302 ((['git', 'config', 'rietveld.server'],), ''),
2303 ((['git', 'config', 'rietveld.server'],), ''),
2304 ]
2305 self.assertEqual(
2306 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2307
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002308 def test_description_gerrit(self):
2309 out = StringIO.StringIO()
2310 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002311 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002312 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002313 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2314 {
2315 'current_revision': 'sha1',
2316 'revisions': {'sha1': {
2317 'commit': {'message': 'foobar'},
2318 }},
2319 }),
2320 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002321 self.assertEqual(0, git_cl.main([
2322 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2323 self.assertEqual('foobar\n', out.getvalue())
2324
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002325 def test_description_set_raw(self):
2326 out = StringIO.StringIO()
2327 self.mock(git_cl.sys, 'stdout', out)
2328
2329 self.mock(git_cl, 'Changelist', ChangelistMock)
2330 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2331
2332 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2333 self.assertEqual('hihi', ChangelistMock.desc)
2334
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002335 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002336 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002337
2338 def RunEditor(desc, _, **kwargs):
2339 self.assertEquals(
2340 '# Enter a description of the change.\n'
2341 '# This will be displayed on the codereview site.\n'
2342 '# The first line will also be used as the subject of the review.\n'
2343 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002344 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002345 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002346 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002347 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002348 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002349
dsansomee2d6fd92016-09-08 00:10:47 -07002350 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002351 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002352
2353 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2354 self.mock(git_cl.Changelist, 'GetDescription',
2355 lambda *args: current_desc)
2356 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2357 UpdateDescriptionRemote)
2358 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2359
2360 self.calls = [
2361 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002362 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002363 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2364 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002365 ((['git', 'config', 'core.editor'],), 'vi'),
2366 ]
2367 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2368
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002369 def test_description_set_stdin(self):
2370 out = StringIO.StringIO()
2371 self.mock(git_cl.sys, 'stdout', out)
2372
2373 self.mock(git_cl, 'Changelist', ChangelistMock)
2374 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2375
2376 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2377 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2378
kmarshall3bff56b2016-06-06 18:31:47 -07002379 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002380 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2381
kmarshall3bff56b2016-06-06 18:31:47 -07002382 self.calls = \
2383 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2384 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002385 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002386 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2387 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002388 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2389 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2390 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002391 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2392 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2393 ((['git', 'branch', '-D', 'foo'],), '')]
2394
kmarshall3bff56b2016-06-06 18:31:47 -07002395 self.mock(git_cl, 'get_cl_statuses',
2396 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002397 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2398 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2399 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002400
2401 self.assertEqual(0, git_cl.main(['archive', '-f']))
2402
2403 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002404 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002405 self.calls = \
2406 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2407 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002408 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002409 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2410 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002411 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2412
kmarshall9249e012016-08-23 12:02:16 -07002413 self.mock(git_cl, 'get_cl_statuses',
2414 lambda branches, fine_grained, max_processes:
2415 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2416
2417 self.assertEqual(1, git_cl.main(['archive', '-f']))
2418
2419 def test_archive_dry_run(self):
2420 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2421
2422 self.calls = \
2423 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2424 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2425 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2426 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2427 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2428 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2429 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2430 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2431 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002432
2433 self.mock(git_cl, 'get_cl_statuses',
2434 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002435 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2436 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2437 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002438
kmarshall9249e012016-08-23 12:02:16 -07002439 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2440
2441 def test_archive_no_tags(self):
2442 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2443
2444 self.calls = \
2445 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2446 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2447 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2448 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2449 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2450 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2451 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2452 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2453 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2454 ((['git', 'branch', '-D', 'foo'],), '')]
2455
2456 self.mock(git_cl, 'get_cl_statuses',
2457 lambda branches, fine_grained, max_processes:
2458 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2459 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2460 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2461
2462 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002463
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002464 def test_cmd_issue_erase_existing(self):
2465 out = StringIO.StringIO()
2466 self.mock(git_cl.sys, 'stdout', out)
2467 self.calls = [
2468 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002469 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2470 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002471 # Let this command raise exception (retcode=1) - it should be ignored.
2472 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002473 CERR1),
2474 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2475 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002476 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2477 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2478 ''),
2479 ]
2480 self.assertEqual(0, git_cl.main(['issue', '0']))
2481
phajdan.jre328cf92016-08-22 04:12:17 -07002482 def test_cmd_issue_json(self):
2483 out = StringIO.StringIO()
2484 self.mock(git_cl.sys, 'stdout', out)
2485 self.calls = [
2486 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002487 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002488 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2489 ((['git', 'config', 'rietveld.server'],),
2490 'https://codereview.chromium.org'),
2491 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2492 (('write_json', 'output.json',
2493 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2494 ''),
2495 ]
2496 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2497
tandriide281ae2016-10-12 06:02:30 -07002498 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002499 self.mock(git_cl.Changelist, 'GetChange',
2500 lambda _, *a: (
2501 self._mocked_call(['GetChange']+list(a))))
2502 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2503 lambda *_, **__: (
2504 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002505 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2506 lambda _, s: self._mocked_call(['SetCQState', s]))
2507 self.calls = [
2508 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002509 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002510 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2511 ((['git', 'config', 'rietveld.server'],),
2512 'https://codereview.chromium.org'),
2513 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2514 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2515 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2516 ((['get_or_create_merge_base', 'feature', 'feature'],),
2517 'fake_ancestor_sha'),
2518 ((['GetChange', 'fake_ancestor_sha', None], ),
2519 git_cl.presubmit_support.GitChange(
2520 '', '', '', '', '', '', '', '')),
2521 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2522 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002523 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2524 ]
2525 out = StringIO.StringIO()
2526 self.mock(git_cl.sys, 'stdout', out)
2527 self.assertEqual(0, git_cl.main(['try']))
2528 self.assertEqual(
2529 out.getvalue(),
2530 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2531
tandrii8c5a3532016-11-04 07:52:02 -07002532 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2533 self.mock(git_cl.Changelist, 'GetChange',
2534 lambda _, *a: (
2535 self._mocked_call(['GetChange']+list(a))))
2536 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2537 lambda *_, **__: (
2538 self._mocked_call(['DoGetTryMasters'])))
2539 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2540 lambda _, s: self._mocked_call(['SetCQState', s]))
2541
tandrii8c5a3532016-11-04 07:52:02 -07002542 self.calls = [
2543 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2544 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2545 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2546 ((['git', 'config', 'branch.feature.gerritserver'],),
2547 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002548 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2549 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2550 'project': 'depot_tools',
2551 'status': 'OPEN',
2552 'owner': {'email': 'owner@e.mail'},
2553 'revisions': {
2554 'deadbeaf': {
2555 '_number': 6,
2556 },
2557 'beeeeeef': {
2558 '_number': 7,
2559 'fetch': {'http': {
2560 'url': 'https://chromium.googlesource.com/depot_tools',
2561 'ref': 'refs/changes/56/123456/7'
2562 }},
2563 },
2564 },
2565 }),
tandrii8c5a3532016-11-04 07:52:02 -07002566 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2567 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2568 ((['get_or_create_merge_base', 'feature', 'feature'],),
2569 'fake_ancestor_sha'),
2570 ((['GetChange', 'fake_ancestor_sha', None], ),
2571 git_cl.presubmit_support.GitChange(
2572 '', '', '', '', '', '', '', '')),
2573 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2574 ((['DoGetTryMasters'], ), None),
2575 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2576 ]
2577 out = StringIO.StringIO()
2578 self.mock(git_cl.sys, 'stdout', out)
2579 self.assertEqual(0, git_cl.main(['try']))
2580 self.assertEqual(
2581 out.getvalue(),
2582 'scheduled CQ Dry Run on '
2583 'https://chromium-review.googlesource.com/123456\n')
2584
2585 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2586 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2587 lambda _: {
2588 'owner_email': 'owner@e.mail',
2589 'private': False,
2590 'closed': False,
2591 'project': 'depot_tools',
2592 'patchsets': [20001],
2593 })
tandriide281ae2016-10-12 06:02:30 -07002594 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2595 self.calls = [
2596 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2597 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2598 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2599 ((['git', 'config', 'rietveld.server'],),
2600 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002601 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002602 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002603 ]
2604
2605 def _buildbucket_retry(*_, **kw):
2606 # self.maxDiff = 10000
2607 body = json.loads(kw['body'])
2608 self.assertEqual(len(body['builds']), 1)
2609 build = body['builds'][0]
2610 params = json.loads(build.pop('parameters_json'))
2611 self.assertEqual(params, {
2612 u'builder_name': u'win',
2613 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2614 u'revision': None}],
2615 u'properties': {
2616 u'category': u'git_cl_try',
2617 u'issue': 123,
2618 u'key': u'val',
2619 u'json': [{u'a': 1}, None],
2620 u'master': u'tryserver.chromium',
2621 u'patch_project': u'depot_tools',
2622 u'patch_storage': u'rietveld',
2623 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002624 u'rietveld': u'https://codereview.chromium.org',
2625 }
2626 })
2627 self.assertEqual(build, {
2628 u'bucket': u'master.tryserver.chromium',
2629 u'client_operation_id': u'uuid4',
2630 u'tags': [u'builder:win',
2631 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002632 u'user_agent:git_cl_try',
2633 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002634 })
2635
2636 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2637
2638 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2639 self.assertEqual(0, git_cl.main([
2640 'try', '-m', 'tryserver.chromium', '-b', 'win',
2641 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2642 self.assertRegexpMatches(
2643 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002644 'Tried jobs on:\nBucket: master.tryserver.chromium')
2645
tandrii8c5a3532016-11-04 07:52:02 -07002646 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2647 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2648 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2649
tandrii8c5a3532016-11-04 07:52:02 -07002650 self.calls = [
2651 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2652 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2653 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2654 ((['git', 'config', 'branch.feature.gerritserver'],),
2655 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002656 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002657 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002658 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002659 'status': 'OPEN',
2660 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002661 'revisions': {
2662 'deadbeaf': {
2663 '_number': 6,
2664 },
2665 'beeeeeef': {
2666 '_number': 7,
2667 'fetch': {'http': {
2668 'url': 'https://chromium.googlesource.com/depot_tools',
2669 'ref': 'refs/changes/56/123456/7'
2670 }},
2671 },
2672 },
2673 }),
2674 ]
2675
2676 def _buildbucket_retry(*_, **kw):
2677 # self.maxDiff = 10000
2678 body = json.loads(kw['body'])
2679 self.assertEqual(len(body['builds']), 1)
2680 build = body['builds'][0]
2681 params = json.loads(build.pop('parameters_json'))
2682 self.assertEqual(params, {
2683 u'builder_name': u'win',
2684 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2685 u'revision': None}],
2686 u'properties': {
2687 u'category': u'git_cl_try',
2688 u'key': u'val',
2689 u'json': [{u'a': 1}, None],
2690 u'master': u'tryserver.chromium',
2691
2692 u'patch_gerrit_url':
2693 u'https://chromium-review.googlesource.com',
2694 u'patch_issue': 123456,
2695 u'patch_project': u'depot_tools',
2696 u'patch_ref': u'refs/changes/56/123456/7',
2697 u'patch_repository_url':
2698 u'https://chromium.googlesource.com/depot_tools',
2699 u'patch_set': 7,
2700 u'patch_storage': u'gerrit',
2701 }
2702 })
2703 self.assertEqual(build, {
2704 u'bucket': u'master.tryserver.chromium',
2705 u'client_operation_id': u'uuid4',
2706 u'tags': [
2707 u'builder:win',
2708 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2709 u'user_agent:git_cl_try',
2710 u'master:tryserver.chromium'],
2711 })
2712
2713 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2714
2715 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2716 self.assertEqual(0, git_cl.main([
2717 'try', '-m', 'tryserver.chromium', '-b', 'win',
2718 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2719 self.assertRegexpMatches(
2720 git_cl.sys.stdout.getvalue(),
2721 'Tried jobs on:\nBucket: master.tryserver.chromium')
2722
borenet6c0efe62016-10-19 08:13:29 -07002723 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002724 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2725 lambda _: {
2726 'owner_email': 'owner@e.mail',
2727 'private': False,
2728 'closed': False,
2729 'project': 'depot_tools',
2730 'patchsets': [20001],
2731 })
borenet6c0efe62016-10-19 08:13:29 -07002732 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2733 self.calls = [
2734 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2735 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2736 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2737 ((['git', 'config', 'rietveld.server'],),
2738 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002739 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002740 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002741 ]
2742
2743 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002744 body = json.loads(kw['body'])
2745 self.assertEqual(len(body['builds']), 1)
2746 build = body['builds'][0]
2747 params = json.loads(build.pop('parameters_json'))
2748 self.assertEqual(params, {
2749 u'builder_name': u'win',
2750 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2751 u'revision': None}],
2752 u'properties': {
2753 u'category': u'git_cl_try',
2754 u'issue': 123,
2755 u'patch_project': u'depot_tools',
2756 u'patch_storage': u'rietveld',
2757 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002758 u'rietveld': u'https://codereview.chromium.org',
2759 }
2760 })
2761 self.assertEqual(build, {
2762 u'bucket': u'test.bucket',
2763 u'client_operation_id': u'uuid4',
2764 u'tags': [u'builder:win',
2765 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2766 u'user_agent:git_cl_try'],
2767 })
2768
2769 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2770
2771 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2772 self.assertEqual(0, git_cl.main([
2773 'try', '-B', 'test.bucket', '-b', 'win']))
2774 self.assertRegexpMatches(
2775 git_cl.sys.stdout.getvalue(),
2776 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002777
qyearsley123a4682016-10-26 09:12:17 -07002778 def test_git_cl_try_bots_on_multiple_masters(self):
2779 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2780 self.calls = [
2781 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2782 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2783 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2784 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002785 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002786 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2787 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2788 ]
2789
2790 def _buildbucket_retry(*_, **kw):
2791 body = json.loads(kw['body'])
2792 self.assertEqual(len(body['builds']), 2)
2793
2794 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2795 self.assertEqual(first_build_params['builder_name'], 'builder1')
2796 self.assertEqual(first_build_params['properties']['master'], 'master1')
2797
2798 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2799 self.assertEqual(first_build_params['builder_name'], 'builder2')
2800 self.assertEqual(first_build_params['properties']['master'], 'master2')
2801
2802 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2803
2804 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2805 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2806
2807 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2808 self.assertEqual(
2809 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2810 self.assertEqual(
2811 git_cl.sys.stdout.getvalue(),
2812 'Tried jobs on:\n'
2813 'Bucket: master.master1\n'
2814 ' builder1: []\n'
2815 'Bucket: master.master2\n'
2816 ' builder2: []\n'
2817 'To see results here, run: git cl try-results\n'
2818 'To see results in browser, run: git cl web\n')
2819
tandrii16e0b4e2016-06-07 10:34:28 -07002820 def _common_GerritCommitMsgHookCheck(self):
2821 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2822 self.mock(git_cl.os.path, 'abspath',
2823 lambda path: self._mocked_call(['abspath', path]))
2824 self.mock(git_cl.os.path, 'exists',
2825 lambda path: self._mocked_call(['exists', path]))
2826 self.mock(git_cl.gclient_utils, 'FileRead',
2827 lambda path: self._mocked_call(['FileRead', path]))
2828 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2829 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2830 self.calls = [
2831 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2832 ((['abspath', '../'],), '/abs/git_repo_root'),
2833 ]
2834 return git_cl.Changelist(codereview='gerrit', issue=123)
2835
2836 def test_GerritCommitMsgHookCheck_custom_hook(self):
2837 cl = self._common_GerritCommitMsgHookCheck()
2838 self.calls += [
2839 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2840 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2841 '#!/bin/sh\necho "custom hook"')
2842 ]
2843 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2844
2845 def test_GerritCommitMsgHookCheck_not_exists(self):
2846 cl = self._common_GerritCommitMsgHookCheck()
2847 self.calls += [
2848 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2849 ]
2850 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2851
2852 def test_GerritCommitMsgHookCheck(self):
2853 cl = self._common_GerritCommitMsgHookCheck()
2854 self.calls += [
2855 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2856 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2857 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002858 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002859 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2860 ''),
2861 ]
2862 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2863
tandriic4344b52016-08-29 06:04:54 -07002864 def test_GerritCmdLand(self):
2865 self.calls += [
2866 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2867 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2868 'deadbeaf'),
2869 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2870 ((['git', 'config', 'branch.feature.gerritserver'],),
2871 'chromium-review.googlesource.com'),
2872 ]
2873 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2874 cl._codereview_impl._GetChangeDetail = lambda _: {
2875 'labels': {},
2876 'current_revision': 'deadbeaf',
2877 }
agable32978d92016-11-01 12:55:02 -07002878 cl._codereview_impl._GetChangeCommit = lambda: {
2879 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002880 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002881 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2882 }
tandriic4344b52016-08-29 06:04:54 -07002883 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002884 out = StringIO.StringIO()
2885 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002886 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002887 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002888 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002889
tandrii221ab252016-10-06 08:12:04 -07002890 BUILDBUCKET_BUILDS_MAP = {
2891 '9000': {
2892 'id': '9000',
2893 'status': 'STARTED',
2894 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2895 'result_details_json': '{"properties": {}}',
2896 'bucket': 'master.x.y',
2897 'created_by': 'user:someone@chromium.org',
2898 'created_ts': '147200002222000',
2899 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2900 },
2901 '8000': {
2902 'id': '8000',
2903 'status': 'COMPLETED',
2904 'result': 'FAILURE',
2905 'failure_reason': 'BUILD_FAILURE',
2906 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2907 'result_details_json': '{"properties": {}}',
2908 'bucket': 'master.x.y',
2909 'created_by': 'user:someone@chromium.org',
2910 'created_ts': '147200001111000',
2911 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2912 },
2913 }
2914
2915 def test_write_try_results_json(self):
2916 expected_output = [
2917 {
2918 'buildbucket_id': '8000',
2919 'bucket': 'master.x.y',
2920 'builder_name': 'my-builder',
2921 'status': 'COMPLETED',
2922 'result': 'FAILURE',
2923 'failure_reason': 'BUILD_FAILURE',
2924 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2925 },
2926 {
2927 'buildbucket_id': '9000',
2928 'bucket': 'master.x.y',
2929 'builder_name': 'my-builder',
2930 'status': 'STARTED',
2931 'result': None,
2932 'failure_reason': None,
2933 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2934 }
2935 ]
2936 self.calls = [(('write_json', 'output.json', expected_output), '')]
2937 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2938
tandrii45b2a582016-10-11 03:14:16 -07002939 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002940 out = StringIO.StringIO()
2941 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002942 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2943 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002944 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2945 self._mocked_call(['get_authenticator_for_host', host]))
2946 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2947 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002948
2949 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2950 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002951 self.calls += [
2952 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2953 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2954 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2955 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2956 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2957 ((['git', 'config', 'branch.feature.rietveldserver'],),
2958 'codereview.example.com'),
2959 ((['get_authenticator_for_host', 'codereview.example.com'],),
2960 AuthenticatorMock()),
2961 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2962
2963 def test_fetch_try_jobs_none_rietveld(self):
2964 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002965 # Simulate that user isn't logged in.
2966 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002967 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002968 self.assertRegexpMatches(sys.stdout.getvalue(),
2969 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002970 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2971
2972 def test_fetch_try_jobs_some_rietveld(self):
2973 self._setup_fetch_try_jobs_rietveld({
2974 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2975 })
2976 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002977 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2978 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2979 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2980
2981 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2982 self._setup_fetch_try_jobs(most_recent_patchset=13)
2983 self.calls += [
2984 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2985 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2986 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002987 # TODO(tandrii): Uncomment the below if we decide to support checking
2988 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002989 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002990 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002991 ((['git', 'config', 'branch.feature.gerritserver'],),
2992 'https://x-review.googlesource.com'),
2993 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2994 AuthenticatorMock()),
2995 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2996
2997 def test_fetch_try_jobs_none_gerrit(self):
2998 self._setup_fetch_try_jobs_gerrit({})
2999 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003000 # TODO(tandrii): Uncomment the below if we decide to support checking
3001 # patchsets for Gerrit.
3002 # self.assertRegexpMatches(
3003 # sys.stdout.getvalue(),
3004 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003005 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3006
3007 def test_fetch_try_jobs_some_gerrit(self):
3008 self._setup_fetch_try_jobs_gerrit({
3009 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3010 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003011 # TODO(tandrii): Uncomment the below if we decide to support checking
3012 # patchsets for Gerrit.
3013 # self.calls.remove(
3014 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003015 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3016
3017 # ... and doesn't result in warning.
3018 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3019 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003020 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3021 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3022
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003023 def _mock_gerrit_changes_for_detail_cache(self):
3024 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003025
3026 def test_gerrit_change_detail_cache_normalize(self):
3027 self._mock_gerrit_changes_for_detail_cache()
3028 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003029 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003030 ]
3031 cl = git_cl.Changelist(codereview='gerrit')
3032 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3033 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3034 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3035 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3036
3037 def test_gerrit_change_detail_cache_simple(self):
3038 self._mock_gerrit_changes_for_detail_cache()
3039 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003040 (('GetChangeDetail', 'host', '1', []), 'a'),
3041 (('GetChangeDetail', 'host', '2', []), 'b'),
3042 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003043 ]
3044 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3045 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3046 self.assertEqual(cl._GetChangeDetail(), 'a')
3047 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003048 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003049 self.assertEqual(cl._GetChangeDetail(), 'a')
3050 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3051
3052 def test_gerrit_change_detail_cache_options(self):
3053 self._mock_gerrit_changes_for_detail_cache()
3054 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003055 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3056 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3057 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3058 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003059 ]
3060 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3061 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3062 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3063 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3064 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3065 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3066 self.assertEqual(cl._GetChangeDetail(), 'cab')
3067
3068 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3069 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3070 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3071 self.assertEqual(cl._GetChangeDetail(), 'cab')
3072
3073 # Finally, no_cache should invalidate all caches for given change.
3074 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3075 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3076
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003077 def test_gerrit_description_caching(self):
3078 def gen_detail(rev, desc):
3079 return {
3080 'current_revision': rev,
3081 'revisions': {rev: {'commit': {'message': desc}}}
3082 }
3083 self.calls = [
3084 (('GetChangeDetail', 'host', '1',
3085 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3086 gen_detail('rev1', 'desc1')),
3087 (('GetChangeDetail', 'host', '1',
3088 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3089 gen_detail('rev2', 'desc2')),
3090 ]
3091
3092 self._mock_gerrit_changes_for_detail_cache()
3093 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3094 self.assertEqual(cl.GetDescription(), 'desc1')
3095 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3096 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003097
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003098 def test_print_current_creds(self):
3099 class CookiesAuthenticatorMock(object):
3100 def __init__(self):
3101 self.gitcookies = {
3102 'host.googlesource.com': ('user', 'pass'),
3103 'host-review.googlesource.com': ('user', 'pass'),
3104 }
3105 self.netrc = self
3106 self.netrc.hosts = {
3107 'github.com': ('user2', None, 'pass2'),
3108 'host2.googlesource.com': ('user3', None, 'pass'),
3109 }
3110 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3111 CookiesAuthenticatorMock)
3112 self.mock(sys, 'stdout', StringIO.StringIO())
3113 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3114 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3115 ' Host\t User\t Which file',
3116 '============================\t=====\t===========',
3117 'host-review.googlesource.com\t user\t.gitcookies',
3118 ' host.googlesource.com\t user\t.gitcookies',
3119 ' host2.googlesource.com\tuser3\t .netrc',
3120 ])
3121 sys.stdout.buf = ''
3122 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3123 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3124 ' Host\tUser\t Which file',
3125 '============================\t====\t===========',
3126 'host-review.googlesource.com\tuser\t.gitcookies',
3127 ' host.googlesource.com\tuser\t.gitcookies',
3128 ])
3129
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003130 def _common_creds_check_mocks(self):
3131 def exists_mock(path):
3132 dirname = os.path.dirname(path)
3133 if dirname == os.path.expanduser('~'):
3134 dirname = '~'
3135 base = os.path.basename(path)
3136 if base in ('.netrc', '.gitcookies'):
3137 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3138 # git cl also checks for existence other files not relevant to this test.
3139 return None
3140 self.mock(os.path, 'exists', exists_mock)
3141 self.mock(sys, 'stdout', StringIO.StringIO())
3142
3143 def test_creds_check_gitcookies_not_configured(self):
3144 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003145 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003146 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003147 self.calls = [
3148 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3149 (('os.path.exists', '~/.netrc'), True),
3150 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3151 'or Ctrl+C to abort'), ''),
3152 ((['git', 'config', '--global', 'http.cookiefile',
3153 os.path.expanduser('~/.gitcookies')], ), ''),
3154 ]
3155 self.assertEqual(0, git_cl.main(['creds-check']))
3156 self.assertRegexpMatches(
3157 sys.stdout.getvalue(),
3158 '^You seem to be using outdated .netrc for git credentials:')
3159 self.assertRegexpMatches(
3160 sys.stdout.getvalue(),
3161 '\nConfigured git to use .gitcookies from')
3162
3163 def test_creds_check_gitcookies_configured_custom_broken(self):
3164 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003165 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003166 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003167 self.calls = [
3168 ((['git', 'config', '--global', 'http.cookiefile'],),
3169 '/custom/.gitcookies'),
3170 (('os.path.exists', '/custom/.gitcookies'), False),
3171 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3172 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3173 ((['git', 'config', '--global', 'http.cookiefile',
3174 os.path.expanduser('~/.gitcookies')], ), ''),
3175 ]
3176 self.assertEqual(0, git_cl.main(['creds-check']))
3177 self.assertRegexpMatches(
3178 sys.stdout.getvalue(),
3179 'WARNING: you have configured custom path to .gitcookies: ')
3180 self.assertRegexpMatches(
3181 sys.stdout.getvalue(),
3182 'However, your configured .gitcookies file is missing.')
3183
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003184 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003185 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3186 lambda _, message: self._mocked_call('AddComment', message))
3187 self.calls = [
3188 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3189 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3190 (('AddComment', 'msg'), ''),
3191 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003192 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3193 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003194
3195 def test_git_cl_comment_add_gerrit(self):
3196 self.mock(git_cl.gerrit_util, 'SetReview',
3197 lambda host, change, msg:
3198 self._mocked_call('SetReview', host, change, msg))
3199 self.calls = [
3200 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3201 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3202 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3203 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3204 'origin/master'),
3205 ((['git', 'config', 'remote.origin.url'],),
3206 'https://chromium.googlesource.com/infra/infra'),
3207 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3208 ]
3209 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3210 '-a', 'msg']))
3211
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003212 def test_git_cl_comments_fetch_rietveld(self):
3213 self.mock(sys, 'stdout', StringIO.StringIO())
3214 self.calls = [
3215 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3216 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3217 ] * 2
3218 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3219 'messages': [
3220 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3221 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3222 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3223 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3224 # Intentionally wrong order here.
3225 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3226 'disapproval': False, 'approval': False,
3227 'sender': 'owner@example.com'},
3228 ],
3229 'owner_email': 'owner@example.com',
3230 })
3231 expected_comments_summary = [
3232 git_cl._CommentSummary(
3233 message='lgtm',
3234 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3235 disapproval=False, approval=True, sender='r@example.com'),
3236 git_cl._CommentSummary(
3237 message='not lgtm',
3238 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3239 disapproval=True, approval=False, sender='r2@example.com'),
3240 # Note: same order as in whatever Rietveld returns.
3241 git_cl._CommentSummary(
3242 message='PTAL',
3243 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3244 disapproval=False, approval=False, sender='owner@example.com'),
3245 ]
3246 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3247 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3248
3249 with git_cl.gclient_utils.temporary_directory() as tempdir:
3250 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3251 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3252 '-j', out_file]))
3253 with open(out_file) as f:
3254 read = json.load(f)
3255 self.assertEqual(len(read), 3)
3256 self.assertEqual(read[0], {
3257 'date': '2000-03-13 20:49:34.515270',
3258 'message': 'PTAL',
3259 'approval': False,
3260 'disapproval': False,
3261 'sender': 'owner@example.com'})
3262 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3263 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3264
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003265 def test_git_cl_comments_fetch_gerrit(self):
3266 self.mock(sys, 'stdout', StringIO.StringIO())
3267 self.calls = [
3268 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3269 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3270 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3271 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3272 'origin/master'),
3273 ((['git', 'config', 'remote.origin.url'],),
3274 'https://chromium.googlesource.com/infra/infra'),
3275 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3276 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3277 'owner': {'email': 'owner@example.com'},
3278 'messages': [
3279 {
3280 u'_revision_number': 1,
3281 u'author': {
3282 u'_account_id': 1111084,
3283 u'email': u'commit-bot@chromium.org',
3284 u'name': u'Commit Bot'
3285 },
3286 u'date': u'2017-03-15 20:08:45.000000000',
3287 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3288 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3289 u'tag': u'autogenerated:cq:dry-run'
3290 },
3291 {
3292 u'_revision_number': 2,
3293 u'author': {
3294 u'_account_id': 11151243,
3295 u'email': u'owner@example.com',
3296 u'name': u'owner'
3297 },
3298 u'date': u'2017-03-16 20:00:41.000000000',
3299 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3300 u'message': u'PTAL',
3301 },
3302 {
3303 u'_revision_number': 2,
3304 u'author': {
3305 u'_account_id': 148512 ,
3306 u'email': u'reviewer@example.com',
3307 u'name': u'reviewer'
3308 },
3309 u'date': u'2017-03-17 05:19:37.500000000',
3310 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3311 u'message': u'Patch Set 2: Code-Review+1',
3312 },
3313 ]
3314 })
3315 ] * 2
3316 expected_comments_summary = [
3317 git_cl._CommentSummary(
3318 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3319 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3320 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3321 git_cl._CommentSummary(
3322 message=u'PTAL',
3323 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3324 disapproval=False, approval=False, sender=u'owner@example.com'),
3325 git_cl._CommentSummary(
3326 message=u'Patch Set 2: Code-Review+1',
3327 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3328 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3329 ]
3330 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3331 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3332
3333 with git_cl.gclient_utils.temporary_directory() as tempdir:
3334 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3335 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3336 '-j', out_file]))
3337 with open(out_file) as f:
3338 read = json.load(f)
3339 self.assertEqual(len(read), 3)
3340 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3341 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3342 self.assertEqual(read[2], {
3343 u'date': u'2017-03-17 05:19:37.500000',
3344 u'message': u'Patch Set 2: Code-Review+1',
3345 u'approval': False,
3346 u'disapproval': False,
3347 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003348
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003349if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003350 logging.basicConfig(
3351 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003352 unittest.main()