blob: 466f21c1f7025c37a366c02883f169b471c1a7d0 [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
Aaron Gable9a03ae02017-11-03 11:31:07 -070015import tempfile
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000017import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000018
19sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
20
21from testing_support.auto_stub import TestCase
22
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000023import metrics
24# We have to disable monitoring before importing git_cl.
25metrics.DISABLE_METRICS_COLLECTION = True
26
Eric Boren2fb63102018-10-05 13:05:03 +000027import gerrit_util
maruel@chromium.orgddd59412011-11-30 14:20:38 +000028import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000029import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000030import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000031import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000032
tandrii5d48c322016-08-18 16:19:37 -070033def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
34 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
35
36
37CERR1 = callError(1)
38
39
Aaron Gable9a03ae02017-11-03 11:31:07 -070040def MakeNamedTemporaryFileMock(expected_content):
41 class NamedTemporaryFileMock(object):
42 def __init__(self, *args, **kwargs):
43 self.name = '/tmp/named'
44 self.expected_content = expected_content
45
46 def __enter__(self):
47 return self
48
49 def __exit__(self, _type, _value, _tb):
50 pass
51
52 def write(self, content):
53 if self.expected_content:
54 assert content == self.expected_content
55
56 def close(self):
57 pass
58
59 return NamedTemporaryFileMock
60
61
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000062class ChangelistMock(object):
63 # A class variable so we can access it when we don't have access to the
64 # instance that's being set.
65 desc = ""
66 def __init__(self, **kwargs):
67 pass
68 def GetIssue(self):
69 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080070 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000071 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070072 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000073 ChangelistMock.desc = desc
74
tandrii5d48c322016-08-18 16:19:37 -070075
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000076class PresubmitMock(object):
77 def __init__(self, *args, **kwargs):
78 self.reviewers = []
Daniel Cheng7227d212017-11-17 08:12:37 -080079 self.more_cc = ['chromium-reviews+test-more-cc@chromium.org']
80
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000081 @staticmethod
82 def should_continue():
83 return True
84
85
skobes6468b902016-10-24 08:45:10 -070086class GitCheckoutMock(object):
87 def __init__(self, *args, **kwargs):
88 pass
89
90 @staticmethod
91 def reset():
92 GitCheckoutMock.conflict = False
93
94 def apply_patch(self, p):
95 if GitCheckoutMock.conflict:
96 raise Exception('failed')
97
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000098
99class WatchlistsMock(object):
100 def __init__(self, _):
101 pass
102 @staticmethod
103 def GetWatchersForPaths(_):
104 return ['joe@example.com']
105
106
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000107class CodereviewSettingsFileMock(object):
108 def __init__(self):
109 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800110 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000111 def read(self):
112 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000113 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000114
115
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000116class AuthenticatorMock(object):
117 def __init__(self, *_args):
118 pass
119 def has_cached_credentials(self):
120 return True
tandrii221ab252016-10-06 08:12:04 -0700121 def authorize(self, http):
122 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000123
124
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100125def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000126 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
127
128 Usage:
129 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100130 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000131
132 OR
133 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100134 CookiesAuthenticatorMockFactory(
135 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000136 """
137 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800138 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000139 # Intentionally not calling super() because it reads actual cookie files.
140 pass
141 @classmethod
142 def get_gitcookies_path(cls):
143 return '~/.gitcookies'
144 @classmethod
145 def get_netrc_path(cls):
146 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100147 def _get_auth_for_host(self, host):
148 if same_auth:
149 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000150 return (hosts_with_creds or {}).get(host)
151 return CookiesAuthenticatorMock
152
Aaron Gable9a03ae02017-11-03 11:31:07 -0700153
kmarshall9249e012016-08-23 12:02:16 -0700154class MockChangelistWithBranchAndIssue():
155 def __init__(self, branch, issue):
156 self.branch = branch
157 self.issue = issue
158 def GetBranch(self):
159 return self.branch
160 def GetIssue(self):
161 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000162
tandriic2405f52016-10-10 08:13:15 -0700163
164class SystemExitMock(Exception):
165 pass
166
167
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000168class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100169 def test_get_description(self):
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +0000170 cl = git_cl.Changelist(issue=1, codereview='gerrit',
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100171 codereview_host='host')
172 cl.description = 'x'
173 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800174 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100175 self.assertEquals(cl.GetDescription(), 'x')
176 self.assertEquals(cl.GetDescription(force=True), 'y')
177 self.assertEquals(cl.GetDescription(), 'y')
178
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700179 def test_description_footers(self):
180 cl = git_cl.Changelist(issue=1, codereview='gerrit',
181 codereview_host='host')
182 cl.description = '\n'.join([
183 'This is some message',
184 '',
185 'It has some lines',
186 'and, also',
187 '',
188 'Some: Really',
189 'Awesome: Footers',
190 ])
191 cl.has_description = True
192 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
193 msg, footers = cl.GetDescriptionFooters()
194 self.assertEquals(
195 msg, ['This is some message', '', 'It has some lines', 'and, also'])
196 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
197
198 msg.append('wut')
199 footers.append(('gnarly-dude', 'beans'))
200 cl.UpdateDescriptionFooters(msg, footers)
201 self.assertEquals(cl.GetDescription().splitlines(), [
202 'This is some message',
203 '',
204 'It has some lines',
205 'and, also',
206 'wut'
207 '',
208 'Some: Really',
209 'Awesome: Footers',
210 'Gnarly-Dude: beans',
211 ])
212
tandriif9aefb72016-07-01 09:06:51 -0700213 def test_get_bug_line_values(self):
214 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
215 self.assertEqual(f('', ''), [])
216 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
217 self.assertEqual(f('v8', '456'), ['v8:456'])
218 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
219 # Not nice, but not worth carying.
220 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
221 ['v8:456', 'chromium:123', 'v8:123'])
222
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100223 def _test_git_number(self, parent_msg, dest_ref, child_msg,
224 parent_hash='parenthash'):
225 desc = git_cl.ChangeDescription(child_msg)
226 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
227 return desc.description
228
229 def assertEqualByLine(self, actual, expected):
230 self.assertEqual(actual.splitlines(), expected.splitlines())
231
232 def test_git_number_bad_parent(self):
233 with self.assertRaises(ValueError):
234 self._test_git_number('Parent', 'refs/heads/master', 'Child')
235
236 def test_git_number_bad_parent_footer(self):
237 with self.assertRaises(AssertionError):
238 self._test_git_number(
239 'Parent\n'
240 '\n'
241 'Cr-Commit-Position: wrong',
242 'refs/heads/master', 'Child')
243
244 def test_git_number_bad_lineage_ignored(self):
245 actual = self._test_git_number(
246 'Parent\n'
247 '\n'
248 'Cr-Commit-Position: refs/heads/master@{#1}\n'
249 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
250 'refs/heads/master', 'Child')
251 self.assertEqualByLine(
252 actual,
253 'Child\n'
254 '\n'
255 'Cr-Commit-Position: refs/heads/master@{#2}\n'
256 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
257
258 def test_git_number_same_branch(self):
259 actual = self._test_git_number(
260 'Parent\n'
261 '\n'
262 'Cr-Commit-Position: refs/heads/master@{#12}',
263 dest_ref='refs/heads/master',
264 child_msg='Child')
265 self.assertEqualByLine(
266 actual,
267 'Child\n'
268 '\n'
269 'Cr-Commit-Position: refs/heads/master@{#13}')
270
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200271 def test_git_number_same_branch_mixed_footers(self):
272 actual = self._test_git_number(
273 'Parent\n'
274 '\n'
275 'Cr-Commit-Position: refs/heads/master@{#12}',
276 dest_ref='refs/heads/master',
277 child_msg='Child\n'
278 '\n'
279 'Broken-by: design\n'
280 'BUG=123')
281 self.assertEqualByLine(
282 actual,
283 'Child\n'
284 '\n'
285 'Broken-by: design\n'
286 'BUG=123\n'
287 'Cr-Commit-Position: refs/heads/master@{#13}')
288
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100289 def test_git_number_same_branch_with_originals(self):
290 actual = self._test_git_number(
291 'Parent\n'
292 '\n'
293 'Cr-Commit-Position: refs/heads/master@{#12}',
294 dest_ref='refs/heads/master',
295 child_msg='Child\n'
296 '\n'
297 'Some users are smart and insert their own footers\n'
298 '\n'
299 'Cr-Whatever: value\n'
300 'Cr-Commit-Position: refs/copy/paste@{#22}')
301 self.assertEqualByLine(
302 actual,
303 'Child\n'
304 '\n'
305 'Some users are smart and insert their own footers\n'
306 '\n'
307 'Cr-Original-Whatever: value\n'
308 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
309 'Cr-Commit-Position: refs/heads/master@{#13}')
310
311 def test_git_number_new_branch(self):
312 actual = self._test_git_number(
313 'Parent\n'
314 '\n'
315 'Cr-Commit-Position: refs/heads/master@{#12}',
316 dest_ref='refs/heads/branch',
317 child_msg='Child')
318 self.assertEqualByLine(
319 actual,
320 'Child\n'
321 '\n'
322 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
323 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
324
325 def test_git_number_lineage(self):
326 actual = self._test_git_number(
327 'Parent\n'
328 '\n'
329 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
330 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
331 dest_ref='refs/heads/branch',
332 child_msg='Child')
333 self.assertEqualByLine(
334 actual,
335 'Child\n'
336 '\n'
337 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
338 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
339
340 def test_git_number_moooooooore_lineage(self):
341 actual = self._test_git_number(
342 'Parent\n'
343 '\n'
344 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
345 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
346 dest_ref='refs/heads/mooore',
347 child_msg='Child')
348 self.assertEqualByLine(
349 actual,
350 'Child\n'
351 '\n'
352 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
353 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
354 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
355
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100356 def test_git_number_ever_moooooooore_lineage(self):
Robert Iannucci456b0d62018-03-13 19:15:50 -0700357 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100358 actual = self._test_git_number(
359 'CQ commit on fresh new branch + numbering.\n'
360 '\n'
361 'NOTRY=True\n'
362 'NOPRESUBMIT=True\n'
363 'BUG=\n'
364 '\n'
365 'Review-Url: https://codereview.chromium.org/2577703003\n'
366 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
367 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
368 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
369 dest_ref='refs/heads/gnumb-test/cl',
370 child_msg='git cl on fresh new branch + numbering.\n'
371 '\n'
372 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
373 self.assertEqualByLine(
374 actual,
375 'git cl on fresh new branch + numbering.\n'
376 '\n'
377 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
378 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
379 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
380 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
381 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100382
383 def test_git_number_cherry_pick(self):
384 actual = self._test_git_number(
385 'Parent\n'
386 '\n'
387 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
388 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
389 dest_ref='refs/heads/branch',
390 child_msg='Child, which is cherry-pick from master\n'
391 '\n'
392 'Cr-Commit-Position: refs/heads/master@{#100}\n'
393 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
394 self.assertEqualByLine(
395 actual,
396 'Child, which is cherry-pick from master\n'
397 '\n'
398 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
399 '\n'
400 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
401 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
402 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
403
Andrii Shyshkalovd4c86732018-09-25 04:29:31 +0000404 def test_gerrit_mirror_hack(self):
405 cr = 'chromium-review.googlesource.com'
406 url0 = 'https://%s/a/changes/x?a=b' % cr
407 origMirrors = git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES
408 try:
409 git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES = ['us1', 'us2']
410 url1 = git_cl.gerrit_util._UseGerritMirror(url0, cr)
411 url2 = git_cl.gerrit_util._UseGerritMirror(url1, cr)
412 url3 = git_cl.gerrit_util._UseGerritMirror(url2, cr)
413
414 self.assertNotEqual(url1, url2)
415 self.assertEqual(sorted((url1, url2)), [
416 'https://us1-mirror-chromium-review.googlesource.com/a/changes/x?a=b',
417 'https://us2-mirror-chromium-review.googlesource.com/a/changes/x?a=b'])
418 self.assertEqual(url1, url3)
419 finally:
420 git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES = origMirrors
421
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000422 def test_valid_accounts(self):
423 mock_per_account = {
424 'u1': None, # 404, doesn't exist.
425 'u2': {
426 '_account_id': 123124,
427 'avatars': [],
428 'email': 'u2@example.com',
429 'name': 'User Number 2',
430 'status': 'OOO',
431 },
432 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
433 }
434 def GetAccountDetailsMock(_, account):
435 # Poor-man's mock library's side_effect.
436 v = mock_per_account.pop(account)
437 if isinstance(v, Exception):
438 raise v
439 return v
440
441 original = git_cl.gerrit_util.GetAccountDetails
442 try:
443 git_cl.gerrit_util.GetAccountDetails = GetAccountDetailsMock
444 actual = git_cl.gerrit_util.ValidAccounts(
445 'host', ['u1', 'u2', 'u3'], max_threads=1)
446 finally:
447 git_cl.gerrit_util.GetAccountDetails = original
448 self.assertEqual(actual, {
449 'u2': {
450 '_account_id': 123124,
451 'avatars': [],
452 'email': 'u2@example.com',
453 'name': 'User Number 2',
454 'status': 'OOO',
455 },
456 })
457
458
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000459
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200460class TestParseIssueURL(unittest.TestCase):
461 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
462 codereview=None, fail=False):
463 self.assertIsNotNone(parsed)
464 if fail:
465 self.assertFalse(parsed.valid)
466 return
467 self.assertTrue(parsed.valid)
468 self.assertEqual(parsed.issue, issue)
469 self.assertEqual(parsed.patchset, patchset)
470 self.assertEqual(parsed.hostname, hostname)
471 self.assertEqual(parsed.codereview, codereview)
472
473 def _run_and_validate(self, func, url, *args, **kwargs):
474 result = func(urlparse.urlparse(url))
475 if kwargs.pop('fail', False):
476 self.assertIsNone(result)
477 return None
478 self._validate(result, *args, fail=False, **kwargs)
479
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200480 def test_gerrit(self):
481 def test(url, issue=None, patchset=None, hostname=None, fail=None):
482 self._test_ParseIssueUrl(
483 git_cl._GerritChangelistImpl.ParseIssueURL,
484 url, issue, patchset, hostname, fail)
485 def test(url, *args, **kwargs):
486 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
487 *args, codereview='gerrit', **kwargs)
488
489 test('http://chrome-review.source.com/c/123',
490 123, None, 'chrome-review.source.com')
491 test('https://chrome-review.source.com/c/123/',
492 123, None, 'chrome-review.source.com')
493 test('https://chrome-review.source.com/c/123/4',
494 123, 4, 'chrome-review.source.com')
495 test('https://chrome-review.source.com/#/c/123/4',
496 123, 4, 'chrome-review.source.com')
497 test('https://chrome-review.source.com/c/123/4',
498 123, 4, 'chrome-review.source.com')
499 test('https://chrome-review.source.com/123',
500 123, None, 'chrome-review.source.com')
501 test('https://chrome-review.source.com/123/4',
502 123, 4, 'chrome-review.source.com')
503
504 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
505 test('https://chrome-review.source.com/c/abc/', fail=True)
506 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
507
508 def test_ParseIssueNumberArgument(self):
509 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200510 codereview_hint = kwargs.pop('hint', None)
511 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
512 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200513
514 test('123', 123)
515 test('', fail=True)
516 test('abc', fail=True)
517 test('123/1', fail=True)
518 test('123a', fail=True)
519 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +0000520
521 # Looks like Rietveld and Gerrit, but we should select Gerrit now
522 # w/ or w/o hint.
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200523 test('https://codereview.source.com/123',
524 123, None, 'codereview.source.com', 'gerrit',
525 hint='gerrit')
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +0000526 test('https://codereview.source.com/123',
527 123, None, 'codereview.source.com', 'gerrit')
528
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200529 # Gerrrit.
530 test('https://chrome-review.source.com/c/123/4',
531 123, 4, 'chrome-review.source.com', 'gerrit')
532 test('https://chrome-review.source.com/bad/123/4', fail=True)
533
534
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100535class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100536 def setUp(self):
537 super(GitCookiesCheckerTest, self).setUp()
538 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100539 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100540
541 def mock_hosts_creds(self, subhost_identity_pairs):
542 def ensure_googlesource(h):
543 if not h.endswith(self.c._GOOGLESOURCE):
544 assert not h.endswith('.')
545 return h + '.' + self.c._GOOGLESOURCE
546 return h
547 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
548 for h, i in subhost_identity_pairs]
549
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200550 def test_identity_parsing(self):
551 self.assertEqual(self.c._parse_identity('ldap.google.com'),
552 ('ldap', 'google.com'))
553 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
554 ('ldap', 'example.com'))
555 # Specical case because we know there are no subdomains in chromium.org.
556 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
557 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800558 # Pathological: ".period." can be either username OR domain, more likely
559 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200560 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
561 ('note', 'period.example.com'))
562
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100563 def test_analysis_nothing(self):
564 self.c._all_hosts = []
565 self.assertFalse(self.c.has_generic_host())
566 self.assertEqual(set(), self.c.get_conflicting_hosts())
567 self.assertEqual(set(), self.c.get_duplicated_hosts())
568 self.assertEqual(set(), self.c.get_partially_configured_hosts())
569 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
570
571 def test_analysis(self):
572 self.mock_hosts_creds([
573 ('.googlesource.com', 'git-example.chromium.org'),
574
575 ('chromium', 'git-example.google.com'),
576 ('chromium-review', 'git-example.google.com'),
577 ('chrome-internal', 'git-example.chromium.org'),
578 ('chrome-internal-review', 'git-example.chromium.org'),
579 ('conflict', 'git-example.google.com'),
580 ('conflict-review', 'git-example.chromium.org'),
581 ('dup', 'git-example.google.com'),
582 ('dup', 'git-example.google.com'),
583 ('dup-review', 'git-example.google.com'),
584 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200585 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100586 ])
587 self.assertTrue(self.c.has_generic_host())
588 self.assertEqual(set(['conflict.googlesource.com']),
589 self.c.get_conflicting_hosts())
590 self.assertEqual(set(['dup.googlesource.com']),
591 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200592 self.assertEqual(set(['partial.googlesource.com',
593 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100594 self.c.get_partially_configured_hosts())
595 self.assertEqual(set(['chromium.googlesource.com',
596 'chrome-internal.googlesource.com']),
597 self.c.get_hosts_with_wrong_identities())
598
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100599 def test_report_no_problems(self):
600 self.test_analysis_nothing()
601 self.mock(sys, 'stdout', StringIO.StringIO())
602 self.assertFalse(self.c.find_and_report_problems())
603 self.assertEqual(sys.stdout.getvalue(), '')
604
605 def test_report(self):
606 self.test_analysis()
607 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200608 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
609 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100610 self.assertTrue(self.c.find_and_report_problems())
611 with open(os.path.join(os.path.dirname(__file__),
612 'git_cl_creds_check_report.txt')) as f:
613 expected = f.read()
614 def by_line(text):
615 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700616 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200617 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100618
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800619
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000620class TestGitCl(TestCase):
621 def setUp(self):
622 super(TestGitCl, self).setUp()
623 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700624 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000625 self.mock(subprocess2, 'call', self._mocked_call)
626 self.mock(subprocess2, 'check_call', self._mocked_call)
627 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700628 self.mock(subprocess2, 'communicate',
629 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000630 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000631 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000632 self.mock(git_common, 'get_or_create_merge_base',
633 lambda *a: (
634 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000635 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000636 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000637 self.mock(git_cl, 'SaveDescriptionBackup', lambda _:
638 self._mocked_call('SaveDescriptionBackup'))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100639 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000640 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700641 self.mock(git_cl, 'write_json', lambda path, contents:
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000642 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000643 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
skobes6468b902016-10-24 08:45:10 -0700644 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
645 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000646 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000647 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000648 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100649 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
650 lambda *args, **kwargs: self._mocked_call(
651 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700652 self.mock(git_cl.gerrit_util, 'GetChangeComments',
653 lambda *args, **kwargs: self._mocked_call(
654 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100655 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700656 lambda h, i, reviewers, ccs, notify: self._mocked_call(
657 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700658 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700659 lambda h, i, msg=None, labels=None, notify=None:
660 self._mocked_call('SetReview', h, i, msg, labels, notify))
Andrii Shyshkalov733d4ec2018-04-19 11:48:58 -0700661 self.mock(git_cl.gerrit_util.LuciContextAuthenticator, 'is_luci',
662 staticmethod(lambda: False))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000663 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
664 classmethod(lambda _: False))
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000665 self.mock(git_cl.gerrit_util, 'ValidAccounts',
666 lambda host, accounts:
667 self._mocked_call('ValidAccounts', host, accounts))
tandriic2405f52016-10-10 08:13:15 -0700668 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100669 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000670 # It's important to reset settings to not have inter-tests interference.
671 git_cl.settings = None
672
673 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000674 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100675 self.assertEquals([], self.calls)
676 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000677 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100678 raise
679 # Sadly, has_failed() returns True if this OR any other tests before this
680 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200681 git_cl.logging.error(
682 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100683 'There are un-consumed self.calls after this test has finished.\n'
684 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700685 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200686 'If you are already running only this test, then **first** fix the '
687 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100688 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700689 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100690 'and follow instructions above.\n' +
691 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000692 finally:
693 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000695 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000696 self.assertTrue(
697 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700698 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000699 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000700 expected_args, result = top
701
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000702 # Also logs otherwise it could get caught in a try/finally and be hard to
703 # diagnose.
704 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700705 N = 5
706 prior_calls = '\n '.join(
707 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
708 for i, c in enumerate(self._calls_done[-N:]))
709 following_calls = '\n '.join(
710 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
711 for i, c in enumerate(self.calls[:N]))
712 extended_msg = (
713 'A few prior calls:\n %s\n\n'
714 'This (expected):\n @%d: %r\n'
715 'This (actual):\n @%d: %r\n\n'
716 'A few following expected calls:\n %s' %
717 (prior_calls, len(self._calls_done), expected_args,
718 len(self._calls_done), args, following_calls))
719 git_cl.logging.error(extended_msg)
720
tandrii99a72f22016-08-17 14:33:24 -0700721 self.fail('@%d\n'
722 ' Expected: %r\n'
723 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700724 len(self._calls_done), expected_args, args))
725
726 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700727 if isinstance(result, Exception):
728 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000729 return result
730
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100731 def test_ask_for_explicit_yes_true(self):
732 self.calls = [
733 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
734 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
735 ]
736 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
737
tandrii48df5812016-10-17 03:55:37 -0700738 def test_LoadCodereviewSettingsFromFile_gerrit(self):
739 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
740 self.calls = [
741 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
742 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
743 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
744 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
745 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700747 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
748 CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700750 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
751 CERR1),
752 ((['git', 'config', 'gerrit.host', 'true'],), ''),
753 ]
754 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
755
maruel@chromium.orga3353652011-11-30 14:26:57 +0000756 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000757 def _is_gerrit_calls(cls, gerrit=False):
758 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
759 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
760
761 @classmethod
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000762 def _upload_calls(cls, private, no_autocc):
Aaron Gable13101a62018-02-09 13:20:41 -0800763 return (cls._rietveld_git_base_calls() +
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000764 cls._git_upload_calls(private, no_autocc))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000765
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000766 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800767 def _rietveld_upload_no_rev_calls(cls):
768 return (cls._rietveld_git_base_calls() + [
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200769 ((['git', 'config', 'core.editor'],), ''),
770 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000771
772 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800773 def _rietveld_git_base_calls(cls):
774 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
775 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000776
Aaron Gable13101a62018-02-09 13:20:41 -0800777 return cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000778 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700779 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
780 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000781 ((['git', 'config', 'rietveld.server'],),
782 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git', 'config', 'branch.master.merge'],), 'master'),
784 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000785 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000786 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000787 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git', 'rev-parse', '--show-cdup'],), ''),
789 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Aaron Gable7817f022017-12-12 09:43:17 -0800790 ((['git', '-c', 'core.quotePath=false', 'diff',
791 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000792 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700793 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000795 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000796 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000797 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000798 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000799 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000800 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000801 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700802 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000803 ]
804
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000805 @classmethod
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000806 def _git_upload_calls(cls, private, no_autocc):
807 if private or no_autocc:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000808 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000809 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000810 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000811
812 if private:
813 private_call = []
814 else:
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000815 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000816 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000817
maruel@chromium.orga3353652011-11-30 14:26:57 +0000818 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000819 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000820 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000821 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800822 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000823 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700824 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000825 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000826 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700828 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000829 ] + cls._git_post_upload_calls()
830
831 @classmethod
832 def _git_post_upload_calls(cls):
833 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000834 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
835 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
836 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000837 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000838 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000839 ]
840
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000841 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000842 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000843 fake_ancestor = 'fake_ancestor'
844 fake_cl = 'fake_cl_for_patch'
845 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000846 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000847 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000848 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000849 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000850 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000851 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000852 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000853 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700854 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000855 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000856 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000857 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000858 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000859 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000860 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000861 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000862 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000863 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000864 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000865 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000866
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000867 @staticmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800868 def _cmd_line(description, args, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000869 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000870 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800871 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000872 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000873 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800874 '--cc',
875 ','.join(
876 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
877 cc),
Aaron Gable13101a62018-02-09 13:20:41 -0800878 ] + (['--private'] if private else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000879
880 def _run_reviewer_test(
881 self,
882 upload_args,
883 expected_description,
884 returned_description,
885 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000886 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700887 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000888 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000889 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org79540052012-10-19 23:15:26 +0000890
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000891 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700892 cc = cc or []
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000893 no_autocc = '--no-autocc' in upload_args
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000894
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000895 self.calls = self._upload_calls(private, no_autocc)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000896
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000897 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000898 self.assertEquals(
899 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000900 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000901 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000902 '#--------------------This line is 72 characters long'
903 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000904 expected_description,
905 desc)
906 return returned_description
907 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000908
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000909 def check_upload(args):
Aaron Gable13101a62018-02-09 13:20:41 -0800910 cmd_line = self._cmd_line(final_description, reviewers, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000911 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000912 return 1, 2
913 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000914
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000915 git_cl.main(['upload'] + upload_args)
916
917 def test_no_reviewer(self):
918 self._run_reviewer_test(
919 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000920 'desc\n\nBUG=',
921 '# Blah blah comment.\ndesc\n\nBUG=',
922 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000923 [])
924
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000925 def test_private(self):
926 self._run_reviewer_test(
927 ['--private'],
928 'desc\n\nBUG=',
929 '# Blah blah comment.\ndesc\n\nBUG=\n',
930 'desc\n\nBUG=',
931 [])
932
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000933 def test_no_autocc(self):
934 self._run_reviewer_test(
935 ['--no-autocc'],
936 'desc\n\nBUG=',
937 '# Blah blah comment.\ndesc\n\nBUG=\n',
938 'desc\n\nBUG=',
939 [])
940
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000941 def test_reviewers_cmd_line(self):
942 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000943 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000944 self._run_reviewer_test(
945 ['-r' 'foo@example.com'],
946 description,
947 '\n%s\n' % description,
948 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000949 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950
951 def test_reviewer_tbr_overriden(self):
952 # Reviewer is overriden with TBR
953 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000954 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000955 self._run_reviewer_test(
956 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000957 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000958 description.strip('\n'),
959 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000960 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000961
962 def test_reviewer_multiple(self):
963 # Handles multiple R= or TBR= lines.
964 description = (
bradnelsond975b302016-10-23 12:20:23 -0700965 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
966 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000967 self._run_reviewer_test(
968 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000970 description,
971 description,
bradnelsond975b302016-10-23 12:20:23 -0700972 ['--reviewers=another@example.com,reviewer@example.com'],
973 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000974
maruel@chromium.orga3353652011-11-30 14:26:57 +0000975 def test_reviewer_send_mail(self):
976 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000977 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000978 self._run_reviewer_test(
979 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000980 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000981 description.strip('\n'),
982 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000983 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000984
985 def test_reviewer_send_mail_no_rev(self):
986 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000987 stdout = StringIO.StringIO()
Aaron Gable13101a62018-02-09 13:20:41 -0800988 self.calls = self._rietveld_upload_no_rev_calls() + [
tandriic2405f52016-10-10 08:13:15 -0700989 ((['DieWithError', 'Must specify reviewers to send email.'],),
990 SystemExitMock())
991 ]
992
993 def RunEditor(desc, _, **kwargs):
994 return desc
995 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
996 self.mock(sys, 'stdout', stdout)
997 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000998 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -0700999 self.assertEqual(
1000 '=====================================\n'
1001 'NOTICE: Rietveld is being deprecated. '
1002 'You can upload changes to Gerrit with\n'
1003 ' git cl upload --gerrit\n'
1004 'or set Gerrit to be your default code review tool with\n'
1005 ' git config gerrit.host true\n'
1006 '=====================================\n',
1007 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001008
tandriif9aefb72016-07-01 09:06:51 -07001009 def test_bug_on_cmd(self):
1010 self._run_reviewer_test(
1011 ['--bug=500658,proj:123'],
1012 'desc\n\nBUG=500658\nBUG=proj:123',
1013 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1014 'desc\n\nBUG=500658\nBUG=proj:1234',
1015 [])
1016
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001017 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001018 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001019 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001020 if skip_auth_check:
1021 return [((cmd, ), 'true')]
1022
tandrii5d48c322016-08-18 16:19:37 -07001023 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001024 if issue:
1025 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001026 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001027 ])
1028 calls.extend([
1029 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1030 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1031 ((['git', 'config', 'remote.origin.url'],),
1032 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001033 ])
1034 return calls
1035
1036 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001037 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001038 fetched_status=None, other_cl_owner=None,
1039 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001040 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001041 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001042 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1043 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1044 ((['git', 'config', 'branch.master.gerritissue'],),
1045 CERR1 if issue is None else str(issue)),
1046 ]
1047
1048 if custom_cl_base:
1049 ancestor_revision = custom_cl_base
1050 else:
1051 # Determine ancestor_revision to be merge base.
1052 ancestor_revision = 'fake_ancestor_sha'
1053 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001054 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001055 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001056 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001057 'refs/remotes/origin/master'],), ancestor_revision),
1058 ]
1059
1060 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001061 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1062
1063 if issue:
1064 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001065 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001066 'my%2Frepo~123456',
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001067 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS']
1068 ),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001069 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001070 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001071 'change_id': '123456789',
1072 'current_revision': 'sha1_of_current_revision',
1073 'revisions': { 'sha1_of_current_revision': {
1074 'commit': {'message': fetched_description},
1075 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001076 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001077 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001078 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001079 if fetched_status == 'ABANDONED':
1080 calls += [
1081 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1082 '123456 has been abandoned, new uploads are not '
1083 'allowed'), SystemExitMock()),
1084 ]
1085 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001086 if other_cl_owner:
1087 calls += [
1088 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1089 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001090
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001091 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1092 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001093 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001094 ((['git', 'rev-parse', '--show-cdup'],), ''),
1095 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001096
Aaron Gable7817f022017-12-12 09:43:17 -08001097 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1098 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001099 'M\t.gitignore\n'),
1100 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001101 ]
1102
1103 if not issue:
1104 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001105 ((['git', 'log', '--pretty=format:%s%n%n%b',
1106 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001107 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001108 ]
1109
1110 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001111 ((['git', 'config', 'user.email'],), 'me@example.com'),
1112 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1113 ([custom_cl_base] if custom_cl_base else
1114 [ancestor_revision, 'HEAD']),),
1115 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001116 ]
1117 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001118
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001119 @classmethod
1120 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001121 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001122 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001123 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001124 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001125 custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001126 if post_amend_description is None:
1127 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001128 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001129 # Determined in `_gerrit_base_calls`.
1130 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1131
1132 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001133
tandriia60502f2016-06-20 02:01:53 -07001134 if squash_mode == 'default':
1135 calls.extend([
1136 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1137 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1138 ])
1139 elif squash_mode in ('override_squash', 'override_nosquash'):
1140 calls.extend([
1141 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1142 'true' if squash_mode == 'override_squash' else 'false'),
1143 ])
1144 else:
1145 assert squash_mode in ('squash', 'nosquash')
1146
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001147 # If issue is given, then description is fetched from Gerrit instead.
1148 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001149 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001150 ((['git', 'log', '--pretty=format:%s\n\n%b',
1151 ((custom_cl_base + '..') if custom_cl_base else
1152 'fake_ancestor_sha..HEAD')],),
1153 description),
1154 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001155 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001156 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001157 else:
1158 if not title:
1159 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001160 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1161 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001162 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001163 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001164 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001165 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001166 (('DownloadGerritHook', False), ''),
1167 # Amending of commit message to get the Change-Id.
1168 ((['git', 'log', '--pretty=format:%s\n\n%b',
1169 determined_ancestor_revision + '..HEAD'],),
1170 description),
1171 ((['git', 'commit', '--amend', '-m', description],), ''),
1172 ((['git', 'log', '--pretty=format:%s\n\n%b',
1173 determined_ancestor_revision + '..HEAD'],),
1174 post_amend_description)
1175 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001176 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001177 if not issue:
1178 # Prompting to edit description on first upload.
1179 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001180 ((['git', 'config', 'core.editor'],), ''),
1181 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001182 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001183 ref_to_push = 'abcdef0123456789'
1184 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001185 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1186 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1187 ]
1188
1189 if custom_cl_base is None:
1190 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001191 ((['get_or_create_merge_base', 'master',
1192 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001193 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001194 ]
1195 parent = 'origin/master'
1196 else:
1197 calls += [
1198 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1199 'refs/remotes/origin/master'],),
1200 callError(1)), # Means not ancenstor.
1201 (('ask_for_data',
1202 'Do you take responsibility for cleaning up potential mess '
1203 'resulting from proceeding with upload? Press Enter to upload, '
1204 'or Ctrl+C to abort'), ''),
1205 ]
1206 parent = custom_cl_base
1207
1208 calls += [
1209 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1210 '0123456789abcdef'),
1211 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001212 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001213 ref_to_push),
1214 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001215 else:
1216 ref_to_push = 'HEAD'
1217
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001218 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00001219 (('SaveDescriptionBackup',), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001220 ((['git', 'rev-list',
1221 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1222 ref_to_push],),
1223 '1hashPerLine\n'),
1224 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001225
Aaron Gableafd52772017-06-27 16:40:10 -07001226 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001227 ref_suffix = '%ready,notify=ALL'
1228 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001229 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001230 ref_suffix = '%wip'
1231 else:
1232 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001233
Aaron Gable70f4e242017-06-26 10:45:59 -07001234 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001235 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001236
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001237 calls += [
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +00001238 ((['git', 'config', 'rietveld.cc'],), ''),
1239 (('ValidAccounts', 'chromium-review.googlesource.com',
1240 sorted(reviewers) + ['joe@example.com',
1241 'chromium-reviews+test-more-cc@chromium.org'] + cc),
1242 {
1243 # TODO(tandrii): add here some valid accounts and make use of them.
1244 }),
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001245 ]
1246
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001247 calls.append((
1248 (['git', 'push',
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001249 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001250 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1251 ('remote:\n'
1252 'remote: Processing changes: (\)\n'
1253 'remote: Processing changes: (|)\n'
1254 'remote: Processing changes: (/)\n'
1255 'remote: Processing changes: (-)\n'
1256 'remote: Processing changes: new: 1 (/)\n'
1257 'remote: Processing changes: new: 1, done\n'
1258 'remote:\n'
1259 'remote: New Changes:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001260 'remote: https://chromium-review.googlesource.com/#/c/my/repo/+/123456'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001261 ' XXX\n'
1262 'remote:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001263 'To https://chromium.googlesource.com/my/repo\n'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001264 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')
1265 ))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001266 if squash:
1267 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001268 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001269 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001270 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001271 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001272 ((['git', 'config', 'branch.master.gerritsquashhash',
1273 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001274 ]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001275 if squash:
1276 calls += [
1277 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001278 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001279 sorted(reviewers),
1280 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1281 cc, notify), ''),
1282 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001283 if tbr:
1284 calls += [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001285 (('GetChangeDetail', 'chromium-review.googlesource.com',
1286 'my%2Frepo~123456', ['LABELS']), {
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001287 'labels': {
1288 'Code-Review': {
1289 'default_value': 0,
1290 'all': [],
1291 'values': {
1292 '+2': 'lgtm, approved',
1293 '+1': 'lgtm, but someone else must approve',
1294 ' 0': 'No score',
1295 '-1': 'Don\'t submit as-is',
1296 }
1297 }
1298 }
1299 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001300 (('SetReview',
1301 'chromium-review.googlesource.com',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001302 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001303 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001304 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001305 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001306 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001307 return calls
1308
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001309 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001310 self,
1311 upload_args,
1312 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001313 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001314 squash=True,
1315 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001316 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001317 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001318 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001319 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001320 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001321 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001322 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001323 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001324 custom_cl_base=None,
1325 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001326 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001327 if squash_mode is None:
1328 if '--no-squash' in upload_args:
1329 squash_mode = 'nosquash'
1330 elif '--squash' in upload_args:
1331 squash_mode = 'squash'
1332 else:
1333 squash_mode = 'default'
1334
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001335 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001336 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001337 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001338 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001339 CookiesAuthenticatorMockFactory(
1340 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001341 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1342 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001343 self.mock(git_cl.gclient_utils, 'RunEditor',
1344 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001345 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1346 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001347
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001348 self.calls = self._gerrit_base_calls(
1349 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001350 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001351 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001352 other_cl_owner=other_cl_owner,
1353 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001354 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001355 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1356 expected_content=description))
1357 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001358 self.calls += self._gerrit_upload_calls(
1359 description, reviewers, squash,
1360 squash_mode=squash_mode,
1361 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001362 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001363 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001364 issue=issue, cc=cc,
Aaron Gablefd238082017-06-07 13:42:34 -07001365 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001366 # Uncomment when debugging.
1367 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001368 git_cl.main(['upload'] + upload_args)
1369
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001370 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001371 self._run_gerrit_upload_test(
1372 ['--no-squash'],
1373 'desc\n\nBUG=\n',
1374 [],
1375 squash=False,
1376 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1377
1378 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001379 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001380 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001381 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001382 [],
tandriia60502f2016-06-20 02:01:53 -07001383 squash=False,
1384 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001385 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001386
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001387 def test_gerrit_no_reviewer(self):
1388 self._run_gerrit_upload_test(
1389 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001390 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001391 [],
1392 squash=False,
1393 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001394
Nick Carter8692b182017-11-06 16:30:38 -08001395 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001396 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1397 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001398 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001399 'desc\n\nBUG=\n\nChange-Id: I123456789',
1400 squash=False,
1401 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001402 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001403
ukai@chromium.orge8077812012-02-03 03:41:46 +00001404 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001405 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001406 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001407 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001408 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001409 squash=False,
1410 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001411 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001412
1413 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001414 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001415 [],
bradnelsond975b302016-10-23 12:20:23 -07001416 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1417 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001418 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001419 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001420 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001421 cc=['more@example.com', 'people@example.com'],
1422 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001423
1424 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001425 self._run_gerrit_upload_test(
1426 [],
1427 'desc\nBUG=\n\nChange-Id: 123456789',
1428 [],
1429 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001430
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001431 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001432 self._run_gerrit_upload_test(
1433 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001434 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001435 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001436 squash=True,
1437 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001438
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001439 def test_gerrit_upload_squash_first_against_rev(self):
1440 custom_cl_base = 'custom_cl_base_rev_or_branch'
1441 self._run_gerrit_upload_test(
1442 ['--squash', custom_cl_base],
1443 'desc\nBUG=\n\nChange-Id: 123456789',
1444 [],
1445 squash=True,
1446 expected_upstream_ref='origin/master',
1447 custom_cl_base=custom_cl_base)
1448 self.assertIn(
1449 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1450 sys.stdout.getvalue())
1451
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001452 def test_gerrit_upload_squash_reupload(self):
1453 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001454 self._run_gerrit_upload_test(
1455 ['--squash'],
1456 description,
1457 [],
1458 squash=True,
1459 expected_upstream_ref='origin/master',
1460 issue=123456)
1461
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001462 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1463 self.mock(git_cl, 'DieWithError',
1464 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1465 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1466 with self.assertRaises(SystemExitMock):
1467 self._run_gerrit_upload_test(
1468 ['--squash'],
1469 description,
1470 [],
1471 squash=True,
1472 expected_upstream_ref='origin/master',
1473 issue=123456,
1474 fetched_status='ABANDONED')
1475
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001476 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1477 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1478 lambda *_, **__: {'email': 'yet-another@example.com'})
1479 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1480 self._run_gerrit_upload_test(
1481 ['--squash'],
1482 description,
1483 [],
1484 squash=True,
1485 expected_upstream_ref='origin/master',
1486 issue=123456,
1487 other_cl_owner='other@example.com')
1488 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001489 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001490 'authenticate to Gerrit as yet-another@example.com.\n'
1491 'Uploading may fail due to lack of permissions',
1492 git_cl.sys.stdout.getvalue())
1493
rmistry@google.com2dd99862015-06-22 12:22:18 +00001494 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001495 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001496 def mock_run_git(*args, **_kwargs):
1497 if args[0] == ['for-each-ref',
1498 '--format=%(refname:short) %(upstream:short)',
1499 'refs/heads']:
1500 # Create a local branch dependency tree that looks like this:
1501 # test1 -> test2 -> test3 -> test4 -> test5
1502 # -> test3.1
1503 # test6 -> test0
1504 branch_deps = [
1505 'test2 test1', # test1 -> test2
1506 'test3 test2', # test2 -> test3
1507 'test3.1 test2', # test2 -> test3.1
1508 'test4 test3', # test3 -> test4
1509 'test5 test4', # test4 -> test5
1510 'test6 test0', # test0 -> test6
1511 'test7', # test7
1512 ]
1513 return '\n'.join(branch_deps)
1514 self.mock(git_cl, 'RunGit', mock_run_git)
1515
1516 class RecordCalls:
1517 times_called = 0
1518 record_calls = RecordCalls()
1519 def mock_CMDupload(*args, **_kwargs):
1520 record_calls.times_called += 1
1521 return 0
1522 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1523
1524 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001525 (('ask_for_data', 'This command will checkout all dependent branches '
1526 'and run "git cl upload". Press Enter to continue, '
1527 'or Ctrl+C to abort'), ''),
1528 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001529
1530 class MockChangelist():
1531 def __init__(self):
1532 pass
1533 def GetBranch(self):
1534 return 'test1'
1535 def GetIssue(self):
1536 return '123'
1537 def GetPatchset(self):
1538 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001539 def IsGerrit(self):
1540 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001541
1542 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1543 # CMDupload should have been called 5 times because of 5 dependent branches.
1544 self.assertEquals(5, record_calls.times_called)
1545 self.assertEquals(0, ret)
1546
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001547 def test_gerrit_change_id(self):
1548 self.calls = [
1549 ((['git', 'write-tree'], ),
1550 'hashtree'),
1551 ((['git', 'rev-parse', 'HEAD~0'], ),
1552 'branch-parent'),
1553 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1554 'A B <a@b.org> 1456848326 +0100'),
1555 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1556 'C D <c@d.org> 1456858326 +0100'),
1557 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1558 'hashchange'),
1559 ]
1560 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1561 self.assertEqual(change_id, 'Ihashchange')
1562
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001563 def test_desecription_append_footer(self):
1564 for init_desc, footer_line, expected_desc in [
1565 # Use unique desc first lines for easy test failure identification.
1566 ('foo', 'R=one', 'foo\n\nR=one'),
1567 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1568 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1569 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1570 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1571 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1572 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1573 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1574 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1575 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1576 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1577 ]:
1578 desc = git_cl.ChangeDescription(init_desc)
1579 desc.append_footer(footer_line)
1580 self.assertEqual(desc.description, expected_desc)
1581
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001582 def test_update_reviewers(self):
1583 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001584 ('foo', [], [],
1585 'foo'),
1586 ('foo\nR=xx', [], [],
1587 'foo\nR=xx'),
1588 ('foo\nTBR=xx', [], [],
1589 'foo\nTBR=xx'),
1590 ('foo', ['a@c'], [],
1591 'foo\n\nR=a@c'),
1592 ('foo\nR=xx', ['a@c'], [],
1593 'foo\n\nR=a@c, xx'),
1594 ('foo\nTBR=xx', ['a@c'], [],
1595 'foo\n\nR=a@c\nTBR=xx'),
1596 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1597 'foo\n\nR=a@c, yy\nTBR=xx'),
1598 ('foo\nBUG=', ['a@c'], [],
1599 'foo\nBUG=\nR=a@c'),
1600 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1601 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1602 ('foo', ['a@c', 'b@c'], [],
1603 'foo\n\nR=a@c, b@c'),
1604 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1605 'foo\nBar\n\nR=c@c\nBUG='),
1606 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1607 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001608 # Same as the line before, but full of whitespaces.
1609 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001610 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001611 'foo\nBar\n\nR=c@c\n BUG =',
1612 ),
1613 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001614 ('foo BUG=allo R=joe ', ['c@c'], [],
1615 'foo BUG=allo R=joe\n\nR=c@c'),
1616 # Redundant TBRs get promoted to Rs
1617 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1618 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001619 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001620 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001621 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001622 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001623 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001624 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001625 actual.append(obj.description)
1626 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001627
Nodir Turakulov23b82142017-11-16 11:04:25 -08001628 def test_get_hash_tags(self):
1629 cases = [
1630 ('', []),
1631 ('a', []),
1632 ('[a]', ['a']),
1633 ('[aa]', ['aa']),
1634 ('[a ]', ['a']),
1635 ('[a- ]', ['a']),
1636 ('[a- b]', ['a-b']),
1637 ('[a--b]', ['a-b']),
1638 ('[a', []),
1639 ('[a]x', ['a']),
1640 ('[aa]x', ['aa']),
1641 ('[a b]', ['a-b']),
1642 ('[a b]', ['a-b']),
1643 ('[a__b]', ['a-b']),
1644 ('[a] x', ['a']),
1645 ('[a][b]', ['a', 'b']),
1646 ('[a] [b]', ['a', 'b']),
1647 ('[a][b]x', ['a', 'b']),
1648 ('[a][b] x', ['a', 'b']),
1649 ('[a]\n[b]', ['a']),
1650 ('[a\nb]', []),
1651 ('[a][', ['a']),
1652 ('Revert "[a] feature"', ['a']),
1653 ('Reland "[a] feature"', ['a']),
1654 ('Revert: [a] feature', ['a']),
1655 ('Reland: [a] feature', ['a']),
1656 ('Revert "Reland: [a] feature"', ['a']),
1657 ('Foo: feature', ['foo']),
1658 ('Foo Bar: feature', ['foo-bar']),
1659 ('Revert "Foo bar: feature"', ['foo-bar']),
1660 ('Reland "Foo bar: feature"', ['foo-bar']),
1661 ]
1662 for desc, expected in cases:
1663 change_desc = git_cl.ChangeDescription(desc)
1664 actual = change_desc.get_hash_tags()
1665 self.assertEqual(
1666 actual,
1667 expected,
1668 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1669
wittman@chromium.org455dc922015-01-26 20:15:50 +00001670 def test_get_target_ref(self):
1671 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001672 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001673 self.assertEqual(None, git_cl.GetTargetRef(None,
1674 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001675 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001676
wittman@chromium.org455dc922015-01-26 20:15:50 +00001677 # Check default target refs for branches.
1678 self.assertEqual('refs/heads/master',
1679 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001680 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001681 self.assertEqual('refs/heads/master',
1682 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001683 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001684 self.assertEqual('refs/heads/master',
1685 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001686 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001687 self.assertEqual('refs/branch-heads/123',
1688 git_cl.GetTargetRef('origin',
1689 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001690 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001691 self.assertEqual('refs/diff/test',
1692 git_cl.GetTargetRef('origin',
1693 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001694 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001695 self.assertEqual('refs/heads/chrome/m42',
1696 git_cl.GetTargetRef('origin',
1697 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001698 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001699
1700 # Check target refs for user-specified target branch.
1701 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1702 'refs/remotes/branch-heads/123'):
1703 self.assertEqual('refs/branch-heads/123',
1704 git_cl.GetTargetRef('origin',
1705 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001706 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001707 for branch in ('origin/master', 'remotes/origin/master',
1708 'refs/remotes/origin/master'):
1709 self.assertEqual('refs/heads/master',
1710 git_cl.GetTargetRef('origin',
1711 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001712 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001713 for branch in ('master', 'heads/master', 'refs/heads/master'):
1714 self.assertEqual('refs/heads/master',
1715 git_cl.GetTargetRef('origin',
1716 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001717 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001718
wychen@chromium.orga872e752015-04-28 23:42:18 +00001719 def test_patch_when_dirty(self):
1720 # Patch when local tree is dirty
1721 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1722 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1723
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001724 @staticmethod
1725 def _get_gerrit_codereview_server_calls(branch, value=None,
1726 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001727 detect_branch=True,
1728 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001729 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1730
1731 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1732 """
1733 calls = []
1734 if detect_branch:
1735 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001736 if detect_server:
1737 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1738 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001739 if value is None:
1740 calls += [
1741 ((['git', 'config', 'branch.' + branch + '.merge'],),
1742 'refs/heads' + branch),
1743 ((['git', 'config', 'branch.' + branch + '.remote'],),
1744 'origin'),
1745 ((['git', 'config', 'remote.origin.url'],),
1746 'https://%s.googlesource.com/my/repo' % git_short_host),
1747 ]
1748 return calls
1749
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001750 def _patch_common(self, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001751 new_branch=False, git_short_host='host',
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001752 detect_gerrit_server=False,
1753 actual_codereview=None,
1754 codereview_in_url=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001755 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001756 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1757 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001758 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001759 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001760 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1761
tandriidf09a462016-08-18 16:23:55 -07001762 if new_branch:
1763 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001764
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001765 if codereview_in_url and actual_codereview == 'rietveld':
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001766 self.calls += [
1767 ((['git', 'rev-parse', '--show-cdup'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001768 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001769 ]
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001770
1771 if not force_codereview and not codereview_in_url:
1772 # These calls detect codereview to use.
1773 self.calls += [
1774 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1775 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1776 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1777 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1778 ((['git', 'config', 'gerrit.host'],), 'true'),
1779 ]
1780 if detect_gerrit_server:
1781 self.calls += self._get_gerrit_codereview_server_calls(
1782 'master', git_short_host=git_short_host,
1783 detect_branch=not new_branch and force_codereview)
1784 actual_codereview = 'gerrit'
1785
1786 if actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001787 self.calls += [
1788 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001789 'my%2Frepo~123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001790 {
1791 'current_revision': '7777777777',
1792 'revisions': {
1793 '1111111111': {
1794 '_number': 1,
1795 'fetch': {'http': {
1796 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1797 'ref': 'refs/changes/56/123456/1',
1798 }},
1799 },
1800 '7777777777': {
1801 '_number': 7,
1802 'fetch': {'http': {
1803 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1804 'ref': 'refs/changes/56/123456/7',
1805 }},
1806 },
1807 },
1808 }),
1809 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001810
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001811 def test_patch_gerrit_default(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001812 self._patch_common(git_short_host='chromium', detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001813 self.calls += [
1814 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1815 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001816 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001817 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001818 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001819 ((['git', 'config', 'branch.master.gerritserver',
1820 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001821 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001822 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1823 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1824 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001825 ]
1826 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1827
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001828 def test_patch_gerrit_new_branch(self):
1829 self._patch_common(
1830 git_short_host='chromium', detect_gerrit_server=True, new_branch=True)
1831 self.calls += [
1832 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1833 'refs/changes/56/123456/7'],), ''),
1834 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1835 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1836 ''),
1837 ((['git', 'config', 'branch.master.gerritserver',
1838 'https://chromium-review.googlesource.com'],), ''),
1839 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1840 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1841 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1842 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1843 ]
1844 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1845
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001846 def test_patch_gerrit_force(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001847 self._patch_common(
1848 force_codereview=True, git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001849 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001850 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001851 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001852 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001853 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001854 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001855 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001856 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001857 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001858 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1859 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1860 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001861 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001862 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001863
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001864 def test_patch_gerrit_guess_by_url(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001865 self.calls += self._get_gerrit_codereview_server_calls(
1866 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001867 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001868 actual_codereview='gerrit', git_short_host='else',
1869 codereview_in_url=True, detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001870 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001871 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001872 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001873 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001874 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001875 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001876 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001877 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001878 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001879 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1880 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1881 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001882 ]
1883 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001884 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001885
Aaron Gable697a91b2018-01-19 15:20:15 -08001886 def test_patch_gerrit_guess_by_url_with_repo(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001887 self.calls += self._get_gerrit_codereview_server_calls(
1888 'master', git_short_host='else', detect_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001889 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001890 actual_codereview='gerrit', git_short_host='else',
1891 codereview_in_url=True, detect_gerrit_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001892 self.calls += [
1893 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1894 'refs/changes/56/123456/1'],), ''),
1895 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1896 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1897 ''),
1898 ((['git', 'config', 'branch.master.gerritserver',
1899 'https://else-review.googlesource.com'],), ''),
1900 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1901 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1902 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1903 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1904 ]
1905 self.assertEqual(git_cl.main(
1906 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1907 0)
1908
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001909 def test_patch_gerrit_conflict(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001910 self._patch_common(detect_gerrit_server=True, git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001911 self.calls += [
1912 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001913 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001914 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1915 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1916 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001917 ]
1918 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001919 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001920
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001921 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001922 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001923 raise git_cl.gerrit_util.GerritError(404, '')
1924 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1925
tandriic2405f52016-10-10 08:13:15 -07001926 self.calls = [
1927 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07001928 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1929 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1930 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1931 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001932 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
1933 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1934 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1935 ((['git', 'config', 'remote.origin.url'],),
1936 'https://chromium.googlesource.com/my/repo'),
1937 ((['DieWithError',
1938 'change 123456 at https://chromium-review.googlesource.com does not '
1939 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07001940 ]
1941 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001942 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07001943
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001944 def _checkout_calls(self):
1945 return [
1946 ((['git', 'config', '--local', '--get-regexp',
1947 'branch\\..*\\.rietveldissue'], ),
1948 ('branch.retrying.rietveldissue 1111111111\n'
1949 'branch.some-fix.rietveldissue 2222222222\n')),
1950 ((['git', 'config', '--local', '--get-regexp',
1951 'branch\\..*\\.gerritissue'], ),
1952 ('branch.ger-branch.gerritissue 123456\n'
1953 'branch.gbranch654.gerritissue 654321\n')),
1954 ]
1955
1956 def test_checkout_gerrit(self):
1957 """Tests git cl checkout <issue>."""
1958 self.calls = self._checkout_calls()
1959 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1960 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1961
1962 def test_checkout_rietveld(self):
1963 """Tests git cl checkout <issue>."""
1964 self.calls = self._checkout_calls()
1965 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1966 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1967
1968 def test_checkout_not_found(self):
1969 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001970 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001971 self.calls = self._checkout_calls()
1972 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1973
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001974 def test_checkout_no_branch_issues(self):
1975 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001976 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001977 self.calls = [
1978 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001979 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001980 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001981 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001982 ]
1983 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1984
tandrii@chromium.org28253532016-04-14 13:46:56 +00001985 def _test_gerrit_ensure_authenticated_common(self, auth,
1986 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001987 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1988 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1989 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001990 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001991 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001992 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001993 cl.branch = 'master'
1994 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001995 cl.lookedup_issue = True
1996 return cl
1997
1998 def test_gerrit_ensure_authenticated_missing(self):
1999 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002000 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002001 })
2002 self.calls.append(
2003 ((['DieWithError',
2004 'Credentials for the following hosts are required:\n'
2005 ' chromium-review.googlesource.com\n'
2006 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002007 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002008 'https://chromium-review.googlesource.com/new-password'],), ''),)
2009 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2010
2011 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002012 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002013 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002014 'chromium.googlesource.com':
2015 ('git-one.example.com', None, 'secret1'),
2016 'chromium-review.googlesource.com':
2017 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002018 })
2019 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002020 (('ask_for_data', 'If you know what you are doing '
2021 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002022 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2023
2024 def test_gerrit_ensure_authenticated_ok(self):
2025 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002026 'chromium.googlesource.com':
2027 ('git-same.example.com', None, 'secret'),
2028 'chromium-review.googlesource.com':
2029 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002030 })
2031 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2032
tandrii@chromium.org28253532016-04-14 13:46:56 +00002033 def test_gerrit_ensure_authenticated_skipped(self):
2034 cl = self._test_gerrit_ensure_authenticated_common(
2035 auth={}, skip_auth_check=True)
2036 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2037
Eric Boren2fb63102018-10-05 13:05:03 +00002038 def test_gerrit_ensure_authenticated_bearer_token(self):
2039 cl = self._test_gerrit_ensure_authenticated_common(auth={
2040 'chromium.googlesource.com':
2041 ('', None, 'secret'),
2042 'chromium-review.googlesource.com':
2043 ('', None, 'secret'),
2044 })
2045 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2046 header = gerrit_util.CookiesAuthenticator().get_auth_header(
2047 'chromium.googlesource.com')
2048 self.assertTrue('Bearer' in header)
2049
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002050 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002051 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002052 lambda h, i, labels, notify=None:
2053 self._mocked_call(['SetReview', h, i, labels, notify]))
2054
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002055 self.calls = [
2056 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002057 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2058 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002059 ((['git', 'config', 'branch.feature.gerritserver'],),
2060 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002061 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
2062 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2063 ((['git', 'config', 'remote.origin.url'],),
2064 'https://chromium.googlesource.com/infra/infra.git'),
2065 ((['SetReview', 'chromium-review.googlesource.com',
2066 'infra%2Finfra~123',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002067 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002068 ]
tandriid9e5ce52016-07-13 02:32:59 -07002069
2070 def test_cmd_set_commit_gerrit_clear(self):
2071 self._cmd_set_commit_gerrit_common(0)
2072 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2073
2074 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002075 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002076 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2077
tandriid9e5ce52016-07-13 02:32:59 -07002078 def test_cmd_set_commit_gerrit(self):
2079 self._cmd_set_commit_gerrit_common(2)
2080 self.assertEqual(0, git_cl.main(['set-commit']))
2081
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002082 def test_description_display(self):
2083 out = StringIO.StringIO()
2084 self.mock(git_cl.sys, 'stdout', out)
2085
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002086 self.mock(git_cl, 'Changelist', ChangelistMock)
2087 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002088
2089 self.assertEqual(0, git_cl.main(['description', '-d']))
2090 self.assertEqual('foo\n', out.getvalue())
2091
iannucci3c972b92016-08-17 13:24:10 -07002092 def test_StatusFieldOverrideIssueMissingArgs(self):
2093 out = StringIO.StringIO()
2094 self.mock(git_cl.sys, 'stderr', out)
2095
2096 try:
2097 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2098 except SystemExit as ex:
2099 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002100 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002101
2102 out = StringIO.StringIO()
2103 self.mock(git_cl.sys, 'stderr', out)
2104
2105 try:
2106 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2107 except SystemExit as ex:
2108 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002109 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002110
2111 def test_StatusFieldOverrideIssue(self):
2112 out = StringIO.StringIO()
2113 self.mock(git_cl.sys, 'stdout', out)
2114
2115 def assertIssue(cl_self, *_args):
2116 self.assertEquals(cl_self.issue, 1)
2117 return 'foobar'
2118
2119 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2120 self.calls = [
2121 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2122 ((['git', 'config', 'rietveld.server'],), ''),
2123 ((['git', 'config', 'rietveld.server'],), ''),
2124 ]
iannuccie53c9352016-08-17 14:40:40 -07002125 self.assertEqual(
2126 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2127 0)
iannucci3c972b92016-08-17 13:24:10 -07002128 self.assertEqual(out.getvalue(), 'foobar\n')
2129
iannuccie53c9352016-08-17 14:40:40 -07002130 def test_SetCloseOverrideIssue(self):
2131 def assertIssue(cl_self, *_args):
2132 self.assertEquals(cl_self.issue, 1)
2133 return 'foobar'
2134
2135 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2136 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2137 self.calls = [
2138 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2139 ((['git', 'config', 'rietveld.server'],), ''),
2140 ((['git', 'config', 'rietveld.server'],), ''),
2141 ]
2142 self.assertEqual(
2143 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2144
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002145 def test_description_gerrit(self):
2146 out = StringIO.StringIO()
2147 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002148 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002149 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2150 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2151 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2152 ((['git', 'config', 'remote.origin.url'],),
2153 'https://chromium.googlesource.com/my/repo'),
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002154 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002155 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002156 {
2157 'current_revision': 'sha1',
2158 'revisions': {'sha1': {
2159 'commit': {'message': 'foobar'},
2160 }},
2161 }),
2162 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002163 self.assertEqual(0, git_cl.main([
2164 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2165 self.assertEqual('foobar\n', out.getvalue())
2166
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002167 def test_description_set_raw(self):
2168 out = StringIO.StringIO()
2169 self.mock(git_cl.sys, 'stdout', out)
2170
2171 self.mock(git_cl, 'Changelist', ChangelistMock)
2172 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2173
2174 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2175 self.assertEqual('hihi', ChangelistMock.desc)
2176
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002177 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002178 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002179
2180 def RunEditor(desc, _, **kwargs):
2181 self.assertEquals(
2182 '# Enter a description of the change.\n'
2183 '# This will be displayed on the codereview site.\n'
2184 '# The first line will also be used as the subject of the review.\n'
2185 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002186 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002187 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002188 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002189 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002190 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002191
dsansomee2d6fd92016-09-08 00:10:47 -07002192 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002193 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002194
2195 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2196 self.mock(git_cl.Changelist, 'GetDescription',
2197 lambda *args: current_desc)
2198 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2199 UpdateDescriptionRemote)
2200 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2201
2202 self.calls = [
2203 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002204 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002205 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2206 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002207 ((['git', 'config', 'core.editor'],), 'vi'),
2208 ]
2209 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2210
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002211 def test_description_set_stdin(self):
2212 out = StringIO.StringIO()
2213 self.mock(git_cl.sys, 'stdout', out)
2214
2215 self.mock(git_cl, 'Changelist', ChangelistMock)
2216 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2217
2218 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2219 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2220
kmarshall3bff56b2016-06-06 18:31:47 -07002221 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002222 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2223
kmarshall3bff56b2016-06-06 18:31:47 -07002224 self.calls = \
2225 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2226 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002227 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002228 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2229 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002230 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2231 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2232 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002233 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2234 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2235 ((['git', 'branch', '-D', 'foo'],), '')]
2236
kmarshall3bff56b2016-06-06 18:31:47 -07002237 self.mock(git_cl, 'get_cl_statuses',
2238 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002239 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2240 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2241 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002242
2243 self.assertEqual(0, git_cl.main(['archive', '-f']))
2244
2245 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002246 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002247 self.calls = \
2248 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2249 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002250 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002251 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2252 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002253 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2254
kmarshall9249e012016-08-23 12:02:16 -07002255 self.mock(git_cl, 'get_cl_statuses',
2256 lambda branches, fine_grained, max_processes:
2257 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2258
2259 self.assertEqual(1, git_cl.main(['archive', '-f']))
2260
2261 def test_archive_dry_run(self):
2262 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2263
2264 self.calls = \
2265 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2266 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2267 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2268 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2269 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2270 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2271 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2272 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2273 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002274
2275 self.mock(git_cl, 'get_cl_statuses',
2276 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002277 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2278 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2279 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002280
kmarshall9249e012016-08-23 12:02:16 -07002281 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2282
2283 def test_archive_no_tags(self):
2284 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2285
2286 self.calls = \
2287 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2288 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2289 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2290 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2291 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2292 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2293 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2294 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2295 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2296 ((['git', 'branch', '-D', 'foo'],), '')]
2297
2298 self.mock(git_cl, 'get_cl_statuses',
2299 lambda branches, fine_grained, max_processes:
2300 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2301 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2302 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2303
2304 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002305
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002306 def test_cmd_issue_erase_existing(self):
2307 out = StringIO.StringIO()
2308 self.mock(git_cl.sys, 'stdout', out)
2309 self.calls = [
2310 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002311 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2312 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002313 # Let this command raise exception (retcode=1) - it should be ignored.
2314 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002315 CERR1),
2316 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2317 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002318 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2319 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2320 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002321 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002322 ]
2323 self.assertEqual(0, git_cl.main(['issue', '0']))
2324
Aaron Gable400e9892017-07-12 15:31:21 -07002325 def test_cmd_issue_erase_existing_with_change_id(self):
2326 out = StringIO.StringIO()
2327 self.mock(git_cl.sys, 'stdout', out)
2328 self.mock(git_cl.Changelist, 'GetDescription',
2329 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2330 self.calls = [
2331 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2332 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2333 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002334 # Let this command raise exception (retcode=1) - it should be ignored.
2335 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2336 CERR1),
2337 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2338 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2339 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2340 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2341 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002342 ((['git', 'log', '-1', '--format=%B'],),
2343 'This is a description\n\nChange-Id: Ideadbeef'),
2344 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002345 ]
2346 self.assertEqual(0, git_cl.main(['issue', '0']))
2347
phajdan.jre328cf92016-08-22 04:12:17 -07002348 def test_cmd_issue_json(self):
2349 out = StringIO.StringIO()
2350 self.mock(git_cl.sys, 'stdout', out)
2351 self.calls = [
2352 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002353 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002354 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2355 ((['git', 'config', 'rietveld.server'],),
2356 'https://codereview.chromium.org'),
2357 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2358 (('write_json', 'output.json',
2359 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2360 ''),
2361 ]
2362 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2363
tandrii8c5a3532016-11-04 07:52:02 -07002364 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2365 self.mock(git_cl.Changelist, 'GetChange',
2366 lambda _, *a: (
2367 self._mocked_call(['GetChange']+list(a))))
2368 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2369 lambda *_, **__: (
2370 self._mocked_call(['DoGetTryMasters'])))
2371 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2372 lambda _, s: self._mocked_call(['SetCQState', s]))
2373
tandrii8c5a3532016-11-04 07:52:02 -07002374 self.calls = [
2375 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2376 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2377 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2378 ((['git', 'config', 'branch.feature.gerritserver'],),
2379 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002380 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2381 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2382 ((['git', 'config', 'remote.origin.url'],),
2383 'https://chromium.googlesource.com/depot_tools'),
2384 (('GetChangeDetail', 'chromium-review.googlesource.com',
2385 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002386 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2387 'project': 'depot_tools',
2388 'status': 'OPEN',
2389 'owner': {'email': 'owner@e.mail'},
2390 'revisions': {
2391 'deadbeaf': {
2392 '_number': 6,
2393 },
2394 'beeeeeef': {
2395 '_number': 7,
2396 'fetch': {'http': {
2397 'url': 'https://chromium.googlesource.com/depot_tools',
2398 'ref': 'refs/changes/56/123456/7'
2399 }},
2400 },
2401 },
2402 }),
tandrii8c5a3532016-11-04 07:52:02 -07002403 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2404 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2405 ((['get_or_create_merge_base', 'feature', 'feature'],),
2406 'fake_ancestor_sha'),
2407 ((['GetChange', 'fake_ancestor_sha', None], ),
2408 git_cl.presubmit_support.GitChange(
2409 '', '', '', '', '', '', '', '')),
2410 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2411 ((['DoGetTryMasters'], ), None),
2412 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2413 ]
2414 out = StringIO.StringIO()
2415 self.mock(git_cl.sys, 'stdout', out)
2416 self.assertEqual(0, git_cl.main(['try']))
2417 self.assertEqual(
2418 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002419 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002420 'https://chromium-review.googlesource.com/123456\n')
2421
tandrii8c5a3532016-11-04 07:52:02 -07002422 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2423 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2424 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2425
tandrii8c5a3532016-11-04 07:52:02 -07002426 self.calls = [
2427 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2428 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2429 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2430 ((['git', 'config', 'branch.feature.gerritserver'],),
2431 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002432 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2433 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2434 ((['git', 'config', 'remote.origin.url'],),
2435 'https://chromium.googlesource.com/depot_tools'),
2436 (('GetChangeDetail', 'chromium-review.googlesource.com',
2437 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002438 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002439 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002440 'status': 'OPEN',
2441 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002442 'revisions': {
2443 'deadbeaf': {
2444 '_number': 6,
2445 },
2446 'beeeeeef': {
2447 '_number': 7,
2448 'fetch': {'http': {
2449 'url': 'https://chromium.googlesource.com/depot_tools',
2450 'ref': 'refs/changes/56/123456/7'
2451 }},
2452 },
2453 },
2454 }),
2455 ]
2456
2457 def _buildbucket_retry(*_, **kw):
2458 # self.maxDiff = 10000
2459 body = json.loads(kw['body'])
2460 self.assertEqual(len(body['builds']), 1)
2461 build = body['builds'][0]
2462 params = json.loads(build.pop('parameters_json'))
2463 self.assertEqual(params, {
2464 u'builder_name': u'win',
2465 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2466 u'revision': None}],
2467 u'properties': {
2468 u'category': u'git_cl_try',
2469 u'key': u'val',
2470 u'json': [{u'a': 1}, None],
2471 u'master': u'tryserver.chromium',
2472
2473 u'patch_gerrit_url':
2474 u'https://chromium-review.googlesource.com',
2475 u'patch_issue': 123456,
2476 u'patch_project': u'depot_tools',
2477 u'patch_ref': u'refs/changes/56/123456/7',
2478 u'patch_repository_url':
2479 u'https://chromium.googlesource.com/depot_tools',
2480 u'patch_set': 7,
2481 u'patch_storage': u'gerrit',
2482 }
2483 })
2484 self.assertEqual(build, {
2485 u'bucket': u'master.tryserver.chromium',
2486 u'client_operation_id': u'uuid4',
2487 u'tags': [
2488 u'builder:win',
2489 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2490 u'user_agent:git_cl_try',
2491 u'master:tryserver.chromium'],
2492 })
2493
2494 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2495
2496 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2497 self.assertEqual(0, git_cl.main([
2498 'try', '-m', 'tryserver.chromium', '-b', 'win',
2499 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2500 self.assertRegexpMatches(
2501 git_cl.sys.stdout.getvalue(),
2502 'Tried jobs on:\nBucket: master.tryserver.chromium')
2503
borenet6c0efe62016-10-19 08:13:29 -07002504 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002505 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2506 lambda _: {
2507 'owner_email': 'owner@e.mail',
2508 'private': False,
2509 'closed': False,
2510 'project': 'depot_tools',
2511 'patchsets': [20001],
2512 })
borenet6c0efe62016-10-19 08:13:29 -07002513 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2514 self.calls = [
2515 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2516 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2517 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2518 ((['git', 'config', 'rietveld.server'],),
2519 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002520 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002521 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002522 ]
2523
2524 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002525 body = json.loads(kw['body'])
2526 self.assertEqual(len(body['builds']), 1)
2527 build = body['builds'][0]
2528 params = json.loads(build.pop('parameters_json'))
2529 self.assertEqual(params, {
2530 u'builder_name': u'win',
2531 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2532 u'revision': None}],
2533 u'properties': {
2534 u'category': u'git_cl_try',
2535 u'issue': 123,
2536 u'patch_project': u'depot_tools',
2537 u'patch_storage': u'rietveld',
2538 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002539 u'rietveld': u'https://codereview.chromium.org',
2540 }
2541 })
2542 self.assertEqual(build, {
2543 u'bucket': u'test.bucket',
2544 u'client_operation_id': u'uuid4',
2545 u'tags': [u'builder:win',
2546 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2547 u'user_agent:git_cl_try'],
2548 })
2549
2550 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2551
2552 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2553 self.assertEqual(0, git_cl.main([
2554 'try', '-B', 'test.bucket', '-b', 'win']))
2555 self.assertRegexpMatches(
2556 git_cl.sys.stdout.getvalue(),
2557 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002558
qyearsley123a4682016-10-26 09:12:17 -07002559 def test_git_cl_try_bots_on_multiple_masters(self):
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00002560 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2561 self.mock(git_cl.Changelist, 'GetChange',
2562 lambda _, *a: (
2563 self._mocked_call(['GetChange']+list(a))))
2564 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2565 lambda *_, **__: (
2566 self._mocked_call(['DoGetTryMasters'])))
2567 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2568 lambda _, s: self._mocked_call(['SetCQState', s]))
2569
qyearsley123a4682016-10-26 09:12:17 -07002570 self.calls = [
2571 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00002572 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2573 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2574 ((['git', 'config', 'branch.feature.gerritserver'],),
2575 'https://chromium-review.googlesource.com'),
2576 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2577 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2578 ((['git', 'config', 'remote.origin.url'],),
2579 'https://chromium.googlesource.com/depot_tools'),
2580 (('GetChangeDetail', 'chromium-review.googlesource.com',
2581 'depot_tools~123456',
2582 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2583 'project': 'depot_tools',
2584 'status': 'OPEN',
2585 'owner': {'email': 'owner@e.mail'},
2586 'revisions': {
2587 'deadbeaf': {
2588 '_number': 6,
2589 },
2590 'beeeeeef': {
2591 '_number': 7,
2592 'fetch': {'http': {
2593 'url': 'https://chromium.googlesource.com/depot_tools',
2594 'ref': 'refs/changes/56/123456/7'
2595 }},
2596 },
2597 },
2598 }),
qyearsley123a4682016-10-26 09:12:17 -07002599 ]
2600
2601 def _buildbucket_retry(*_, **kw):
2602 body = json.loads(kw['body'])
2603 self.assertEqual(len(body['builds']), 2)
2604
Nodir Turakulovb422e682018-02-20 22:51:30 -08002605 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2606 params = json.loads(body['builds'][0]['parameters_json'])
2607 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002608
Nodir Turakulovb422e682018-02-20 22:51:30 -08002609 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2610 params = json.loads(body['builds'][1]['parameters_json'])
2611 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002612
2613 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2614
2615 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002616 json.dumps({
2617 'builder1': {'bucket': 'bucket1'},
2618 'builder2': {'bucket': 'bucket2'},
2619 })))
qyearsley123a4682016-10-26 09:12:17 -07002620
2621 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2622 self.assertEqual(
2623 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2624 self.assertEqual(
2625 git_cl.sys.stdout.getvalue(),
2626 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002627 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002628 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002629 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002630 ' builder2: []\n'
2631 'To see results here, run: git cl try-results\n'
2632 'To see results in browser, run: git cl web\n')
2633
tandrii16e0b4e2016-06-07 10:34:28 -07002634 def _common_GerritCommitMsgHookCheck(self):
2635 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2636 self.mock(git_cl.os.path, 'abspath',
2637 lambda path: self._mocked_call(['abspath', path]))
2638 self.mock(git_cl.os.path, 'exists',
2639 lambda path: self._mocked_call(['exists', path]))
2640 self.mock(git_cl.gclient_utils, 'FileRead',
2641 lambda path: self._mocked_call(['FileRead', path]))
2642 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2643 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2644 self.calls = [
2645 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2646 ((['abspath', '../'],), '/abs/git_repo_root'),
2647 ]
2648 return git_cl.Changelist(codereview='gerrit', issue=123)
2649
2650 def test_GerritCommitMsgHookCheck_custom_hook(self):
2651 cl = self._common_GerritCommitMsgHookCheck()
2652 self.calls += [
2653 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2654 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2655 '#!/bin/sh\necho "custom hook"')
2656 ]
2657 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2658
2659 def test_GerritCommitMsgHookCheck_not_exists(self):
2660 cl = self._common_GerritCommitMsgHookCheck()
2661 self.calls += [
2662 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2663 ]
2664 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2665
2666 def test_GerritCommitMsgHookCheck(self):
2667 cl = self._common_GerritCommitMsgHookCheck()
2668 self.calls += [
2669 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2670 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2671 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002672 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002673 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2674 ''),
2675 ]
2676 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2677
tandriic4344b52016-08-29 06:04:54 -07002678 def test_GerritCmdLand(self):
2679 self.calls += [
2680 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2681 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2682 'deadbeaf'),
2683 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2684 ((['git', 'config', 'branch.feature.gerritserver'],),
2685 'chromium-review.googlesource.com'),
2686 ]
2687 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2688 cl._codereview_impl._GetChangeDetail = lambda _: {
2689 'labels': {},
2690 'current_revision': 'deadbeaf',
2691 }
agable32978d92016-11-01 12:55:02 -07002692 cl._codereview_impl._GetChangeCommit = lambda: {
2693 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002694 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002695 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2696 }
tandriic4344b52016-08-29 06:04:54 -07002697 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002698 out = StringIO.StringIO()
2699 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002700 self.assertEqual(0, cl.CMDLand(force=True,
2701 bypass_hooks=True,
2702 verbose=True,
2703 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002704 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002705 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002706
tandrii221ab252016-10-06 08:12:04 -07002707 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002708 '9000': {
2709 'id': '9000',
2710 'bucket': 'master.x.y',
2711 'created_by': 'user:someone@chromium.org',
2712 'created_ts': '147200002222000',
2713 'experimental': False,
2714 'parameters_json': json.dumps({
2715 'builder_name': 'my-bot',
2716 'properties': {'category': 'cq'},
2717 }),
2718 'status': 'STARTED',
2719 'tags': [
2720 'build_address:x.y/my-bot/2',
2721 'builder:my-bot',
2722 'experimental:false',
2723 'user_agent:cq',
2724 ],
2725 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2726 },
2727 '8000': {
2728 'id': '8000',
2729 'bucket': 'master.x.y',
2730 'created_by': 'user:someone@chromium.org',
2731 'created_ts': '147200001111000',
2732 'experimental': False,
2733 'failure_reason': 'BUILD_FAILURE',
2734 'parameters_json': json.dumps({
2735 'builder_name': 'my-bot',
2736 'properties': {'category': 'cq'},
2737 }),
2738 'result_details_json': json.dumps({
2739 'properties': {'buildnumber': 1},
2740 }),
2741 'result': 'FAILURE',
2742 'status': 'COMPLETED',
2743 'tags': [
2744 'build_address:x.y/my-bot/1',
2745 'builder:my-bot',
2746 'experimental:false',
2747 'user_agent:cq',
2748 ],
2749 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2750 },
2751 }
tandrii221ab252016-10-06 08:12:04 -07002752
2753 def test_write_try_results_json(self):
2754 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002755 {
2756 'bucket': 'master.x.y',
2757 'buildbucket_id': '8000',
2758 'builder_name': 'my-bot',
2759 'created_ts': '147200001111000',
2760 'experimental': False,
2761 'failure_reason': 'BUILD_FAILURE',
2762 'result': 'FAILURE',
2763 'status': 'COMPLETED',
2764 'tags': [
2765 'build_address:x.y/my-bot/1',
2766 'builder:my-bot',
2767 'experimental:false',
2768 'user_agent:cq',
2769 ],
2770 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2771 },
2772 {
2773 'bucket': 'master.x.y',
2774 'buildbucket_id': '9000',
2775 'builder_name': 'my-bot',
2776 'created_ts': '147200002222000',
2777 'experimental': False,
2778 'failure_reason': None,
2779 'result': None,
2780 'status': 'STARTED',
2781 'tags': [
2782 'build_address:x.y/my-bot/2',
2783 'builder:my-bot',
2784 'experimental:false',
2785 'user_agent:cq',
2786 ],
2787 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2788 },
tandrii221ab252016-10-06 08:12:04 -07002789 ]
2790 self.calls = [(('write_json', 'output.json', expected_output), '')]
2791 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2792
tandrii45b2a582016-10-11 03:14:16 -07002793 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002794 out = StringIO.StringIO()
2795 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002796 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2797 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002798 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2799 self._mocked_call(['get_authenticator_for_host', host]))
2800 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2801 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002802
2803 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2804 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002805 self.calls += [
2806 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2807 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2808 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2809 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2810 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2811 ((['git', 'config', 'branch.feature.rietveldserver'],),
2812 'codereview.example.com'),
2813 ((['get_authenticator_for_host', 'codereview.example.com'],),
2814 AuthenticatorMock()),
2815 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2816
2817 def test_fetch_try_jobs_none_rietveld(self):
2818 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002819 # Simulate that user isn't logged in.
2820 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002821 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002822 self.assertRegexpMatches(sys.stdout.getvalue(),
2823 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002824 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2825
2826 def test_fetch_try_jobs_some_rietveld(self):
2827 self._setup_fetch_try_jobs_rietveld({
2828 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2829 })
2830 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002831 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2832 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2833 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2834
2835 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2836 self._setup_fetch_try_jobs(most_recent_patchset=13)
2837 self.calls += [
2838 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2839 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2840 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002841 # TODO(tandrii): Uncomment the below if we decide to support checking
2842 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002843 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002844 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002845 ((['git', 'config', 'branch.feature.gerritserver'],),
2846 'https://x-review.googlesource.com'),
2847 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2848 AuthenticatorMock()),
2849 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2850
2851 def test_fetch_try_jobs_none_gerrit(self):
2852 self._setup_fetch_try_jobs_gerrit({})
2853 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002854 # TODO(tandrii): Uncomment the below if we decide to support checking
2855 # patchsets for Gerrit.
2856 # self.assertRegexpMatches(
2857 # sys.stdout.getvalue(),
2858 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002859 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2860
2861 def test_fetch_try_jobs_some_gerrit(self):
2862 self._setup_fetch_try_jobs_gerrit({
2863 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2864 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002865 # TODO(tandrii): Uncomment the below if we decide to support checking
2866 # patchsets for Gerrit.
2867 # self.calls.remove(
2868 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002869 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2870
2871 # ... and doesn't result in warning.
2872 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2873 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002874 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2875 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2876
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002877 def _mock_gerrit_changes_for_detail_cache(self):
2878 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002879
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002880 def test_gerrit_change_detail_cache_simple(self):
2881 self._mock_gerrit_changes_for_detail_cache()
2882 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002883 (('GetChangeDetail', 'host', 'my%2Frepo~1', []), 'a'),
2884 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b'),
2885 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002886 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002887 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002888 cl1._cached_remote_url = (
2889 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002890 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002891 cl2._cached_remote_url = (
2892 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002893 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2894 self.assertEqual(cl1._GetChangeDetail(), 'a')
2895 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
2896 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
2897 self.assertEqual(cl1._GetChangeDetail(), 'a')
2898 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002899
2900 def test_gerrit_change_detail_cache_options(self):
2901 self._mock_gerrit_changes_for_detail_cache()
2902 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002903 (('GetChangeDetail', 'host', 'repo~1', ['C', 'A', 'B']), 'cab'),
2904 (('GetChangeDetail', 'host', 'repo~1', ['A', 'D']), 'ad'),
2905 (('GetChangeDetail', 'host', 'repo~1', ['A']), 'a'), # no_cache=True
2906 # no longer in cache.
2907 (('GetChangeDetail', 'host', 'repo~1', ['B']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002908 ]
2909 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002910 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002911 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2912 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2913 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2914 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2915 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2916 self.assertEqual(cl._GetChangeDetail(), 'cab')
2917
2918 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2919 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2920 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2921 self.assertEqual(cl._GetChangeDetail(), 'cab')
2922
2923 # Finally, no_cache should invalidate all caches for given change.
2924 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2925 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2926
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002927 def test_gerrit_description_caching(self):
2928 def gen_detail(rev, desc):
2929 return {
2930 'current_revision': rev,
2931 'revisions': {rev: {'commit': {'message': desc}}}
2932 }
2933 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002934 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002935 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2936 gen_detail('rev1', 'desc1')),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002937 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002938 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2939 gen_detail('rev2', 'desc2')),
2940 ]
2941
2942 self._mock_gerrit_changes_for_detail_cache()
2943 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002944 cl._cached_remote_url = (
2945 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002946 self.assertEqual(cl.GetDescription(), 'desc1')
2947 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
2948 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002949
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002950 def test_print_current_creds(self):
2951 class CookiesAuthenticatorMock(object):
2952 def __init__(self):
2953 self.gitcookies = {
2954 'host.googlesource.com': ('user', 'pass'),
2955 'host-review.googlesource.com': ('user', 'pass'),
2956 }
2957 self.netrc = self
2958 self.netrc.hosts = {
2959 'github.com': ('user2', None, 'pass2'),
2960 'host2.googlesource.com': ('user3', None, 'pass'),
2961 }
2962 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2963 CookiesAuthenticatorMock)
2964 self.mock(sys, 'stdout', StringIO.StringIO())
2965 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2966 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2967 ' Host\t User\t Which file',
2968 '============================\t=====\t===========',
2969 'host-review.googlesource.com\t user\t.gitcookies',
2970 ' host.googlesource.com\t user\t.gitcookies',
2971 ' host2.googlesource.com\tuser3\t .netrc',
2972 ])
2973 sys.stdout.buf = ''
2974 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2975 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2976 ' Host\tUser\t Which file',
2977 '============================\t====\t===========',
2978 'host-review.googlesource.com\tuser\t.gitcookies',
2979 ' host.googlesource.com\tuser\t.gitcookies',
2980 ])
2981
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002982 def _common_creds_check_mocks(self):
2983 def exists_mock(path):
2984 dirname = os.path.dirname(path)
2985 if dirname == os.path.expanduser('~'):
2986 dirname = '~'
2987 base = os.path.basename(path)
2988 if base in ('.netrc', '.gitcookies'):
2989 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
2990 # git cl also checks for existence other files not relevant to this test.
2991 return None
2992 self.mock(os.path, 'exists', exists_mock)
2993 self.mock(sys, 'stdout', StringIO.StringIO())
2994
2995 def test_creds_check_gitcookies_not_configured(self):
2996 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002997 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002998 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002999 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003000 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003001 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3002 (('os.path.exists', '~/.netrc'), True),
3003 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3004 'or Ctrl+C to abort'), ''),
3005 ((['git', 'config', '--global', 'http.cookiefile',
3006 os.path.expanduser('~/.gitcookies')], ), ''),
3007 ]
3008 self.assertEqual(0, git_cl.main(['creds-check']))
3009 self.assertRegexpMatches(
3010 sys.stdout.getvalue(),
3011 '^You seem to be using outdated .netrc for git credentials:')
3012 self.assertRegexpMatches(
3013 sys.stdout.getvalue(),
3014 '\nConfigured git to use .gitcookies from')
3015
3016 def test_creds_check_gitcookies_configured_custom_broken(self):
3017 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003018 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003019 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003020 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003021 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003022 ((['git', 'config', '--global', 'http.cookiefile'],),
3023 '/custom/.gitcookies'),
3024 (('os.path.exists', '/custom/.gitcookies'), False),
3025 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3026 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3027 ((['git', 'config', '--global', 'http.cookiefile',
3028 os.path.expanduser('~/.gitcookies')], ), ''),
3029 ]
3030 self.assertEqual(0, git_cl.main(['creds-check']))
3031 self.assertRegexpMatches(
3032 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003033 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003034 self.assertRegexpMatches(
3035 sys.stdout.getvalue(),
3036 'However, your configured .gitcookies file is missing.')
3037
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003038 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003039 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003040 lambda _, message, publish: self._mocked_call(
3041 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003042 self.calls = [
3043 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3044 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003045 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003046 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003047 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3048 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003049
3050 def test_git_cl_comment_add_gerrit(self):
3051 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003052 lambda host, change, msg, ready:
3053 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003054 self.calls = [
3055 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3056 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3057 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3058 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3059 'origin/master'),
3060 ((['git', 'config', 'remote.origin.url'],),
3061 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003062 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
3063 'msg', None),
Aaron Gable636b13f2017-07-14 10:42:48 -07003064 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003065 ]
3066 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3067 '-a', 'msg']))
3068
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003069 def test_git_cl_comments_fetch_rietveld(self):
3070 self.mock(sys, 'stdout', StringIO.StringIO())
3071 self.calls = [
3072 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3073 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Leszek Swirski45b20c42018-09-17 17:05:26 +00003074 ] * 2 + [
3075 (('write_json', 'output.json', [
3076 {
3077 'date': '2000-03-13 20:49:34.515270',
3078 'message': 'PTAL',
3079 'approval': False,
3080 'disapproval': False,
3081 'sender': 'owner@example.com'
3082 }, {
3083 'date': '2017-03-13 20:49:34.515270',
3084 'message': 'lgtm',
3085 'approval': True,
3086 'disapproval': False,
3087 'sender': 'r@example.com'
3088 }, {
3089 'date': '2017-03-13 21:50:34.515270',
3090 'message': 'not lgtm',
3091 'approval': False,
3092 'disapproval': True,
3093 'sender': 'r2@example.com'
3094 }
3095 ]),'')
3096 ]
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003097 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3098 'messages': [
3099 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3100 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3101 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3102 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3103 # Intentionally wrong order here.
3104 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3105 'disapproval': False, 'approval': False,
3106 'sender': 'owner@example.com'},
3107 ],
3108 'owner_email': 'owner@example.com',
3109 })
3110 expected_comments_summary = [
3111 git_cl._CommentSummary(
3112 message='lgtm',
3113 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3114 disapproval=False, approval=True, sender='r@example.com'),
3115 git_cl._CommentSummary(
3116 message='not lgtm',
3117 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3118 disapproval=True, approval=False, sender='r2@example.com'),
3119 # Note: same order as in whatever Rietveld returns.
3120 git_cl._CommentSummary(
3121 message='PTAL',
3122 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3123 disapproval=False, approval=False, sender='owner@example.com'),
3124 ]
3125 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3126 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00003127 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3128 '-j', 'output.json']))
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003129
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003130 def test_git_cl_comments_fetch_gerrit(self):
3131 self.mock(sys, 'stdout', StringIO.StringIO())
3132 self.calls = [
3133 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3134 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3135 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3136 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3137 'origin/master'),
3138 ((['git', 'config', 'remote.origin.url'],),
3139 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003140 (('GetChangeDetail', 'chromium-review.googlesource.com',
3141 'infra%2Finfra~1',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003142 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003143 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003144 'messages': [
3145 {
3146 u'_revision_number': 1,
3147 u'author': {
3148 u'_account_id': 1111084,
3149 u'email': u'commit-bot@chromium.org',
3150 u'name': u'Commit Bot'
3151 },
3152 u'date': u'2017-03-15 20:08:45.000000000',
3153 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003154 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003155 u'tag': u'autogenerated:cq:dry-run'
3156 },
3157 {
3158 u'_revision_number': 2,
3159 u'author': {
3160 u'_account_id': 11151243,
3161 u'email': u'owner@example.com',
3162 u'name': u'owner'
3163 },
3164 u'date': u'2017-03-16 20:00:41.000000000',
3165 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3166 u'message': u'PTAL',
3167 },
3168 {
3169 u'_revision_number': 2,
3170 u'author': {
3171 u'_account_id': 148512 ,
3172 u'email': u'reviewer@example.com',
3173 u'name': u'reviewer'
3174 },
3175 u'date': u'2017-03-17 05:19:37.500000000',
3176 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3177 u'message': u'Patch Set 2: Code-Review+1',
3178 },
3179 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003180 }),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003181 (('GetChangeComments', 'chromium-review.googlesource.com',
3182 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003183 '/COMMIT_MSG': [
3184 {
3185 'author': {'email': u'reviewer@example.com'},
3186 'updated': u'2017-03-17 05:19:37.500000000',
3187 'patch_set': 2,
3188 'side': 'REVISION',
3189 'message': 'Please include a bug link',
3190 },
3191 ],
3192 'codereview.settings': [
3193 {
3194 'author': {'email': u'owner@example.com'},
3195 'updated': u'2017-03-16 20:00:41.000000000',
3196 'patch_set': 2,
3197 'side': 'PARENT',
3198 'line': 42,
3199 'message': 'I removed this because it is bad',
3200 },
3201 ]
Leszek Swirski45b20c42018-09-17 17:05:26 +00003202 })
3203 ] * 2 + [
3204 (('write_json', 'output.json', [
3205 {
3206 u'date': u'2017-03-16 20:00:41.000000',
3207 u'message': (
3208 u'PTAL\n' +
3209 u'\n' +
3210 u'codereview.settings\n' +
3211 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3212 u'c/1/2/codereview.settings#b42\n' +
3213 u' I removed this because it is bad\n'),
3214 u'approval': False,
3215 u'disapproval': False,
3216 u'sender': u'owner@example.com'
3217 }, {
3218 u'date': u'2017-03-17 05:19:37.500000',
3219 u'message': (
3220 u'Patch Set 2: Code-Review+1\n' +
3221 u'\n' +
3222 u'/COMMIT_MSG\n' +
3223 u' PS2, File comment: https://chromium-review.googlesource' +
3224 u'.com/c/1/2//COMMIT_MSG#\n' +
3225 u' Please include a bug link\n'),
3226 u'approval': False,
3227 u'disapproval': False,
3228 u'sender': u'reviewer@example.com'
3229 }
3230 ]),'')
3231 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003232 expected_comments_summary = [
3233 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003234 message=(
3235 u'PTAL\n' +
3236 u'\n' +
3237 u'codereview.settings\n' +
3238 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3239 u'c/1/2/codereview.settings#b42\n' +
3240 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003241 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3242 disapproval=False, approval=False, sender=u'owner@example.com'),
3243 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003244 message=(
3245 u'Patch Set 2: Code-Review+1\n' +
3246 u'\n' +
3247 u'/COMMIT_MSG\n' +
3248 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3249 u'c/1/2//COMMIT_MSG#\n' +
3250 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003251 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3252 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3253 ]
3254 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3255 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00003256 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3257 '-j', 'output.json']))
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003258
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003259 def test_get_remote_url_with_mirror(self):
3260 original_os_path_isdir = os.path.isdir
3261 def selective_os_path_isdir_mock(path):
3262 if path == '/cache/this-dir-exists':
3263 return self._mocked_call('os.path.isdir', path)
3264 return original_os_path_isdir(path)
3265 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
3266
3267 url = 'https://chromium.googlesource.com/my/repo'
3268 self.calls = [
3269 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3270 ((['git', 'config', 'branch.master.merge'],), 'master'),
3271 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3272 ((['git', 'config', 'remote.origin.url'],),
3273 '/cache/this-dir-exists'),
3274 (('os.path.isdir', '/cache/this-dir-exists'),
3275 True),
3276 # Runs in /cache/this-dir-exists.
3277 ((['git', 'config', 'remote.origin.url'],),
3278 url),
3279 ]
3280 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3281 self.assertEqual(cl.GetRemoteUrl(), url)
3282 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
3283
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003284 def test_gerrit_change_identifier_with_project(self):
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003285 self.calls = [
3286 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3287 ((['git', 'config', 'branch.master.merge'],), 'master'),
3288 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3289 ((['git', 'config', 'remote.origin.url'],),
3290 'https://chromium.googlesource.com/a/my/repo.git/'),
3291 ]
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003292 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3293 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
3294
3295 def test_gerrit_change_identifier_without_project(self):
3296 self.calls = [
3297 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3298 ((['git', 'config', 'branch.master.merge'],), 'master'),
3299 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3300 ((['git', 'config', 'remote.origin.url'],), CERR1),
3301 ]
3302 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3303 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003304
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003305
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003306if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003307 logging.basicConfig(
3308 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003309 unittest.main()