blob: 9e5f57e5f8ef66a5b3659a5a3740cef81e715063 [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
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000762 def _git_post_upload_calls(cls):
763 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000764 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
765 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
766 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000767 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000768 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000769 ]
770
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000771 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000772 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000773 fake_ancestor = 'fake_ancestor'
774 fake_cl = 'fake_cl_for_patch'
775 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000776 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000777 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000778 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000779 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000780 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000781 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000782 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700784 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000785 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000786 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000787 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000788 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000789 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000791 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000792 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000793 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000794 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000795 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000796
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000797 @classmethod
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000798 def _gerrit_ensure_auth_calls(
799 cls, issue=None, skip_auth_check=False, short_hostname='chromium'):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000800 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000801 if skip_auth_check:
802 return [((cmd, ), 'true')]
803
tandrii5d48c322016-08-18 16:19:37 -0700804 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000805 if issue:
806 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100807 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000808 ])
809 calls.extend([
810 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
811 ((['git', 'config', 'branch.master.remote'],), 'origin'),
812 ((['git', 'config', 'remote.origin.url'],),
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000813 'https://%s.googlesource.com/my/repo' % short_hostname),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000814 ])
815 return calls
816
817 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100818 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200819 fetched_status=None, other_cl_owner=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000820 custom_cl_base=None, short_hostname='chromium'):
Aaron Gable13101a62018-02-09 13:20:41 -0800821 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100822 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200823 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
824 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
825 ((['git', 'config', 'branch.master.gerritissue'],),
826 CERR1 if issue is None else str(issue)),
827 ]
828
829 if custom_cl_base:
830 ancestor_revision = custom_cl_base
831 else:
832 # Determine ancestor_revision to be merge base.
833 ancestor_revision = 'fake_ancestor_sha'
834 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000835 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000836 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000837 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200838 'refs/remotes/origin/master'],), ancestor_revision),
839 ]
840
841 # Calls to verify branch point is ancestor
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000842 calls += cls._gerrit_ensure_auth_calls(
843 issue=issue, short_hostname=short_hostname)
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100844
845 if issue:
846 calls += [
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000847 (('GetChangeDetail', '%s-review.googlesource.com' % short_hostname,
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +0000848 'my%2Frepo~123456',
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +0000849 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS']
850 ),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100851 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100852 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100853 'change_id': '123456789',
854 'current_revision': 'sha1_of_current_revision',
855 'revisions': { 'sha1_of_current_revision': {
856 'commit': {'message': fetched_description},
857 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100858 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100859 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100860 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100861 if fetched_status == 'ABANDONED':
862 calls += [
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000863 (('DieWithError', 'Change https://%s-review.googlesource.com/'
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100864 '123456 has been abandoned, new uploads are not '
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000865 'allowed' % short_hostname), SystemExitMock()),
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100866 ]
867 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100868 if other_cl_owner:
869 calls += [
870 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
871 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100872
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200873 calls += cls._git_sanity_checks(ancestor_revision, 'master',
874 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100875 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200876 ((['git', 'rev-parse', '--show-cdup'],), ''),
877 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000878
Aaron Gable7817f022017-12-12 09:43:17 -0800879 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
880 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200881 'M\t.gitignore\n'),
882 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100883 ]
884
885 if not issue:
886 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200887 ((['git', 'log', '--pretty=format:%s%n%n%b',
888 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000889 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100890 ]
891
892 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200893 ((['git', 'config', 'user.email'],), 'me@example.com'),
894 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
895 ([custom_cl_base] if custom_cl_base else
896 [ancestor_revision, 'HEAD']),),
897 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100898 ]
899 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +0000900
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000901 @classmethod
902 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700903 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000904 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -0700905 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +0100906 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000907 custom_cl_base=None, tbr=None,
908 short_hostname='chromium'):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000909 if post_amend_description is None:
910 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -0700911 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200912 # Determined in `_gerrit_base_calls`.
913 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
914
915 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000916
tandriia60502f2016-06-20 02:01:53 -0700917 if squash_mode == 'default':
918 calls.extend([
919 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
920 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
921 ])
922 elif squash_mode in ('override_squash', 'override_nosquash'):
923 calls.extend([
924 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
925 'true' if squash_mode == 'override_squash' else 'false'),
926 ])
927 else:
928 assert squash_mode in ('squash', 'nosquash')
929
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000930 # If issue is given, then description is fetched from Gerrit instead.
931 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000932 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200933 ((['git', 'log', '--pretty=format:%s\n\n%b',
934 ((custom_cl_base + '..') if custom_cl_base else
935 'fake_ancestor_sha..HEAD')],),
936 description),
937 ]
Aaron Gableb56ad332017-01-06 15:24:31 -0800938 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000939 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -0800940 else:
941 if not title:
942 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200943 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
944 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -0800945 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000946 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000947 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000948 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200949 (('DownloadGerritHook', False), ''),
950 # Amending of commit message to get the Change-Id.
951 ((['git', 'log', '--pretty=format:%s\n\n%b',
952 determined_ancestor_revision + '..HEAD'],),
953 description),
954 ((['git', 'commit', '--amend', '-m', description],), ''),
955 ((['git', 'log', '--pretty=format:%s\n\n%b',
956 determined_ancestor_revision + '..HEAD'],),
957 post_amend_description)
958 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000959 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000960 if not issue:
961 # Prompting to edit description on first upload.
962 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200963 ((['git', 'config', 'core.editor'],), ''),
964 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000965 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000966 ref_to_push = 'abcdef0123456789'
967 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200968 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
969 ((['git', 'config', 'branch.master.remote'],), 'origin'),
970 ]
971
972 if custom_cl_base is None:
973 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000974 ((['get_or_create_merge_base', 'master',
975 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000976 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200977 ]
978 parent = 'origin/master'
979 else:
980 calls += [
981 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
982 'refs/remotes/origin/master'],),
983 callError(1)), # Means not ancenstor.
984 (('ask_for_data',
985 'Do you take responsibility for cleaning up potential mess '
986 'resulting from proceeding with upload? Press Enter to upload, '
987 'or Ctrl+C to abort'), ''),
988 ]
989 parent = custom_cl_base
990
991 calls += [
992 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
993 '0123456789abcdef'),
994 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -0700995 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200996 ref_to_push),
997 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000998 else:
999 ref_to_push = 'HEAD'
1000
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001001 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00001002 (('SaveDescriptionBackup',), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001003 ((['git', 'rev-list',
1004 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1005 ref_to_push],),
1006 '1hashPerLine\n'),
1007 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001008
Aaron Gableafd52772017-06-27 16:40:10 -07001009 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001010 ref_suffix = '%ready,notify=ALL'
1011 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001012 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001013 ref_suffix = '%wip'
1014 else:
1015 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001016
Aaron Gable70f4e242017-06-26 10:45:59 -07001017 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001018 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001019
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001020 calls += [
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +00001021 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001022 ]
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001023 if short_hostname == 'chromium':
1024 # All reviwers and ccs get into ref_suffix.
1025 for r in sorted(reviewers):
1026 ref_suffix += ',r=%s' % r
1027 for c in sorted(['chromium-reviews+test-more-cc@chromium.org',
1028 'joe@example.com'] + cc):
1029 ref_suffix += ',cc=%s' % c
1030 reviewers, cc = [], []
1031 else:
1032 # TODO(crbug/877717): remove this case.
1033 calls += [
1034 (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
1035 sorted(reviewers) + ['joe@example.com',
1036 'chromium-reviews+test-more-cc@chromium.org'] + cc),
1037 {
1038 e: {'email': e}
1039 for e in (reviewers + ['joe@example.com'] + cc)
1040 })
1041 ]
1042 for r in sorted(reviewers):
1043 if r != 'bad-account-or-email':
1044 ref_suffix += ',r=%s' % r
1045 reviewers.remove(r)
1046 for c in sorted(['joe@example.com'] + cc):
1047 ref_suffix += ',cc=%s' % c
1048 if c in cc:
1049 cc.remove(c)
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001050
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001051 calls.append((
1052 (['git', 'push',
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001053 'https://%s.googlesource.com/my/repo' % short_hostname,
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001054 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001055 (('remote:\n'
1056 'remote: Processing changes: (\)\n'
1057 'remote: Processing changes: (|)\n'
1058 'remote: Processing changes: (/)\n'
1059 'remote: Processing changes: (-)\n'
1060 'remote: Processing changes: new: 1 (/)\n'
1061 'remote: Processing changes: new: 1, done\n'
1062 'remote:\n'
1063 'remote: New Changes:\n'
1064 'remote: https://%s-review.googlesource.com/#/c/my/repo/+/123456'
1065 ' XXX\n'
1066 'remote:\n'
1067 'To https://%s.googlesource.com/my/repo\n'
1068 ' * [new branch] hhhh -> refs/for/refs/heads/master\n'
1069 ) % (short_hostname, short_hostname))
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001070 ))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001071 if squash:
1072 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001073 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001074 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001075 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001076 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001077 ((['git', 'config', 'branch.master.gerritsquashhash',
1078 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001079 ]
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001080 # TODO(crbug/877717): this should never be used.
1081 if squash and short_hostname != 'chromium':
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001082 calls += [
1083 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001084 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001085 sorted(reviewers),
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00001086 cc + ['chromium-reviews+test-more-cc@chromium.org'],
1087 notify),
1088 ''),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001089 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001090 if tbr:
1091 calls += [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001092 (('GetChangeDetail', 'chromium-review.googlesource.com',
1093 'my%2Frepo~123456', ['LABELS']), {
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001094 'labels': {
1095 'Code-Review': {
1096 'default_value': 0,
1097 'all': [],
1098 'values': {
1099 '+2': 'lgtm, approved',
1100 '+1': 'lgtm, but someone else must approve',
1101 ' 0': 'No score',
1102 '-1': 'Don\'t submit as-is',
1103 }
1104 }
1105 }
1106 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001107 (('SetReview',
1108 'chromium-review.googlesource.com',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001109 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001110 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001111 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001112 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001113 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001114 return calls
1115
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001116 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001117 self,
1118 upload_args,
1119 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001120 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001121 squash=True,
1122 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001123 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001124 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001125 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001126 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001127 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001128 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001129 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001130 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001131 custom_cl_base=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001132 tbr=None,
1133 short_hostname='chromium'):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001134 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001135 if squash_mode is None:
1136 if '--no-squash' in upload_args:
1137 squash_mode = 'nosquash'
1138 elif '--squash' in upload_args:
1139 squash_mode = 'squash'
1140 else:
1141 squash_mode = 'default'
1142
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001143 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001144 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001145 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001146 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001147 CookiesAuthenticatorMockFactory(
1148 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001149 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1150 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001151 self.mock(git_cl.gclient_utils, 'RunEditor',
1152 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001153 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1154 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001155
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001156 self.calls = self._gerrit_base_calls(
1157 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001158 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001159 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001160 other_cl_owner=other_cl_owner,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001161 custom_cl_base=custom_cl_base,
1162 short_hostname=short_hostname)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001163 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001164 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1165 expected_content=description))
1166 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001167 self.calls += self._gerrit_upload_calls(
1168 description, reviewers, squash,
1169 squash_mode=squash_mode,
1170 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001171 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001172 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001173 issue=issue, cc=cc,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001174 custom_cl_base=custom_cl_base, tbr=tbr,
1175 short_hostname=short_hostname)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001176 # Uncomment when debugging.
1177 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001178 git_cl.main(['upload'] + upload_args)
1179
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001180 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001181 self._run_gerrit_upload_test(
1182 ['--no-squash'],
1183 'desc\n\nBUG=\n',
1184 [],
1185 squash=False,
1186 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1187
1188 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001189 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001190 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001191 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001192 [],
tandriia60502f2016-06-20 02:01:53 -07001193 squash=False,
1194 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001195 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001196
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001197 def test_gerrit_no_reviewer(self):
1198 self._run_gerrit_upload_test(
1199 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001200 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001201 [],
1202 squash=False,
1203 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001204
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001205 def test_gerrit_no_reviewer_non_chromium_host(self):
1206 # TODO(crbug/877717): remove this test case.
1207 self._run_gerrit_upload_test(
1208 [],
1209 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
1210 [],
1211 squash=False,
1212 squash_mode='override_nosquash',
1213 short_hostname='other')
1214
Nick Carter8692b182017-11-06 16:30:38 -08001215 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001216 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1217 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001218 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001219 'desc\n\nBUG=\n\nChange-Id: I123456789',
1220 squash=False,
1221 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001222 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001223
ukai@chromium.orge8077812012-02-03 03:41:46 +00001224 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001225 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001226 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001227 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001228 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001229 squash=False,
1230 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001231 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001232
1233 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001234 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001235 [],
bradnelsond975b302016-10-23 12:20:23 -07001236 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1237 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001238 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001239 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001240 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001241 cc=['more@example.com', 'people@example.com'],
1242 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001243
1244 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001245 self._run_gerrit_upload_test(
1246 [],
1247 'desc\nBUG=\n\nChange-Id: 123456789',
1248 [],
1249 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001250
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001251 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001252 self._run_gerrit_upload_test(
1253 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001254 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001255 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001256 squash=True,
1257 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001258
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001259 def test_gerrit_upload_squash_first_against_rev(self):
1260 custom_cl_base = 'custom_cl_base_rev_or_branch'
1261 self._run_gerrit_upload_test(
1262 ['--squash', custom_cl_base],
1263 'desc\nBUG=\n\nChange-Id: 123456789',
1264 [],
1265 squash=True,
1266 expected_upstream_ref='origin/master',
1267 custom_cl_base=custom_cl_base)
1268 self.assertIn(
1269 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1270 sys.stdout.getvalue())
1271
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001272 def test_gerrit_upload_squash_reupload(self):
1273 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001274 self._run_gerrit_upload_test(
1275 ['--squash'],
1276 description,
1277 [],
1278 squash=True,
1279 expected_upstream_ref='origin/master',
1280 issue=123456)
1281
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001282 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1283 self.mock(git_cl, 'DieWithError',
1284 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1285 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1286 with self.assertRaises(SystemExitMock):
1287 self._run_gerrit_upload_test(
1288 ['--squash'],
1289 description,
1290 [],
1291 squash=True,
1292 expected_upstream_ref='origin/master',
1293 issue=123456,
1294 fetched_status='ABANDONED')
1295
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001296 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1297 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1298 lambda *_, **__: {'email': 'yet-another@example.com'})
1299 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1300 self._run_gerrit_upload_test(
1301 ['--squash'],
1302 description,
1303 [],
1304 squash=True,
1305 expected_upstream_ref='origin/master',
1306 issue=123456,
1307 other_cl_owner='other@example.com')
1308 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001309 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001310 'authenticate to Gerrit as yet-another@example.com.\n'
1311 'Uploading may fail due to lack of permissions',
1312 git_cl.sys.stdout.getvalue())
1313
rmistry@google.com2dd99862015-06-22 12:22:18 +00001314 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001315 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001316 def mock_run_git(*args, **_kwargs):
1317 if args[0] == ['for-each-ref',
1318 '--format=%(refname:short) %(upstream:short)',
1319 'refs/heads']:
1320 # Create a local branch dependency tree that looks like this:
1321 # test1 -> test2 -> test3 -> test4 -> test5
1322 # -> test3.1
1323 # test6 -> test0
1324 branch_deps = [
1325 'test2 test1', # test1 -> test2
1326 'test3 test2', # test2 -> test3
1327 'test3.1 test2', # test2 -> test3.1
1328 'test4 test3', # test3 -> test4
1329 'test5 test4', # test4 -> test5
1330 'test6 test0', # test0 -> test6
1331 'test7', # test7
1332 ]
1333 return '\n'.join(branch_deps)
1334 self.mock(git_cl, 'RunGit', mock_run_git)
1335
1336 class RecordCalls:
1337 times_called = 0
1338 record_calls = RecordCalls()
1339 def mock_CMDupload(*args, **_kwargs):
1340 record_calls.times_called += 1
1341 return 0
1342 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1343
1344 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001345 (('ask_for_data', 'This command will checkout all dependent branches '
1346 'and run "git cl upload". Press Enter to continue, '
1347 'or Ctrl+C to abort'), ''),
1348 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001349
1350 class MockChangelist():
1351 def __init__(self):
1352 pass
1353 def GetBranch(self):
1354 return 'test1'
1355 def GetIssue(self):
1356 return '123'
1357 def GetPatchset(self):
1358 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001359 def IsGerrit(self):
1360 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001361
1362 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1363 # CMDupload should have been called 5 times because of 5 dependent branches.
1364 self.assertEquals(5, record_calls.times_called)
1365 self.assertEquals(0, ret)
1366
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001367 def test_gerrit_change_id(self):
1368 self.calls = [
1369 ((['git', 'write-tree'], ),
1370 'hashtree'),
1371 ((['git', 'rev-parse', 'HEAD~0'], ),
1372 'branch-parent'),
1373 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1374 'A B <a@b.org> 1456848326 +0100'),
1375 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1376 'C D <c@d.org> 1456858326 +0100'),
1377 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1378 'hashchange'),
1379 ]
1380 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1381 self.assertEqual(change_id, 'Ihashchange')
1382
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001383 def test_desecription_append_footer(self):
1384 for init_desc, footer_line, expected_desc in [
1385 # Use unique desc first lines for easy test failure identification.
1386 ('foo', 'R=one', 'foo\n\nR=one'),
1387 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1388 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1389 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1390 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1391 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1392 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1393 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1394 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1395 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1396 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1397 ]:
1398 desc = git_cl.ChangeDescription(init_desc)
1399 desc.append_footer(footer_line)
1400 self.assertEqual(desc.description, expected_desc)
1401
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001402 def test_update_reviewers(self):
1403 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001404 ('foo', [], [],
1405 'foo'),
1406 ('foo\nR=xx', [], [],
1407 'foo\nR=xx'),
1408 ('foo\nTBR=xx', [], [],
1409 'foo\nTBR=xx'),
1410 ('foo', ['a@c'], [],
1411 'foo\n\nR=a@c'),
1412 ('foo\nR=xx', ['a@c'], [],
1413 'foo\n\nR=a@c, xx'),
1414 ('foo\nTBR=xx', ['a@c'], [],
1415 'foo\n\nR=a@c\nTBR=xx'),
1416 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1417 'foo\n\nR=a@c, yy\nTBR=xx'),
1418 ('foo\nBUG=', ['a@c'], [],
1419 'foo\nBUG=\nR=a@c'),
1420 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1421 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1422 ('foo', ['a@c', 'b@c'], [],
1423 'foo\n\nR=a@c, b@c'),
1424 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1425 'foo\nBar\n\nR=c@c\nBUG='),
1426 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1427 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001428 # Same as the line before, but full of whitespaces.
1429 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001430 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001431 'foo\nBar\n\nR=c@c\n BUG =',
1432 ),
1433 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001434 ('foo BUG=allo R=joe ', ['c@c'], [],
1435 'foo BUG=allo R=joe\n\nR=c@c'),
1436 # Redundant TBRs get promoted to Rs
1437 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1438 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001439 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001440 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001441 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001442 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001443 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001444 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001445 actual.append(obj.description)
1446 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001447
Nodir Turakulov23b82142017-11-16 11:04:25 -08001448 def test_get_hash_tags(self):
1449 cases = [
1450 ('', []),
1451 ('a', []),
1452 ('[a]', ['a']),
1453 ('[aa]', ['aa']),
1454 ('[a ]', ['a']),
1455 ('[a- ]', ['a']),
1456 ('[a- b]', ['a-b']),
1457 ('[a--b]', ['a-b']),
1458 ('[a', []),
1459 ('[a]x', ['a']),
1460 ('[aa]x', ['aa']),
1461 ('[a b]', ['a-b']),
1462 ('[a b]', ['a-b']),
1463 ('[a__b]', ['a-b']),
1464 ('[a] x', ['a']),
1465 ('[a][b]', ['a', 'b']),
1466 ('[a] [b]', ['a', 'b']),
1467 ('[a][b]x', ['a', 'b']),
1468 ('[a][b] x', ['a', 'b']),
1469 ('[a]\n[b]', ['a']),
1470 ('[a\nb]', []),
1471 ('[a][', ['a']),
1472 ('Revert "[a] feature"', ['a']),
1473 ('Reland "[a] feature"', ['a']),
1474 ('Revert: [a] feature', ['a']),
1475 ('Reland: [a] feature', ['a']),
1476 ('Revert "Reland: [a] feature"', ['a']),
1477 ('Foo: feature', ['foo']),
1478 ('Foo Bar: feature', ['foo-bar']),
1479 ('Revert "Foo bar: feature"', ['foo-bar']),
1480 ('Reland "Foo bar: feature"', ['foo-bar']),
1481 ]
1482 for desc, expected in cases:
1483 change_desc = git_cl.ChangeDescription(desc)
1484 actual = change_desc.get_hash_tags()
1485 self.assertEqual(
1486 actual,
1487 expected,
1488 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1489
wittman@chromium.org455dc922015-01-26 20:15:50 +00001490 def test_get_target_ref(self):
1491 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001492 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001493 self.assertEqual(None, git_cl.GetTargetRef(None,
1494 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001495 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001496
wittman@chromium.org455dc922015-01-26 20:15:50 +00001497 # Check default target refs for branches.
1498 self.assertEqual('refs/heads/master',
1499 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001500 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001501 self.assertEqual('refs/heads/master',
1502 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001503 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001504 self.assertEqual('refs/heads/master',
1505 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001506 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001507 self.assertEqual('refs/branch-heads/123',
1508 git_cl.GetTargetRef('origin',
1509 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001510 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001511 self.assertEqual('refs/diff/test',
1512 git_cl.GetTargetRef('origin',
1513 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001514 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001515 self.assertEqual('refs/heads/chrome/m42',
1516 git_cl.GetTargetRef('origin',
1517 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001518 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001519
1520 # Check target refs for user-specified target branch.
1521 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1522 'refs/remotes/branch-heads/123'):
1523 self.assertEqual('refs/branch-heads/123',
1524 git_cl.GetTargetRef('origin',
1525 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001526 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001527 for branch in ('origin/master', 'remotes/origin/master',
1528 'refs/remotes/origin/master'):
1529 self.assertEqual('refs/heads/master',
1530 git_cl.GetTargetRef('origin',
1531 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001532 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001533 for branch in ('master', 'heads/master', 'refs/heads/master'):
1534 self.assertEqual('refs/heads/master',
1535 git_cl.GetTargetRef('origin',
1536 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001537 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001538
wychen@chromium.orga872e752015-04-28 23:42:18 +00001539 def test_patch_when_dirty(self):
1540 # Patch when local tree is dirty
1541 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1542 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1543
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001544 @staticmethod
1545 def _get_gerrit_codereview_server_calls(branch, value=None,
1546 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001547 detect_branch=True,
1548 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001549 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1550
1551 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1552 """
1553 calls = []
1554 if detect_branch:
1555 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001556 if detect_server:
1557 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1558 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001559 if value is None:
1560 calls += [
1561 ((['git', 'config', 'branch.' + branch + '.merge'],),
1562 'refs/heads' + branch),
1563 ((['git', 'config', 'branch.' + branch + '.remote'],),
1564 'origin'),
1565 ((['git', 'config', 'remote.origin.url'],),
1566 'https://%s.googlesource.com/my/repo' % git_short_host),
1567 ]
1568 return calls
1569
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001570 def _patch_common(self, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001571 new_branch=False, git_short_host='host',
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001572 detect_gerrit_server=False,
1573 actual_codereview=None,
1574 codereview_in_url=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001575 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001576 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1577 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001578 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001579 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001580 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1581
tandriidf09a462016-08-18 16:23:55 -07001582 if new_branch:
1583 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001584
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001585 if codereview_in_url and actual_codereview == 'rietveld':
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001586 self.calls += [
1587 ((['git', 'rev-parse', '--show-cdup'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001588 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001589 ]
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001590
1591 if not force_codereview and not codereview_in_url:
1592 # These calls detect codereview to use.
1593 self.calls += [
1594 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1595 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1596 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1597 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1598 ((['git', 'config', 'gerrit.host'],), 'true'),
1599 ]
1600 if detect_gerrit_server:
1601 self.calls += self._get_gerrit_codereview_server_calls(
1602 'master', git_short_host=git_short_host,
1603 detect_branch=not new_branch and force_codereview)
1604 actual_codereview = 'gerrit'
1605
1606 if actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001607 self.calls += [
1608 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001609 'my%2Frepo~123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001610 {
1611 'current_revision': '7777777777',
1612 'revisions': {
1613 '1111111111': {
1614 '_number': 1,
1615 'fetch': {'http': {
1616 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1617 'ref': 'refs/changes/56/123456/1',
1618 }},
1619 },
1620 '7777777777': {
1621 '_number': 7,
1622 'fetch': {'http': {
1623 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1624 'ref': 'refs/changes/56/123456/7',
1625 }},
1626 },
1627 },
1628 }),
1629 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001630
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001631 def test_patch_gerrit_default(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001632 self._patch_common(git_short_host='chromium', detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001633 self.calls += [
1634 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1635 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001636 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001637 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001638 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001639 ((['git', 'config', 'branch.master.gerritserver',
1640 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001641 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001642 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1643 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1644 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001645 ]
1646 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1647
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001648 def test_patch_gerrit_new_branch(self):
1649 self._patch_common(
1650 git_short_host='chromium', detect_gerrit_server=True, new_branch=True)
1651 self.calls += [
1652 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1653 'refs/changes/56/123456/7'],), ''),
1654 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1655 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1656 ''),
1657 ((['git', 'config', 'branch.master.gerritserver',
1658 'https://chromium-review.googlesource.com'],), ''),
1659 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1660 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1661 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1662 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1663 ]
1664 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1665
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001666 def test_patch_gerrit_force(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001667 self._patch_common(
1668 force_codereview=True, git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001669 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001670 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001671 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001672 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001673 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001674 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001675 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001676 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001677 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001678 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1679 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1680 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001681 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001682 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001683
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001684 def test_patch_gerrit_guess_by_url(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001685 self.calls += self._get_gerrit_codereview_server_calls(
1686 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001687 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001688 actual_codereview='gerrit', git_short_host='else',
1689 codereview_in_url=True, detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001690 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001691 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001692 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001693 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001694 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001695 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001696 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001697 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001698 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001699 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1700 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1701 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001702 ]
1703 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001704 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001705
Aaron Gable697a91b2018-01-19 15:20:15 -08001706 def test_patch_gerrit_guess_by_url_with_repo(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001707 self.calls += self._get_gerrit_codereview_server_calls(
1708 'master', git_short_host='else', detect_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001709 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001710 actual_codereview='gerrit', git_short_host='else',
1711 codereview_in_url=True, detect_gerrit_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001712 self.calls += [
1713 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1714 'refs/changes/56/123456/1'],), ''),
1715 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1716 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1717 ''),
1718 ((['git', 'config', 'branch.master.gerritserver',
1719 'https://else-review.googlesource.com'],), ''),
1720 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1721 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1722 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1723 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1724 ]
1725 self.assertEqual(git_cl.main(
1726 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1727 0)
1728
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001729 def test_patch_gerrit_conflict(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001730 self._patch_common(detect_gerrit_server=True, git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001731 self.calls += [
1732 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001733 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001734 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1735 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1736 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001737 ]
1738 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001739 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001740
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001741 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001742 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001743 raise git_cl.gerrit_util.GerritError(404, '')
1744 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1745
tandriic2405f52016-10-10 08:13:15 -07001746 self.calls = [
1747 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07001748 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1749 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1750 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1751 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001752 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
1753 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1754 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1755 ((['git', 'config', 'remote.origin.url'],),
1756 'https://chromium.googlesource.com/my/repo'),
1757 ((['DieWithError',
1758 'change 123456 at https://chromium-review.googlesource.com does not '
1759 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07001760 ]
1761 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001762 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07001763
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001764 def _checkout_calls(self):
1765 return [
1766 ((['git', 'config', '--local', '--get-regexp',
1767 'branch\\..*\\.rietveldissue'], ),
1768 ('branch.retrying.rietveldissue 1111111111\n'
1769 'branch.some-fix.rietveldissue 2222222222\n')),
1770 ((['git', 'config', '--local', '--get-regexp',
1771 'branch\\..*\\.gerritissue'], ),
1772 ('branch.ger-branch.gerritissue 123456\n'
1773 'branch.gbranch654.gerritissue 654321\n')),
1774 ]
1775
1776 def test_checkout_gerrit(self):
1777 """Tests git cl checkout <issue>."""
1778 self.calls = self._checkout_calls()
1779 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1780 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1781
1782 def test_checkout_rietveld(self):
1783 """Tests git cl checkout <issue>."""
1784 self.calls = self._checkout_calls()
1785 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1786 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1787
1788 def test_checkout_not_found(self):
1789 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001790 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001791 self.calls = self._checkout_calls()
1792 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1793
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001794 def test_checkout_no_branch_issues(self):
1795 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001796 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001797 self.calls = [
1798 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001799 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001800 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001801 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001802 ]
1803 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1804
tandrii@chromium.org28253532016-04-14 13:46:56 +00001805 def _test_gerrit_ensure_authenticated_common(self, auth,
1806 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001807 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1808 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1809 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001810 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001811 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001812 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001813 cl.branch = 'master'
1814 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001815 cl.lookedup_issue = True
1816 return cl
1817
1818 def test_gerrit_ensure_authenticated_missing(self):
1819 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001820 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001821 })
1822 self.calls.append(
1823 ((['DieWithError',
1824 'Credentials for the following hosts are required:\n'
1825 ' chromium-review.googlesource.com\n'
1826 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001827 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001828 'https://chromium-review.googlesource.com/new-password'],), ''),)
1829 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1830
1831 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001832 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001833 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001834 'chromium.googlesource.com':
1835 ('git-one.example.com', None, 'secret1'),
1836 'chromium-review.googlesource.com':
1837 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001838 })
1839 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001840 (('ask_for_data', 'If you know what you are doing '
1841 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001842 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1843
1844 def test_gerrit_ensure_authenticated_ok(self):
1845 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001846 'chromium.googlesource.com':
1847 ('git-same.example.com', None, 'secret'),
1848 'chromium-review.googlesource.com':
1849 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001850 })
1851 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1852
tandrii@chromium.org28253532016-04-14 13:46:56 +00001853 def test_gerrit_ensure_authenticated_skipped(self):
1854 cl = self._test_gerrit_ensure_authenticated_common(
1855 auth={}, skip_auth_check=True)
1856 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1857
Eric Boren2fb63102018-10-05 13:05:03 +00001858 def test_gerrit_ensure_authenticated_bearer_token(self):
1859 cl = self._test_gerrit_ensure_authenticated_common(auth={
1860 'chromium.googlesource.com':
1861 ('', None, 'secret'),
1862 'chromium-review.googlesource.com':
1863 ('', None, 'secret'),
1864 })
1865 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1866 header = gerrit_util.CookiesAuthenticator().get_auth_header(
1867 'chromium.googlesource.com')
1868 self.assertTrue('Bearer' in header)
1869
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001870 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001871 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001872 lambda h, i, labels, notify=None:
1873 self._mocked_call(['SetReview', h, i, labels, notify]))
1874
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001875 self.calls = [
1876 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001877 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1878 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001879 ((['git', 'config', 'branch.feature.gerritserver'],),
1880 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001881 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1882 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1883 ((['git', 'config', 'remote.origin.url'],),
1884 'https://chromium.googlesource.com/infra/infra.git'),
1885 ((['SetReview', 'chromium-review.googlesource.com',
1886 'infra%2Finfra~123',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001887 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001888 ]
tandriid9e5ce52016-07-13 02:32:59 -07001889
1890 def test_cmd_set_commit_gerrit_clear(self):
1891 self._cmd_set_commit_gerrit_common(0)
1892 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1893
1894 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07001895 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001896 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1897
tandriid9e5ce52016-07-13 02:32:59 -07001898 def test_cmd_set_commit_gerrit(self):
1899 self._cmd_set_commit_gerrit_common(2)
1900 self.assertEqual(0, git_cl.main(['set-commit']))
1901
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001902 def test_description_display(self):
1903 out = StringIO.StringIO()
1904 self.mock(git_cl.sys, 'stdout', out)
1905
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001906 self.mock(git_cl, 'Changelist', ChangelistMock)
1907 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001908
1909 self.assertEqual(0, git_cl.main(['description', '-d']))
1910 self.assertEqual('foo\n', out.getvalue())
1911
iannucci3c972b92016-08-17 13:24:10 -07001912 def test_StatusFieldOverrideIssueMissingArgs(self):
1913 out = StringIO.StringIO()
1914 self.mock(git_cl.sys, 'stderr', out)
1915
1916 try:
1917 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1918 except SystemExit as ex:
1919 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001920 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001921
1922 out = StringIO.StringIO()
1923 self.mock(git_cl.sys, 'stderr', out)
1924
1925 try:
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00001926 self.assertEqual(git_cl.main(['status', '--issue', '1', '--gerrit']), 0)
iannucci3c972b92016-08-17 13:24:10 -07001927 except SystemExit as ex:
1928 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001929 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001930
1931 def test_StatusFieldOverrideIssue(self):
1932 out = StringIO.StringIO()
1933 self.mock(git_cl.sys, 'stdout', out)
1934
1935 def assertIssue(cl_self, *_args):
1936 self.assertEquals(cl_self.issue, 1)
1937 return 'foobar'
1938
1939 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
iannuccie53c9352016-08-17 14:40:40 -07001940 self.assertEqual(
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00001941 git_cl.main(['status', '--issue', '1', '--gerrit', '--field', 'desc']),
iannuccie53c9352016-08-17 14:40:40 -07001942 0)
iannucci3c972b92016-08-17 13:24:10 -07001943 self.assertEqual(out.getvalue(), 'foobar\n')
1944
iannuccie53c9352016-08-17 14:40:40 -07001945 def test_SetCloseOverrideIssue(self):
1946 def assertIssue(cl_self, *_args):
1947 self.assertEquals(cl_self.issue, 1)
1948 return 'foobar'
1949
1950 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1951 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
iannuccie53c9352016-08-17 14:40:40 -07001952 self.assertEqual(
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00001953 git_cl.main(['set-close', '--issue', '1', '--gerrit']), 0)
iannuccie53c9352016-08-17 14:40:40 -07001954
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00001955 def test_description(self):
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001956 out = StringIO.StringIO()
1957 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001958 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001959 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1960 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1961 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1962 ((['git', 'config', 'remote.origin.url'],),
1963 'https://chromium.googlesource.com/my/repo'),
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00001964 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001965 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001966 {
1967 'current_revision': 'sha1',
1968 'revisions': {'sha1': {
1969 'commit': {'message': 'foobar'},
1970 }},
1971 }),
1972 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001973 self.assertEqual(0, git_cl.main([
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00001974 'description',
1975 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
1976 '-d']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001977 self.assertEqual('foobar\n', out.getvalue())
1978
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001979 def test_description_set_raw(self):
1980 out = StringIO.StringIO()
1981 self.mock(git_cl.sys, 'stdout', out)
1982
1983 self.mock(git_cl, 'Changelist', ChangelistMock)
1984 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1985
1986 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1987 self.assertEqual('hihi', ChangelistMock.desc)
1988
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001989 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001990 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001991
1992 def RunEditor(desc, _, **kwargs):
1993 self.assertEquals(
1994 '# Enter a description of the change.\n'
1995 '# This will be displayed on the codereview site.\n'
1996 '# The first line will also be used as the subject of the review.\n'
1997 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001998 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07001999 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002000 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002001 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002002 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002003
dsansomee2d6fd92016-09-08 00:10:47 -07002004 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002005 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002006
2007 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2008 self.mock(git_cl.Changelist, 'GetDescription',
2009 lambda *args: current_desc)
2010 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2011 UpdateDescriptionRemote)
2012 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2013
2014 self.calls = [
2015 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002016 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002017 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2018 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002019 ((['git', 'config', 'core.editor'],), 'vi'),
2020 ]
2021 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2022
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002023 def test_description_set_stdin(self):
2024 out = StringIO.StringIO()
2025 self.mock(git_cl.sys, 'stdout', out)
2026
2027 self.mock(git_cl, 'Changelist', ChangelistMock)
2028 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2029
2030 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2031 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2032
kmarshall3bff56b2016-06-06 18:31:47 -07002033 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002034 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2035
kmarshall3bff56b2016-06-06 18:31:47 -07002036 self.calls = \
2037 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2038 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002039 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002040 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2041 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002042 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2043 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2044 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002045 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2046 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2047 ((['git', 'branch', '-D', 'foo'],), '')]
2048
kmarshall3bff56b2016-06-06 18:31:47 -07002049 self.mock(git_cl, 'get_cl_statuses',
2050 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002051 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2052 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2053 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002054
2055 self.assertEqual(0, git_cl.main(['archive', '-f']))
2056
2057 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002058 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002059 self.calls = \
2060 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2061 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002062 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002063 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2064 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002065 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2066
kmarshall9249e012016-08-23 12:02:16 -07002067 self.mock(git_cl, 'get_cl_statuses',
2068 lambda branches, fine_grained, max_processes:
2069 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2070
2071 self.assertEqual(1, git_cl.main(['archive', '-f']))
2072
2073 def test_archive_dry_run(self):
2074 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2075
2076 self.calls = \
2077 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2078 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2079 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2080 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2081 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2082 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2083 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2084 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2085 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002086
2087 self.mock(git_cl, 'get_cl_statuses',
2088 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002089 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2090 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2091 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002092
kmarshall9249e012016-08-23 12:02:16 -07002093 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2094
2095 def test_archive_no_tags(self):
2096 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2097
2098 self.calls = \
2099 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2100 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2101 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2102 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2103 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2104 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2105 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2106 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2107 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2108 ((['git', 'branch', '-D', 'foo'],), '')]
2109
2110 self.mock(git_cl, 'get_cl_statuses',
2111 lambda branches, fine_grained, max_processes:
2112 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2113 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2114 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2115
2116 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002117
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002118 def test_cmd_issue_erase_existing(self):
2119 out = StringIO.StringIO()
2120 self.mock(git_cl.sys, 'stdout', out)
2121 self.calls = [
2122 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002123 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2124 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002125 # Let this command raise exception (retcode=1) - it should be ignored.
2126 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002127 CERR1),
2128 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2129 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002130 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2131 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2132 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002133 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002134 ]
2135 self.assertEqual(0, git_cl.main(['issue', '0']))
2136
Aaron Gable400e9892017-07-12 15:31:21 -07002137 def test_cmd_issue_erase_existing_with_change_id(self):
2138 out = StringIO.StringIO()
2139 self.mock(git_cl.sys, 'stdout', out)
2140 self.mock(git_cl.Changelist, 'GetDescription',
2141 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2142 self.calls = [
2143 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2144 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2145 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002146 # Let this command raise exception (retcode=1) - it should be ignored.
2147 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2148 CERR1),
2149 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2150 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2151 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2152 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2153 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002154 ((['git', 'log', '-1', '--format=%B'],),
2155 'This is a description\n\nChange-Id: Ideadbeef'),
2156 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002157 ]
2158 self.assertEqual(0, git_cl.main(['issue', '0']))
2159
phajdan.jre328cf92016-08-22 04:12:17 -07002160 def test_cmd_issue_json(self):
2161 out = StringIO.StringIO()
2162 self.mock(git_cl.sys, 'stdout', out)
2163 self.calls = [
2164 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002165 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002166 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2167 ((['git', 'config', 'rietveld.server'],),
2168 'https://codereview.chromium.org'),
2169 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2170 (('write_json', 'output.json',
2171 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2172 ''),
2173 ]
2174 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2175
tandrii8c5a3532016-11-04 07:52:02 -07002176 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2177 self.mock(git_cl.Changelist, 'GetChange',
2178 lambda _, *a: (
2179 self._mocked_call(['GetChange']+list(a))))
2180 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2181 lambda *_, **__: (
2182 self._mocked_call(['DoGetTryMasters'])))
2183 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2184 lambda _, s: self._mocked_call(['SetCQState', s]))
2185
tandrii8c5a3532016-11-04 07:52:02 -07002186 self.calls = [
2187 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2188 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2189 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2190 ((['git', 'config', 'branch.feature.gerritserver'],),
2191 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002192 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2193 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2194 ((['git', 'config', 'remote.origin.url'],),
2195 'https://chromium.googlesource.com/depot_tools'),
2196 (('GetChangeDetail', 'chromium-review.googlesource.com',
2197 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002198 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2199 'project': 'depot_tools',
2200 'status': 'OPEN',
2201 'owner': {'email': 'owner@e.mail'},
2202 'revisions': {
2203 'deadbeaf': {
2204 '_number': 6,
2205 },
2206 'beeeeeef': {
2207 '_number': 7,
2208 'fetch': {'http': {
2209 'url': 'https://chromium.googlesource.com/depot_tools',
2210 'ref': 'refs/changes/56/123456/7'
2211 }},
2212 },
2213 },
2214 }),
tandrii8c5a3532016-11-04 07:52:02 -07002215 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2216 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2217 ((['get_or_create_merge_base', 'feature', 'feature'],),
2218 'fake_ancestor_sha'),
2219 ((['GetChange', 'fake_ancestor_sha', None], ),
2220 git_cl.presubmit_support.GitChange(
2221 '', '', '', '', '', '', '', '')),
2222 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2223 ((['DoGetTryMasters'], ), None),
2224 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2225 ]
2226 out = StringIO.StringIO()
2227 self.mock(git_cl.sys, 'stdout', out)
2228 self.assertEqual(0, git_cl.main(['try']))
2229 self.assertEqual(
2230 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002231 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002232 'https://chromium-review.googlesource.com/123456\n')
2233
tandrii8c5a3532016-11-04 07:52:02 -07002234 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2235 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2236 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2237
tandrii8c5a3532016-11-04 07:52:02 -07002238 self.calls = [
2239 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2240 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2241 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2242 ((['git', 'config', 'branch.feature.gerritserver'],),
2243 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002244 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2245 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2246 ((['git', 'config', 'remote.origin.url'],),
2247 'https://chromium.googlesource.com/depot_tools'),
2248 (('GetChangeDetail', 'chromium-review.googlesource.com',
2249 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002250 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002251 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002252 'status': 'OPEN',
2253 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002254 'revisions': {
2255 'deadbeaf': {
2256 '_number': 6,
2257 },
2258 'beeeeeef': {
2259 '_number': 7,
2260 'fetch': {'http': {
2261 'url': 'https://chromium.googlesource.com/depot_tools',
2262 'ref': 'refs/changes/56/123456/7'
2263 }},
2264 },
2265 },
2266 }),
2267 ]
2268
2269 def _buildbucket_retry(*_, **kw):
2270 # self.maxDiff = 10000
2271 body = json.loads(kw['body'])
2272 self.assertEqual(len(body['builds']), 1)
2273 build = body['builds'][0]
2274 params = json.loads(build.pop('parameters_json'))
2275 self.assertEqual(params, {
2276 u'builder_name': u'win',
2277 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2278 u'revision': None}],
2279 u'properties': {
2280 u'category': u'git_cl_try',
2281 u'key': u'val',
2282 u'json': [{u'a': 1}, None],
tandrii8c5a3532016-11-04 07:52:02 -07002283
2284 u'patch_gerrit_url':
2285 u'https://chromium-review.googlesource.com',
2286 u'patch_issue': 123456,
2287 u'patch_project': u'depot_tools',
2288 u'patch_ref': u'refs/changes/56/123456/7',
2289 u'patch_repository_url':
2290 u'https://chromium.googlesource.com/depot_tools',
2291 u'patch_set': 7,
2292 u'patch_storage': u'gerrit',
2293 }
2294 })
2295 self.assertEqual(build, {
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002296 u'bucket': u'luci.chromium.try',
tandrii8c5a3532016-11-04 07:52:02 -07002297 u'client_operation_id': u'uuid4',
2298 u'tags': [
2299 u'builder:win',
2300 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2301 u'user_agent:git_cl_try',
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002302 ],
tandrii8c5a3532016-11-04 07:52:02 -07002303 })
2304
2305 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2306
2307 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2308 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002309 'try', '-B', 'luci.chromium.try', '-b', 'win',
tandrii8c5a3532016-11-04 07:52:02 -07002310 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2311 self.assertRegexpMatches(
2312 git_cl.sys.stdout.getvalue(),
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002313 'Tried jobs on:\nBucket: luci.chromium.try')
tandriide281ae2016-10-12 06:02:30 -07002314
qyearsley123a4682016-10-26 09:12:17 -07002315 def test_git_cl_try_bots_on_multiple_masters(self):
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00002316 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2317 self.mock(git_cl.Changelist, 'GetChange',
2318 lambda _, *a: (
2319 self._mocked_call(['GetChange']+list(a))))
2320 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2321 lambda *_, **__: (
2322 self._mocked_call(['DoGetTryMasters'])))
2323 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2324 lambda _, s: self._mocked_call(['SetCQState', s]))
2325
qyearsley123a4682016-10-26 09:12:17 -07002326 self.calls = [
2327 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00002328 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2329 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2330 ((['git', 'config', 'branch.feature.gerritserver'],),
2331 'https://chromium-review.googlesource.com'),
2332 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2333 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2334 ((['git', 'config', 'remote.origin.url'],),
2335 'https://chromium.googlesource.com/depot_tools'),
2336 (('GetChangeDetail', 'chromium-review.googlesource.com',
2337 'depot_tools~123456',
2338 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2339 'project': 'depot_tools',
2340 'status': 'OPEN',
2341 'owner': {'email': 'owner@e.mail'},
2342 'revisions': {
2343 'deadbeaf': {
2344 '_number': 6,
2345 },
2346 'beeeeeef': {
2347 '_number': 7,
2348 'fetch': {'http': {
2349 'url': 'https://chromium.googlesource.com/depot_tools',
2350 'ref': 'refs/changes/56/123456/7'
2351 }},
2352 },
2353 },
2354 }),
qyearsley123a4682016-10-26 09:12:17 -07002355 ]
2356
2357 def _buildbucket_retry(*_, **kw):
2358 body = json.loads(kw['body'])
2359 self.assertEqual(len(body['builds']), 2)
2360
Nodir Turakulovb422e682018-02-20 22:51:30 -08002361 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2362 params = json.loads(body['builds'][0]['parameters_json'])
2363 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002364
Nodir Turakulovb422e682018-02-20 22:51:30 -08002365 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2366 params = json.loads(body['builds'][1]['parameters_json'])
2367 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002368
2369 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2370
2371 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002372 json.dumps({
2373 'builder1': {'bucket': 'bucket1'},
2374 'builder2': {'bucket': 'bucket2'},
2375 })))
qyearsley123a4682016-10-26 09:12:17 -07002376
2377 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2378 self.assertEqual(
2379 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2380 self.assertEqual(
2381 git_cl.sys.stdout.getvalue(),
2382 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002383 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002384 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002385 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002386 ' builder2: []\n'
2387 'To see results here, run: git cl try-results\n'
2388 'To see results in browser, run: git cl web\n')
2389
tandrii16e0b4e2016-06-07 10:34:28 -07002390 def _common_GerritCommitMsgHookCheck(self):
2391 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2392 self.mock(git_cl.os.path, 'abspath',
2393 lambda path: self._mocked_call(['abspath', path]))
2394 self.mock(git_cl.os.path, 'exists',
2395 lambda path: self._mocked_call(['exists', path]))
2396 self.mock(git_cl.gclient_utils, 'FileRead',
2397 lambda path: self._mocked_call(['FileRead', path]))
2398 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2399 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2400 self.calls = [
2401 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2402 ((['abspath', '../'],), '/abs/git_repo_root'),
2403 ]
2404 return git_cl.Changelist(codereview='gerrit', issue=123)
2405
2406 def test_GerritCommitMsgHookCheck_custom_hook(self):
2407 cl = self._common_GerritCommitMsgHookCheck()
2408 self.calls += [
2409 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2410 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2411 '#!/bin/sh\necho "custom hook"')
2412 ]
2413 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2414
2415 def test_GerritCommitMsgHookCheck_not_exists(self):
2416 cl = self._common_GerritCommitMsgHookCheck()
2417 self.calls += [
2418 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2419 ]
2420 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2421
2422 def test_GerritCommitMsgHookCheck(self):
2423 cl = self._common_GerritCommitMsgHookCheck()
2424 self.calls += [
2425 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2426 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2427 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002428 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002429 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2430 ''),
2431 ]
2432 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2433
tandriic4344b52016-08-29 06:04:54 -07002434 def test_GerritCmdLand(self):
2435 self.calls += [
2436 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2437 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2438 'deadbeaf'),
2439 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2440 ((['git', 'config', 'branch.feature.gerritserver'],),
2441 'chromium-review.googlesource.com'),
2442 ]
2443 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2444 cl._codereview_impl._GetChangeDetail = lambda _: {
2445 'labels': {},
2446 'current_revision': 'deadbeaf',
2447 }
agable32978d92016-11-01 12:55:02 -07002448 cl._codereview_impl._GetChangeCommit = lambda: {
2449 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002450 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002451 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2452 }
tandriic4344b52016-08-29 06:04:54 -07002453 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002454 out = StringIO.StringIO()
2455 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002456 self.assertEqual(0, cl.CMDLand(force=True,
2457 bypass_hooks=True,
2458 verbose=True,
2459 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002460 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002461 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002462
tandrii221ab252016-10-06 08:12:04 -07002463 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002464 '9000': {
2465 'id': '9000',
2466 'bucket': 'master.x.y',
2467 'created_by': 'user:someone@chromium.org',
2468 'created_ts': '147200002222000',
2469 'experimental': False,
2470 'parameters_json': json.dumps({
2471 'builder_name': 'my-bot',
2472 'properties': {'category': 'cq'},
2473 }),
2474 'status': 'STARTED',
2475 'tags': [
2476 'build_address:x.y/my-bot/2',
2477 'builder:my-bot',
2478 'experimental:false',
2479 'user_agent:cq',
2480 ],
2481 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2482 },
2483 '8000': {
2484 'id': '8000',
2485 'bucket': 'master.x.y',
2486 'created_by': 'user:someone@chromium.org',
2487 'created_ts': '147200001111000',
2488 'experimental': False,
2489 'failure_reason': 'BUILD_FAILURE',
2490 'parameters_json': json.dumps({
2491 'builder_name': 'my-bot',
2492 'properties': {'category': 'cq'},
2493 }),
2494 'result_details_json': json.dumps({
2495 'properties': {'buildnumber': 1},
2496 }),
2497 'result': 'FAILURE',
2498 'status': 'COMPLETED',
2499 'tags': [
2500 'build_address:x.y/my-bot/1',
2501 'builder:my-bot',
2502 'experimental:false',
2503 'user_agent:cq',
2504 ],
2505 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2506 },
2507 }
tandrii221ab252016-10-06 08:12:04 -07002508
2509 def test_write_try_results_json(self):
2510 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002511 {
2512 'bucket': 'master.x.y',
2513 'buildbucket_id': '8000',
2514 'builder_name': 'my-bot',
2515 'created_ts': '147200001111000',
2516 'experimental': False,
2517 'failure_reason': 'BUILD_FAILURE',
2518 'result': 'FAILURE',
2519 'status': 'COMPLETED',
2520 'tags': [
2521 'build_address:x.y/my-bot/1',
2522 'builder:my-bot',
2523 'experimental:false',
2524 'user_agent:cq',
2525 ],
2526 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2527 },
2528 {
2529 'bucket': 'master.x.y',
2530 'buildbucket_id': '9000',
2531 'builder_name': 'my-bot',
2532 'created_ts': '147200002222000',
2533 'experimental': False,
2534 'failure_reason': None,
2535 'result': None,
2536 'status': 'STARTED',
2537 'tags': [
2538 'build_address:x.y/my-bot/2',
2539 'builder:my-bot',
2540 'experimental:false',
2541 'user_agent:cq',
2542 ],
2543 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2544 },
tandrii221ab252016-10-06 08:12:04 -07002545 ]
2546 self.calls = [(('write_json', 'output.json', expected_output), '')]
2547 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2548
tandrii45b2a582016-10-11 03:14:16 -07002549 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002550 out = StringIO.StringIO()
2551 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002552 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2553 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002554 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2555 self._mocked_call(['get_authenticator_for_host', host]))
2556 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2557 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002558
tandrii45b2a582016-10-11 03:14:16 -07002559 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2560 self._setup_fetch_try_jobs(most_recent_patchset=13)
2561 self.calls += [
2562 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2563 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2564 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002565 # TODO(tandrii): Uncomment the below if we decide to support checking
2566 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002567 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002568 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002569 ((['git', 'config', 'branch.feature.gerritserver'],),
2570 'https://x-review.googlesource.com'),
2571 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2572 AuthenticatorMock()),
2573 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2574
2575 def test_fetch_try_jobs_none_gerrit(self):
2576 self._setup_fetch_try_jobs_gerrit({})
2577 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002578 # TODO(tandrii): Uncomment the below if we decide to support checking
2579 # patchsets for Gerrit.
2580 # self.assertRegexpMatches(
2581 # sys.stdout.getvalue(),
2582 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002583 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2584
2585 def test_fetch_try_jobs_some_gerrit(self):
2586 self._setup_fetch_try_jobs_gerrit({
2587 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2588 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002589 # TODO(tandrii): Uncomment the below if we decide to support checking
2590 # patchsets for Gerrit.
2591 # self.calls.remove(
2592 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002593 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2594
2595 # ... and doesn't result in warning.
2596 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2597 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002598 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2599 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2600
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002601 def _mock_gerrit_changes_for_detail_cache(self):
2602 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002603
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002604 def test_gerrit_change_detail_cache_simple(self):
2605 self._mock_gerrit_changes_for_detail_cache()
2606 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002607 (('GetChangeDetail', 'host', 'my%2Frepo~1', []), 'a'),
2608 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b'),
2609 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002610 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002611 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002612 cl1._cached_remote_url = (
2613 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002614 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002615 cl2._cached_remote_url = (
2616 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002617 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2618 self.assertEqual(cl1._GetChangeDetail(), 'a')
2619 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
2620 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
2621 self.assertEqual(cl1._GetChangeDetail(), 'a')
2622 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002623
2624 def test_gerrit_change_detail_cache_options(self):
2625 self._mock_gerrit_changes_for_detail_cache()
2626 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002627 (('GetChangeDetail', 'host', 'repo~1', ['C', 'A', 'B']), 'cab'),
2628 (('GetChangeDetail', 'host', 'repo~1', ['A', 'D']), 'ad'),
2629 (('GetChangeDetail', 'host', 'repo~1', ['A']), 'a'), # no_cache=True
2630 # no longer in cache.
2631 (('GetChangeDetail', 'host', 'repo~1', ['B']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002632 ]
2633 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002634 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002635 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2636 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2637 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2638 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2639 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2640 self.assertEqual(cl._GetChangeDetail(), 'cab')
2641
2642 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2643 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2644 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2645 self.assertEqual(cl._GetChangeDetail(), 'cab')
2646
2647 # Finally, no_cache should invalidate all caches for given change.
2648 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2649 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2650
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002651 def test_gerrit_description_caching(self):
2652 def gen_detail(rev, desc):
2653 return {
2654 'current_revision': rev,
2655 'revisions': {rev: {'commit': {'message': desc}}}
2656 }
2657 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002658 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002659 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2660 gen_detail('rev1', 'desc1')),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002661 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002662 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2663 gen_detail('rev2', 'desc2')),
2664 ]
2665
2666 self._mock_gerrit_changes_for_detail_cache()
2667 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002668 cl._cached_remote_url = (
2669 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002670 self.assertEqual(cl.GetDescription(), 'desc1')
2671 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
2672 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002673
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002674 def test_print_current_creds(self):
2675 class CookiesAuthenticatorMock(object):
2676 def __init__(self):
2677 self.gitcookies = {
2678 'host.googlesource.com': ('user', 'pass'),
2679 'host-review.googlesource.com': ('user', 'pass'),
2680 }
2681 self.netrc = self
2682 self.netrc.hosts = {
2683 'github.com': ('user2', None, 'pass2'),
2684 'host2.googlesource.com': ('user3', None, 'pass'),
2685 }
2686 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2687 CookiesAuthenticatorMock)
2688 self.mock(sys, 'stdout', StringIO.StringIO())
2689 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2690 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2691 ' Host\t User\t Which file',
2692 '============================\t=====\t===========',
2693 'host-review.googlesource.com\t user\t.gitcookies',
2694 ' host.googlesource.com\t user\t.gitcookies',
2695 ' host2.googlesource.com\tuser3\t .netrc',
2696 ])
2697 sys.stdout.buf = ''
2698 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2699 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2700 ' Host\tUser\t Which file',
2701 '============================\t====\t===========',
2702 'host-review.googlesource.com\tuser\t.gitcookies',
2703 ' host.googlesource.com\tuser\t.gitcookies',
2704 ])
2705
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002706 def _common_creds_check_mocks(self):
2707 def exists_mock(path):
2708 dirname = os.path.dirname(path)
2709 if dirname == os.path.expanduser('~'):
2710 dirname = '~'
2711 base = os.path.basename(path)
2712 if base in ('.netrc', '.gitcookies'):
2713 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
2714 # git cl also checks for existence other files not relevant to this test.
2715 return None
2716 self.mock(os.path, 'exists', exists_mock)
2717 self.mock(sys, 'stdout', StringIO.StringIO())
2718
2719 def test_creds_check_gitcookies_not_configured(self):
2720 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002721 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002722 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002723 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08002724 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002725 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
2726 (('os.path.exists', '~/.netrc'), True),
2727 (('ask_for_data', 'Press Enter to setup .gitcookies, '
2728 'or Ctrl+C to abort'), ''),
2729 ((['git', 'config', '--global', 'http.cookiefile',
2730 os.path.expanduser('~/.gitcookies')], ), ''),
2731 ]
2732 self.assertEqual(0, git_cl.main(['creds-check']))
2733 self.assertRegexpMatches(
2734 sys.stdout.getvalue(),
2735 '^You seem to be using outdated .netrc for git credentials:')
2736 self.assertRegexpMatches(
2737 sys.stdout.getvalue(),
2738 '\nConfigured git to use .gitcookies from')
2739
2740 def test_creds_check_gitcookies_configured_custom_broken(self):
2741 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002742 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002743 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002744 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08002745 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002746 ((['git', 'config', '--global', 'http.cookiefile'],),
2747 '/custom/.gitcookies'),
2748 (('os.path.exists', '/custom/.gitcookies'), False),
2749 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
2750 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
2751 ((['git', 'config', '--global', 'http.cookiefile',
2752 os.path.expanduser('~/.gitcookies')], ), ''),
2753 ]
2754 self.assertEqual(0, git_cl.main(['creds-check']))
2755 self.assertRegexpMatches(
2756 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002757 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002758 self.assertRegexpMatches(
2759 sys.stdout.getvalue(),
2760 'However, your configured .gitcookies file is missing.')
2761
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002762 def test_git_cl_comment_add_gerrit(self):
2763 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07002764 lambda host, change, msg, ready:
2765 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002766 self.calls = [
2767 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2768 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2769 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
2770 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
2771 'origin/master'),
2772 ((['git', 'config', 'remote.origin.url'],),
2773 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002774 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
2775 'msg', None),
Aaron Gable636b13f2017-07-14 10:42:48 -07002776 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002777 ]
2778 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
2779 '-a', 'msg']))
2780
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002781 def test_git_cl_comments_fetch_gerrit(self):
2782 self.mock(sys, 'stdout', StringIO.StringIO())
2783 self.calls = [
2784 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2785 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2786 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
2787 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
2788 'origin/master'),
2789 ((['git', 'config', 'remote.origin.url'],),
2790 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002791 (('GetChangeDetail', 'chromium-review.googlesource.com',
2792 'infra%2Finfra~1',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002793 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002794 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002795 'messages': [
2796 {
2797 u'_revision_number': 1,
2798 u'author': {
2799 u'_account_id': 1111084,
2800 u'email': u'commit-bot@chromium.org',
2801 u'name': u'Commit Bot'
2802 },
2803 u'date': u'2017-03-15 20:08:45.000000000',
2804 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07002805 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002806 u'tag': u'autogenerated:cq:dry-run'
2807 },
2808 {
2809 u'_revision_number': 2,
2810 u'author': {
2811 u'_account_id': 11151243,
2812 u'email': u'owner@example.com',
2813 u'name': u'owner'
2814 },
2815 u'date': u'2017-03-16 20:00:41.000000000',
2816 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2817 u'message': u'PTAL',
2818 },
2819 {
2820 u'_revision_number': 2,
2821 u'author': {
2822 u'_account_id': 148512 ,
2823 u'email': u'reviewer@example.com',
2824 u'name': u'reviewer'
2825 },
2826 u'date': u'2017-03-17 05:19:37.500000000',
2827 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2828 u'message': u'Patch Set 2: Code-Review+1',
2829 },
2830 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002831 }),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002832 (('GetChangeComments', 'chromium-review.googlesource.com',
2833 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002834 '/COMMIT_MSG': [
2835 {
2836 'author': {'email': u'reviewer@example.com'},
2837 'updated': u'2017-03-17 05:19:37.500000000',
2838 'patch_set': 2,
2839 'side': 'REVISION',
2840 'message': 'Please include a bug link',
2841 },
2842 ],
2843 'codereview.settings': [
2844 {
2845 'author': {'email': u'owner@example.com'},
2846 'updated': u'2017-03-16 20:00:41.000000000',
2847 'patch_set': 2,
2848 'side': 'PARENT',
2849 'line': 42,
2850 'message': 'I removed this because it is bad',
2851 },
2852 ]
Leszek Swirski45b20c42018-09-17 17:05:26 +00002853 })
2854 ] * 2 + [
2855 (('write_json', 'output.json', [
2856 {
2857 u'date': u'2017-03-16 20:00:41.000000',
2858 u'message': (
2859 u'PTAL\n' +
2860 u'\n' +
2861 u'codereview.settings\n' +
2862 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2863 u'c/1/2/codereview.settings#b42\n' +
2864 u' I removed this because it is bad\n'),
2865 u'approval': False,
2866 u'disapproval': False,
2867 u'sender': u'owner@example.com'
2868 }, {
2869 u'date': u'2017-03-17 05:19:37.500000',
2870 u'message': (
2871 u'Patch Set 2: Code-Review+1\n' +
2872 u'\n' +
2873 u'/COMMIT_MSG\n' +
2874 u' PS2, File comment: https://chromium-review.googlesource' +
2875 u'.com/c/1/2//COMMIT_MSG#\n' +
2876 u' Please include a bug link\n'),
2877 u'approval': False,
2878 u'disapproval': False,
2879 u'sender': u'reviewer@example.com'
2880 }
2881 ]),'')
2882 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002883 expected_comments_summary = [
2884 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002885 message=(
2886 u'PTAL\n' +
2887 u'\n' +
2888 u'codereview.settings\n' +
2889 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2890 u'c/1/2/codereview.settings#b42\n' +
2891 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002892 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
2893 disapproval=False, approval=False, sender=u'owner@example.com'),
2894 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002895 message=(
2896 u'Patch Set 2: Code-Review+1\n' +
2897 u'\n' +
2898 u'/COMMIT_MSG\n' +
2899 u' PS2, File comment: https://chromium-review.googlesource.com/' +
2900 u'c/1/2//COMMIT_MSG#\n' +
2901 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002902 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
2903 disapproval=False, approval=False, sender=u'reviewer@example.com'),
2904 ]
2905 cl = git_cl.Changelist(codereview='gerrit', issue=1)
2906 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00002907 self.assertEqual(0, git_cl.main(['comment', '-i', '1',
Leszek Swirski45b20c42018-09-17 17:05:26 +00002908 '-j', 'output.json']))
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002909
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002910 def test_get_remote_url_with_mirror(self):
2911 original_os_path_isdir = os.path.isdir
2912 def selective_os_path_isdir_mock(path):
2913 if path == '/cache/this-dir-exists':
2914 return self._mocked_call('os.path.isdir', path)
2915 return original_os_path_isdir(path)
2916 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
2917
2918 url = 'https://chromium.googlesource.com/my/repo'
2919 self.calls = [
2920 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2921 ((['git', 'config', 'branch.master.merge'],), 'master'),
2922 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2923 ((['git', 'config', 'remote.origin.url'],),
2924 '/cache/this-dir-exists'),
2925 (('os.path.isdir', '/cache/this-dir-exists'),
2926 True),
2927 # Runs in /cache/this-dir-exists.
2928 ((['git', 'config', 'remote.origin.url'],),
2929 url),
2930 ]
2931 cl = git_cl.Changelist(codereview='gerrit', issue=1)
2932 self.assertEqual(cl.GetRemoteUrl(), url)
2933 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
2934
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002935 def test_gerrit_change_identifier_with_project(self):
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002936 self.calls = [
2937 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2938 ((['git', 'config', 'branch.master.merge'],), 'master'),
2939 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2940 ((['git', 'config', 'remote.origin.url'],),
2941 'https://chromium.googlesource.com/a/my/repo.git/'),
2942 ]
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002943 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
2944 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
2945
2946 def test_gerrit_change_identifier_without_project(self):
2947 self.calls = [
2948 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2949 ((['git', 'config', 'branch.master.merge'],), 'master'),
2950 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2951 ((['git', 'config', 'remote.origin.url'],), CERR1),
2952 ]
2953 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
2954 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002955
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002956
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002957if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01002958 logging.basicConfig(
2959 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002960 unittest.main()