blob: 4560065c6f3466f6565a330e91960d51da61cb02 [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 = []
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000625 self.mock(git_cl, 'time_time',
626 lambda: self._mocked_call('time.time'))
627 self.mock(git_cl.metrics.collector, 'add_repeated',
628 lambda *a: self._mocked_call('add_repeated', *a))
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000629 self.mock(subprocess2, 'call', self._mocked_call)
630 self.mock(subprocess2, 'check_call', self._mocked_call)
631 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700632 self.mock(subprocess2, 'communicate',
633 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000634 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000635 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000636 self.mock(git_common, 'get_or_create_merge_base',
637 lambda *a: (
638 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000639 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000640 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000641 self.mock(git_cl, 'SaveDescriptionBackup', lambda _:
642 self._mocked_call('SaveDescriptionBackup'))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100643 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000644 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700645 self.mock(git_cl, 'write_json', lambda path, contents:
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000646 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000647 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
skobes6468b902016-10-24 08:45:10 -0700648 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
649 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000650 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000652 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100653 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
654 lambda *args, **kwargs: self._mocked_call(
655 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700656 self.mock(git_cl.gerrit_util, 'GetChangeComments',
657 lambda *args, **kwargs: self._mocked_call(
658 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100659 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700660 lambda h, i, reviewers, ccs, notify: self._mocked_call(
661 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700662 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700663 lambda h, i, msg=None, labels=None, notify=None:
664 self._mocked_call('SetReview', h, i, msg, labels, notify))
Andrii Shyshkalov733d4ec2018-04-19 11:48:58 -0700665 self.mock(git_cl.gerrit_util.LuciContextAuthenticator, 'is_luci',
666 staticmethod(lambda: False))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000667 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
668 classmethod(lambda _: False))
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000669 self.mock(git_cl.gerrit_util, 'ValidAccounts',
670 lambda host, accounts:
671 self._mocked_call('ValidAccounts', host, accounts))
tandriic2405f52016-10-10 08:13:15 -0700672 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100673 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000674 # It's important to reset settings to not have inter-tests interference.
675 git_cl.settings = None
676
677 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000678 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100679 self.assertEquals([], self.calls)
680 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000681 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100682 raise
683 # Sadly, has_failed() returns True if this OR any other tests before this
684 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200685 git_cl.logging.error(
686 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100687 'There are un-consumed self.calls after this test has finished.\n'
688 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700689 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200690 'If you are already running only this test, then **first** fix the '
691 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100692 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700693 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100694 'and follow instructions above.\n' +
695 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000696 finally:
697 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000698
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000699 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000700 self.assertTrue(
701 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700702 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000703 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000704 expected_args, result = top
705
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000706 # Also logs otherwise it could get caught in a try/finally and be hard to
707 # diagnose.
708 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700709 N = 5
710 prior_calls = '\n '.join(
711 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
712 for i, c in enumerate(self._calls_done[-N:]))
713 following_calls = '\n '.join(
714 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
715 for i, c in enumerate(self.calls[:N]))
716 extended_msg = (
717 'A few prior calls:\n %s\n\n'
718 'This (expected):\n @%d: %r\n'
719 'This (actual):\n @%d: %r\n\n'
720 'A few following expected calls:\n %s' %
721 (prior_calls, len(self._calls_done), expected_args,
722 len(self._calls_done), args, following_calls))
723 git_cl.logging.error(extended_msg)
724
tandrii99a72f22016-08-17 14:33:24 -0700725 self.fail('@%d\n'
726 ' Expected: %r\n'
727 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700728 len(self._calls_done), expected_args, args))
729
730 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700731 if isinstance(result, Exception):
732 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000733 return result
734
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100735 def test_ask_for_explicit_yes_true(self):
736 self.calls = [
737 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
738 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
739 ]
740 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
741
tandrii48df5812016-10-17 03:55:37 -0700742 def test_LoadCodereviewSettingsFromFile_gerrit(self):
743 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
744 self.calls = [
745 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
747 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
748 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
750 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700751 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
752 CERR1),
753 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700754 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
755 CERR1),
756 ((['git', 'config', 'gerrit.host', 'true'],), ''),
757 ]
758 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
759
maruel@chromium.orga3353652011-11-30 14:26:57 +0000760 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000761 def _is_gerrit_calls(cls, gerrit=False):
762 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
763 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
764
765 @classmethod
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000766 def _git_post_upload_calls(cls):
767 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000768 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
769 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
770 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000771 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000772 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000773 ]
774
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000775 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000776 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000777 fake_ancestor = 'fake_ancestor'
778 fake_cl = 'fake_cl_for_patch'
779 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000780 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000781 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000782 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000783 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000784 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000785 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000786 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000787 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700788 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000789 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000790 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000791 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000792 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000793 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000795 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000796 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000797 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000798 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000799 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000800
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000801 @classmethod
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000802 def _gerrit_ensure_auth_calls(
803 cls, issue=None, skip_auth_check=False, short_hostname='chromium'):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000804 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000805 if skip_auth_check:
806 return [((cmd, ), 'true')]
807
tandrii5d48c322016-08-18 16:19:37 -0700808 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000809 if issue:
810 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100811 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000812 ])
813 calls.extend([
814 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
815 ((['git', 'config', 'branch.master.remote'],), 'origin'),
816 ((['git', 'config', 'remote.origin.url'],),
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000817 'https://%s.googlesource.com/my/repo' % short_hostname),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000818 ])
819 return calls
820
821 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100822 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200823 fetched_status=None, other_cl_owner=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000824 custom_cl_base=None, short_hostname='chromium'):
Aaron Gable13101a62018-02-09 13:20:41 -0800825 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100826 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200827 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
828 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
829 ((['git', 'config', 'branch.master.gerritissue'],),
830 CERR1 if issue is None else str(issue)),
831 ]
832
833 if custom_cl_base:
834 ancestor_revision = custom_cl_base
835 else:
836 # Determine ancestor_revision to be merge base.
837 ancestor_revision = 'fake_ancestor_sha'
838 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000839 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000840 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000841 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200842 'refs/remotes/origin/master'],), ancestor_revision),
843 ]
844
845 # Calls to verify branch point is ancestor
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000846 calls += cls._gerrit_ensure_auth_calls(
847 issue=issue, short_hostname=short_hostname)
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100848
849 if issue:
850 calls += [
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000851 (('GetChangeDetail', '%s-review.googlesource.com' % short_hostname,
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +0000852 'my%2Frepo~123456',
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +0000853 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS']
854 ),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100855 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100856 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100857 'change_id': '123456789',
858 'current_revision': 'sha1_of_current_revision',
859 'revisions': { 'sha1_of_current_revision': {
860 'commit': {'message': fetched_description},
861 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100862 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100863 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100864 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100865 if fetched_status == 'ABANDONED':
866 calls += [
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000867 (('DieWithError', 'Change https://%s-review.googlesource.com/'
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100868 '123456 has been abandoned, new uploads are not '
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000869 'allowed' % short_hostname), SystemExitMock()),
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100870 ]
871 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100872 if other_cl_owner:
873 calls += [
874 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
875 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100876
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200877 calls += cls._git_sanity_checks(ancestor_revision, 'master',
878 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100879 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200880 ((['git', 'rev-parse', '--show-cdup'],), ''),
881 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000882
Aaron Gable7817f022017-12-12 09:43:17 -0800883 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
884 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200885 'M\t.gitignore\n'),
886 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100887 ]
888
889 if not issue:
890 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200891 ((['git', 'log', '--pretty=format:%s%n%n%b',
892 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000893 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100894 ]
895
896 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200897 ((['git', 'config', 'user.email'],), 'me@example.com'),
898 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
899 ([custom_cl_base] if custom_cl_base else
900 [ancestor_revision, 'HEAD']),),
901 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100902 ]
903 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +0000904
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000905 @classmethod
906 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700907 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000908 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -0700909 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +0100910 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000911 custom_cl_base=None, tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000912 short_hostname='chromium',
913 labels=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000914 if post_amend_description is None:
915 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -0700916 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200917 # Determined in `_gerrit_base_calls`.
918 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
919
920 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000921
tandriia60502f2016-06-20 02:01:53 -0700922 if squash_mode == 'default':
923 calls.extend([
924 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
925 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
926 ])
927 elif squash_mode in ('override_squash', 'override_nosquash'):
928 calls.extend([
929 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
930 'true' if squash_mode == 'override_squash' else 'false'),
931 ])
932 else:
933 assert squash_mode in ('squash', 'nosquash')
934
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000935 # If issue is given, then description is fetched from Gerrit instead.
936 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000937 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200938 ((['git', 'log', '--pretty=format:%s\n\n%b',
939 ((custom_cl_base + '..') if custom_cl_base else
940 'fake_ancestor_sha..HEAD')],),
941 description),
942 ]
Aaron Gableb56ad332017-01-06 15:24:31 -0800943 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000944 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -0800945 else:
946 if not title:
947 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200948 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
949 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -0800950 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000951 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000952 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000953 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200954 (('DownloadGerritHook', False), ''),
955 # Amending of commit message to get the Change-Id.
956 ((['git', 'log', '--pretty=format:%s\n\n%b',
957 determined_ancestor_revision + '..HEAD'],),
958 description),
959 ((['git', 'commit', '--amend', '-m', description],), ''),
960 ((['git', 'log', '--pretty=format:%s\n\n%b',
961 determined_ancestor_revision + '..HEAD'],),
962 post_amend_description)
963 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000964 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000965 if not issue:
966 # Prompting to edit description on first upload.
967 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200968 ((['git', 'config', 'core.editor'],), ''),
969 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000970 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000971 ref_to_push = 'abcdef0123456789'
972 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200973 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
974 ((['git', 'config', 'branch.master.remote'],), 'origin'),
975 ]
976
977 if custom_cl_base is None:
978 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000979 ((['get_or_create_merge_base', 'master',
980 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000981 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200982 ]
983 parent = 'origin/master'
984 else:
985 calls += [
986 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
987 'refs/remotes/origin/master'],),
988 callError(1)), # Means not ancenstor.
989 (('ask_for_data',
990 'Do you take responsibility for cleaning up potential mess '
991 'resulting from proceeding with upload? Press Enter to upload, '
992 'or Ctrl+C to abort'), ''),
993 ]
994 parent = custom_cl_base
995
996 calls += [
997 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
998 '0123456789abcdef'),
999 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001000 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001001 ref_to_push),
1002 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001003 else:
1004 ref_to_push = 'HEAD'
1005
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001006 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00001007 (('SaveDescriptionBackup',), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001008 ((['git', 'rev-list',
1009 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1010 ref_to_push],),
1011 '1hashPerLine\n'),
1012 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001013
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001014 metrics_arguments = []
1015
Aaron Gableafd52772017-06-27 16:40:10 -07001016 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001017 ref_suffix = '%ready,notify=ALL'
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001018 metrics_arguments += ['ready', 'notify=ALL']
Aaron Gable844cf292017-06-28 11:32:59 -07001019 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001020 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001021 ref_suffix = '%wip'
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001022 metrics_arguments.append('wip')
Aaron Gable844cf292017-06-28 11:32:59 -07001023 else:
1024 ref_suffix = '%notify=NONE'
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001025 metrics_arguments.append('notify=NONE')
Aaron Gable9b713dd2016-12-14 16:04:21 -08001026
Aaron Gable70f4e242017-06-26 10:45:59 -07001027 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001028 ref_suffix += ',m=' + title
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001029 metrics_arguments.append('m')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001030
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001031 calls += [
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +00001032 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001033 ]
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001034 if short_hostname == 'chromium':
1035 # All reviwers and ccs get into ref_suffix.
1036 for r in sorted(reviewers):
1037 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001038 metrics_arguments.append('r')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001039 for c in sorted(['chromium-reviews+test-more-cc@chromium.org',
1040 'joe@example.com'] + cc):
1041 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001042 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001043 reviewers, cc = [], []
1044 else:
1045 # TODO(crbug/877717): remove this case.
1046 calls += [
1047 (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
1048 sorted(reviewers) + ['joe@example.com',
1049 'chromium-reviews+test-more-cc@chromium.org'] + cc),
1050 {
1051 e: {'email': e}
1052 for e in (reviewers + ['joe@example.com'] + cc)
1053 })
1054 ]
1055 for r in sorted(reviewers):
1056 if r != 'bad-account-or-email':
1057 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001058 metrics_arguments.append('r')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001059 reviewers.remove(r)
1060 for c in sorted(['joe@example.com'] + cc):
1061 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001062 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001063 if c in cc:
1064 cc.remove(c)
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001065
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001066 if not tbr:
1067 for k, v in sorted((labels or {}).items()):
1068 ref_suffix += ',l=%s+%d' % (k, v)
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001069 metrics_arguments.append('l=%s+%d' % (k, v))
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001070
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001071 calls += [
1072 (('time.time',), 1000,),
1073 ((['git', 'push',
1074 'https://%s.googlesource.com/my/repo' % short_hostname,
1075 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1076 (('remote:\n'
1077 'remote: Processing changes: (\)\n'
1078 'remote: Processing changes: (|)\n'
1079 'remote: Processing changes: (/)\n'
1080 'remote: Processing changes: (-)\n'
1081 'remote: Processing changes: new: 1 (/)\n'
1082 'remote: Processing changes: new: 1, done\n'
1083 'remote:\n'
1084 'remote: New Changes:\n'
1085 'remote: https://%s-review.googlesource.com/#/c/my/repo/+/123456'
1086 ' XXX\n'
1087 'remote:\n'
1088 'To https://%s.googlesource.com/my/repo\n'
1089 ' * [new branch] hhhh -> refs/for/refs/heads/master\n'
1090 ) % (short_hostname, short_hostname)),),
1091 (('time.time',), 2000,),
1092 (('add_repeated',
1093 'sub_commands',
1094 {
1095 'execution_time': 1000,
1096 'command': 'git push',
1097 'exit_code': 0,
1098 'arguments': sorted(metrics_arguments),
1099 }),
1100 None,),
1101 ]
1102
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001103 if squash:
1104 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001105 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001106 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001107 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001108 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001109 ((['git', 'config', 'branch.master.gerritsquashhash',
1110 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001111 ]
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001112 # TODO(crbug/877717): this should never be used.
1113 if squash and short_hostname != 'chromium':
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001114 calls += [
1115 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001116 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001117 sorted(reviewers),
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00001118 cc + ['chromium-reviews+test-more-cc@chromium.org'],
1119 notify),
1120 ''),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001121 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001122 if tbr:
1123 calls += [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001124 (('GetChangeDetail', 'chromium-review.googlesource.com',
1125 'my%2Frepo~123456', ['LABELS']), {
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001126 'labels': {
1127 'Code-Review': {
1128 'default_value': 0,
1129 'all': [],
1130 'values': {
1131 '+2': 'lgtm, approved',
1132 '+1': 'lgtm, but someone else must approve',
1133 ' 0': 'No score',
1134 '-1': 'Don\'t submit as-is',
1135 }
1136 }
1137 }
1138 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001139 (('SetReview',
1140 'chromium-review.googlesource.com',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001141 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001142 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001143 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001144 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001145 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001146 return calls
1147
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001148 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001149 self,
1150 upload_args,
1151 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001152 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001153 squash=True,
1154 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001155 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001156 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001157 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001158 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001159 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001160 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001161 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001162 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001163 custom_cl_base=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001164 tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001165 short_hostname='chromium',
1166 labels=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001167 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001168 if squash_mode is None:
1169 if '--no-squash' in upload_args:
1170 squash_mode = 'nosquash'
1171 elif '--squash' in upload_args:
1172 squash_mode = 'squash'
1173 else:
1174 squash_mode = 'default'
1175
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001176 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001177 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001178 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001179 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001180 CookiesAuthenticatorMockFactory(
1181 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001182 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1183 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001184 self.mock(git_cl.gclient_utils, 'RunEditor',
1185 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001186 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1187 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001188
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001189 self.calls = self._gerrit_base_calls(
1190 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001191 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001192 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001193 other_cl_owner=other_cl_owner,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001194 custom_cl_base=custom_cl_base,
1195 short_hostname=short_hostname)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001196 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001197 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1198 expected_content=description))
1199 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001200 self.calls += self._gerrit_upload_calls(
1201 description, reviewers, squash,
1202 squash_mode=squash_mode,
1203 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001204 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001205 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001206 issue=issue, cc=cc,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001207 custom_cl_base=custom_cl_base, tbr=tbr,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001208 short_hostname=short_hostname,
1209 labels=labels)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001210 # Uncomment when debugging.
1211 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001212 git_cl.main(['upload'] + upload_args)
1213
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001214 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001215 self._run_gerrit_upload_test(
1216 ['--no-squash'],
1217 'desc\n\nBUG=\n',
1218 [],
1219 squash=False,
1220 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1221
1222 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001223 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001224 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001225 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001226 [],
tandriia60502f2016-06-20 02:01:53 -07001227 squash=False,
1228 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001229 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001230
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001231 def test_gerrit_no_reviewer(self):
1232 self._run_gerrit_upload_test(
1233 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001234 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001235 [],
1236 squash=False,
1237 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001238
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001239 def test_gerrit_no_reviewer_non_chromium_host(self):
1240 # TODO(crbug/877717): remove this test case.
1241 self._run_gerrit_upload_test(
1242 [],
1243 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
1244 [],
1245 squash=False,
1246 squash_mode='override_nosquash',
1247 short_hostname='other')
1248
Nick Carter8692b182017-11-06 16:30:38 -08001249 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001250 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1251 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001252 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001253 'desc\n\nBUG=\n\nChange-Id: I123456789',
1254 squash=False,
1255 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001256 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001257
ukai@chromium.orge8077812012-02-03 03:41:46 +00001258 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001259 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001260 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001261 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001262 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001263 squash=False,
1264 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001265 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001266
1267 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001268 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001269 [],
bradnelsond975b302016-10-23 12:20:23 -07001270 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1271 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001272 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001273 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001274 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001275 cc=['more@example.com', 'people@example.com'],
1276 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001277
1278 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001279 self._run_gerrit_upload_test(
1280 [],
1281 'desc\nBUG=\n\nChange-Id: 123456789',
1282 [],
1283 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001284
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001285 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001286 self._run_gerrit_upload_test(
1287 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001288 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001289 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001290 squash=True,
1291 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001292
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001293 def test_gerrit_upload_squash_first_with_labels(self):
1294 self._run_gerrit_upload_test(
1295 ['--squash', '--cq-dry-run', '--enable-auto-submit'],
1296 'desc\nBUG=\n\nChange-Id: 123456789',
1297 [],
1298 squash=True,
1299 expected_upstream_ref='origin/master',
1300 labels={'Commit-Queue': 1, 'Auto-Submit': 1})
1301
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001302 def test_gerrit_upload_squash_first_against_rev(self):
1303 custom_cl_base = 'custom_cl_base_rev_or_branch'
1304 self._run_gerrit_upload_test(
1305 ['--squash', custom_cl_base],
1306 'desc\nBUG=\n\nChange-Id: 123456789',
1307 [],
1308 squash=True,
1309 expected_upstream_ref='origin/master',
1310 custom_cl_base=custom_cl_base)
1311 self.assertIn(
1312 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1313 sys.stdout.getvalue())
1314
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001315 def test_gerrit_upload_squash_reupload(self):
1316 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001317 self._run_gerrit_upload_test(
1318 ['--squash'],
1319 description,
1320 [],
1321 squash=True,
1322 expected_upstream_ref='origin/master',
1323 issue=123456)
1324
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001325 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1326 self.mock(git_cl, 'DieWithError',
1327 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1328 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1329 with self.assertRaises(SystemExitMock):
1330 self._run_gerrit_upload_test(
1331 ['--squash'],
1332 description,
1333 [],
1334 squash=True,
1335 expected_upstream_ref='origin/master',
1336 issue=123456,
1337 fetched_status='ABANDONED')
1338
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001339 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1340 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1341 lambda *_, **__: {'email': 'yet-another@example.com'})
1342 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1343 self._run_gerrit_upload_test(
1344 ['--squash'],
1345 description,
1346 [],
1347 squash=True,
1348 expected_upstream_ref='origin/master',
1349 issue=123456,
1350 other_cl_owner='other@example.com')
1351 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001352 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001353 'authenticate to Gerrit as yet-another@example.com.\n'
1354 'Uploading may fail due to lack of permissions',
1355 git_cl.sys.stdout.getvalue())
1356
rmistry@google.com2dd99862015-06-22 12:22:18 +00001357 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001358 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001359 def mock_run_git(*args, **_kwargs):
1360 if args[0] == ['for-each-ref',
1361 '--format=%(refname:short) %(upstream:short)',
1362 'refs/heads']:
1363 # Create a local branch dependency tree that looks like this:
1364 # test1 -> test2 -> test3 -> test4 -> test5
1365 # -> test3.1
1366 # test6 -> test0
1367 branch_deps = [
1368 'test2 test1', # test1 -> test2
1369 'test3 test2', # test2 -> test3
1370 'test3.1 test2', # test2 -> test3.1
1371 'test4 test3', # test3 -> test4
1372 'test5 test4', # test4 -> test5
1373 'test6 test0', # test0 -> test6
1374 'test7', # test7
1375 ]
1376 return '\n'.join(branch_deps)
1377 self.mock(git_cl, 'RunGit', mock_run_git)
1378
1379 class RecordCalls:
1380 times_called = 0
1381 record_calls = RecordCalls()
1382 def mock_CMDupload(*args, **_kwargs):
1383 record_calls.times_called += 1
1384 return 0
1385 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1386
1387 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001388 (('ask_for_data', 'This command will checkout all dependent branches '
1389 'and run "git cl upload". Press Enter to continue, '
1390 'or Ctrl+C to abort'), ''),
1391 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001392
1393 class MockChangelist():
1394 def __init__(self):
1395 pass
1396 def GetBranch(self):
1397 return 'test1'
1398 def GetIssue(self):
1399 return '123'
1400 def GetPatchset(self):
1401 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001402 def IsGerrit(self):
1403 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001404
1405 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1406 # CMDupload should have been called 5 times because of 5 dependent branches.
1407 self.assertEquals(5, record_calls.times_called)
1408 self.assertEquals(0, ret)
1409
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001410 def test_gerrit_change_id(self):
1411 self.calls = [
1412 ((['git', 'write-tree'], ),
1413 'hashtree'),
1414 ((['git', 'rev-parse', 'HEAD~0'], ),
1415 'branch-parent'),
1416 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1417 'A B <a@b.org> 1456848326 +0100'),
1418 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1419 'C D <c@d.org> 1456858326 +0100'),
1420 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1421 'hashchange'),
1422 ]
1423 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1424 self.assertEqual(change_id, 'Ihashchange')
1425
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001426 def test_desecription_append_footer(self):
1427 for init_desc, footer_line, expected_desc in [
1428 # Use unique desc first lines for easy test failure identification.
1429 ('foo', 'R=one', 'foo\n\nR=one'),
1430 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1431 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1432 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1433 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1434 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1435 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1436 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1437 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1438 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1439 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1440 ]:
1441 desc = git_cl.ChangeDescription(init_desc)
1442 desc.append_footer(footer_line)
1443 self.assertEqual(desc.description, expected_desc)
1444
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001445 def test_update_reviewers(self):
1446 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001447 ('foo', [], [],
1448 'foo'),
1449 ('foo\nR=xx', [], [],
1450 'foo\nR=xx'),
1451 ('foo\nTBR=xx', [], [],
1452 'foo\nTBR=xx'),
1453 ('foo', ['a@c'], [],
1454 'foo\n\nR=a@c'),
1455 ('foo\nR=xx', ['a@c'], [],
1456 'foo\n\nR=a@c, xx'),
1457 ('foo\nTBR=xx', ['a@c'], [],
1458 'foo\n\nR=a@c\nTBR=xx'),
1459 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1460 'foo\n\nR=a@c, yy\nTBR=xx'),
1461 ('foo\nBUG=', ['a@c'], [],
1462 'foo\nBUG=\nR=a@c'),
1463 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1464 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1465 ('foo', ['a@c', 'b@c'], [],
1466 'foo\n\nR=a@c, b@c'),
1467 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1468 'foo\nBar\n\nR=c@c\nBUG='),
1469 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1470 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001471 # Same as the line before, but full of whitespaces.
1472 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001473 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001474 'foo\nBar\n\nR=c@c\n BUG =',
1475 ),
1476 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001477 ('foo BUG=allo R=joe ', ['c@c'], [],
1478 'foo BUG=allo R=joe\n\nR=c@c'),
1479 # Redundant TBRs get promoted to Rs
1480 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1481 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001482 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001483 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001484 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001485 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001486 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001487 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001488 actual.append(obj.description)
1489 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001490
Nodir Turakulov23b82142017-11-16 11:04:25 -08001491 def test_get_hash_tags(self):
1492 cases = [
1493 ('', []),
1494 ('a', []),
1495 ('[a]', ['a']),
1496 ('[aa]', ['aa']),
1497 ('[a ]', ['a']),
1498 ('[a- ]', ['a']),
1499 ('[a- b]', ['a-b']),
1500 ('[a--b]', ['a-b']),
1501 ('[a', []),
1502 ('[a]x', ['a']),
1503 ('[aa]x', ['aa']),
1504 ('[a b]', ['a-b']),
1505 ('[a b]', ['a-b']),
1506 ('[a__b]', ['a-b']),
1507 ('[a] x', ['a']),
1508 ('[a][b]', ['a', 'b']),
1509 ('[a] [b]', ['a', 'b']),
1510 ('[a][b]x', ['a', 'b']),
1511 ('[a][b] x', ['a', 'b']),
1512 ('[a]\n[b]', ['a']),
1513 ('[a\nb]', []),
1514 ('[a][', ['a']),
1515 ('Revert "[a] feature"', ['a']),
1516 ('Reland "[a] feature"', ['a']),
1517 ('Revert: [a] feature', ['a']),
1518 ('Reland: [a] feature', ['a']),
1519 ('Revert "Reland: [a] feature"', ['a']),
1520 ('Foo: feature', ['foo']),
1521 ('Foo Bar: feature', ['foo-bar']),
1522 ('Revert "Foo bar: feature"', ['foo-bar']),
1523 ('Reland "Foo bar: feature"', ['foo-bar']),
1524 ]
1525 for desc, expected in cases:
1526 change_desc = git_cl.ChangeDescription(desc)
1527 actual = change_desc.get_hash_tags()
1528 self.assertEqual(
1529 actual,
1530 expected,
1531 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1532
wittman@chromium.org455dc922015-01-26 20:15:50 +00001533 def test_get_target_ref(self):
1534 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001535 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001536 self.assertEqual(None, git_cl.GetTargetRef(None,
1537 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001538 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001539
wittman@chromium.org455dc922015-01-26 20:15:50 +00001540 # Check default target refs for branches.
1541 self.assertEqual('refs/heads/master',
1542 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001543 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001544 self.assertEqual('refs/heads/master',
1545 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001546 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001547 self.assertEqual('refs/heads/master',
1548 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001549 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001550 self.assertEqual('refs/branch-heads/123',
1551 git_cl.GetTargetRef('origin',
1552 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001553 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001554 self.assertEqual('refs/diff/test',
1555 git_cl.GetTargetRef('origin',
1556 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001557 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001558 self.assertEqual('refs/heads/chrome/m42',
1559 git_cl.GetTargetRef('origin',
1560 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001561 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001562
1563 # Check target refs for user-specified target branch.
1564 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1565 'refs/remotes/branch-heads/123'):
1566 self.assertEqual('refs/branch-heads/123',
1567 git_cl.GetTargetRef('origin',
1568 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001569 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001570 for branch in ('origin/master', 'remotes/origin/master',
1571 'refs/remotes/origin/master'):
1572 self.assertEqual('refs/heads/master',
1573 git_cl.GetTargetRef('origin',
1574 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001575 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001576 for branch in ('master', 'heads/master', 'refs/heads/master'):
1577 self.assertEqual('refs/heads/master',
1578 git_cl.GetTargetRef('origin',
1579 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001580 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001581
wychen@chromium.orga872e752015-04-28 23:42:18 +00001582 def test_patch_when_dirty(self):
1583 # Patch when local tree is dirty
1584 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1585 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1586
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001587 @staticmethod
1588 def _get_gerrit_codereview_server_calls(branch, value=None,
1589 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001590 detect_branch=True,
1591 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001592 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1593
1594 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1595 """
1596 calls = []
1597 if detect_branch:
1598 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001599 if detect_server:
1600 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1601 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001602 if value is None:
1603 calls += [
1604 ((['git', 'config', 'branch.' + branch + '.merge'],),
1605 'refs/heads' + branch),
1606 ((['git', 'config', 'branch.' + branch + '.remote'],),
1607 'origin'),
1608 ((['git', 'config', 'remote.origin.url'],),
1609 'https://%s.googlesource.com/my/repo' % git_short_host),
1610 ]
1611 return calls
1612
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001613 def _patch_common(self, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001614 new_branch=False, git_short_host='host',
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001615 detect_gerrit_server=False,
1616 actual_codereview=None,
1617 codereview_in_url=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001618 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001619 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1620 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001621 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001622 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001623 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1624
tandriidf09a462016-08-18 16:23:55 -07001625 if new_branch:
1626 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001627
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001628 if codereview_in_url and actual_codereview == 'rietveld':
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001629 self.calls += [
1630 ((['git', 'rev-parse', '--show-cdup'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001631 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001632 ]
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001633
1634 if not force_codereview and not codereview_in_url:
1635 # These calls detect codereview to use.
1636 self.calls += [
1637 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1638 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1639 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1640 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1641 ((['git', 'config', 'gerrit.host'],), 'true'),
1642 ]
1643 if detect_gerrit_server:
1644 self.calls += self._get_gerrit_codereview_server_calls(
1645 'master', git_short_host=git_short_host,
1646 detect_branch=not new_branch and force_codereview)
1647 actual_codereview = 'gerrit'
1648
1649 if actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001650 self.calls += [
1651 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001652 'my%2Frepo~123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001653 {
1654 'current_revision': '7777777777',
1655 'revisions': {
1656 '1111111111': {
1657 '_number': 1,
1658 'fetch': {'http': {
1659 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1660 'ref': 'refs/changes/56/123456/1',
1661 }},
1662 },
1663 '7777777777': {
1664 '_number': 7,
1665 'fetch': {'http': {
1666 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1667 'ref': 'refs/changes/56/123456/7',
1668 }},
1669 },
1670 },
1671 }),
1672 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001673
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001674 def test_patch_gerrit_default(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001675 self._patch_common(git_short_host='chromium', detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001676 self.calls += [
1677 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1678 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001679 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001680 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001681 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001682 ((['git', 'config', 'branch.master.gerritserver',
1683 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001684 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001685 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1686 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1687 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001688 ]
1689 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1690
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001691 def test_patch_gerrit_new_branch(self):
1692 self._patch_common(
1693 git_short_host='chromium', detect_gerrit_server=True, new_branch=True)
1694 self.calls += [
1695 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1696 'refs/changes/56/123456/7'],), ''),
1697 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1698 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1699 ''),
1700 ((['git', 'config', 'branch.master.gerritserver',
1701 'https://chromium-review.googlesource.com'],), ''),
1702 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1703 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1704 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1705 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1706 ]
1707 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1708
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001709 def test_patch_gerrit_force(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001710 self._patch_common(
1711 force_codereview=True, git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001712 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001713 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001714 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001715 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001716 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001717 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001718 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001719 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001720 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001721 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1722 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1723 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001724 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001725 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001726
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001727 def test_patch_gerrit_guess_by_url(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001728 self.calls += self._get_gerrit_codereview_server_calls(
1729 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001730 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001731 actual_codereview='gerrit', git_short_host='else',
1732 codereview_in_url=True, detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001733 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001734 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001735 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001736 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001737 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001738 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001739 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001740 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001741 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001742 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1743 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1744 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001745 ]
1746 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001747 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001748
Aaron Gable697a91b2018-01-19 15:20:15 -08001749 def test_patch_gerrit_guess_by_url_with_repo(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001750 self.calls += self._get_gerrit_codereview_server_calls(
1751 'master', git_short_host='else', detect_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001752 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001753 actual_codereview='gerrit', git_short_host='else',
1754 codereview_in_url=True, detect_gerrit_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001755 self.calls += [
1756 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1757 'refs/changes/56/123456/1'],), ''),
1758 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1759 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1760 ''),
1761 ((['git', 'config', 'branch.master.gerritserver',
1762 'https://else-review.googlesource.com'],), ''),
1763 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1764 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1765 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1766 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1767 ]
1768 self.assertEqual(git_cl.main(
1769 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1770 0)
1771
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001772 def test_patch_gerrit_conflict(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001773 self._patch_common(detect_gerrit_server=True, git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001774 self.calls += [
1775 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001776 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001777 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1778 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1779 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001780 ]
1781 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001782 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001783
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001784 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001785 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001786 raise git_cl.gerrit_util.GerritError(404, '')
1787 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1788
tandriic2405f52016-10-10 08:13:15 -07001789 self.calls = [
1790 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07001791 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1792 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1793 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1794 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001795 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
1796 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1797 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1798 ((['git', 'config', 'remote.origin.url'],),
1799 'https://chromium.googlesource.com/my/repo'),
1800 ((['DieWithError',
1801 'change 123456 at https://chromium-review.googlesource.com does not '
1802 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07001803 ]
1804 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001805 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07001806
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001807 def _checkout_calls(self):
1808 return [
1809 ((['git', 'config', '--local', '--get-regexp',
1810 'branch\\..*\\.rietveldissue'], ),
1811 ('branch.retrying.rietveldissue 1111111111\n'
1812 'branch.some-fix.rietveldissue 2222222222\n')),
1813 ((['git', 'config', '--local', '--get-regexp',
1814 'branch\\..*\\.gerritissue'], ),
1815 ('branch.ger-branch.gerritissue 123456\n'
1816 'branch.gbranch654.gerritissue 654321\n')),
1817 ]
1818
1819 def test_checkout_gerrit(self):
1820 """Tests git cl checkout <issue>."""
1821 self.calls = self._checkout_calls()
1822 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1823 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1824
1825 def test_checkout_rietveld(self):
1826 """Tests git cl checkout <issue>."""
1827 self.calls = self._checkout_calls()
1828 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1829 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1830
1831 def test_checkout_not_found(self):
1832 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001833 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001834 self.calls = self._checkout_calls()
1835 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1836
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001837 def test_checkout_no_branch_issues(self):
1838 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001839 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001840 self.calls = [
1841 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001842 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001843 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001844 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001845 ]
1846 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1847
tandrii@chromium.org28253532016-04-14 13:46:56 +00001848 def _test_gerrit_ensure_authenticated_common(self, auth,
1849 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001850 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1851 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1852 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001853 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001854 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001855 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001856 cl.branch = 'master'
1857 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001858 cl.lookedup_issue = True
1859 return cl
1860
1861 def test_gerrit_ensure_authenticated_missing(self):
1862 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001863 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001864 })
1865 self.calls.append(
1866 ((['DieWithError',
1867 'Credentials for the following hosts are required:\n'
1868 ' chromium-review.googlesource.com\n'
1869 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001870 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001871 'https://chromium-review.googlesource.com/new-password'],), ''),)
1872 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1873
1874 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001875 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001876 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001877 'chromium.googlesource.com':
1878 ('git-one.example.com', None, 'secret1'),
1879 'chromium-review.googlesource.com':
1880 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001881 })
1882 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001883 (('ask_for_data', 'If you know what you are doing '
1884 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001885 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1886
1887 def test_gerrit_ensure_authenticated_ok(self):
1888 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001889 'chromium.googlesource.com':
1890 ('git-same.example.com', None, 'secret'),
1891 'chromium-review.googlesource.com':
1892 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001893 })
1894 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1895
tandrii@chromium.org28253532016-04-14 13:46:56 +00001896 def test_gerrit_ensure_authenticated_skipped(self):
1897 cl = self._test_gerrit_ensure_authenticated_common(
1898 auth={}, skip_auth_check=True)
1899 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1900
Eric Boren2fb63102018-10-05 13:05:03 +00001901 def test_gerrit_ensure_authenticated_bearer_token(self):
1902 cl = self._test_gerrit_ensure_authenticated_common(auth={
1903 'chromium.googlesource.com':
1904 ('', None, 'secret'),
1905 'chromium-review.googlesource.com':
1906 ('', None, 'secret'),
1907 })
1908 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1909 header = gerrit_util.CookiesAuthenticator().get_auth_header(
1910 'chromium.googlesource.com')
1911 self.assertTrue('Bearer' in header)
1912
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001913 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001914 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001915 lambda h, i, labels, notify=None:
1916 self._mocked_call(['SetReview', h, i, labels, notify]))
1917
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001918 self.calls = [
1919 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001920 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1921 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001922 ((['git', 'config', 'branch.feature.gerritserver'],),
1923 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001924 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1925 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1926 ((['git', 'config', 'remote.origin.url'],),
1927 'https://chromium.googlesource.com/infra/infra.git'),
1928 ((['SetReview', 'chromium-review.googlesource.com',
1929 'infra%2Finfra~123',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001930 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001931 ]
tandriid9e5ce52016-07-13 02:32:59 -07001932
1933 def test_cmd_set_commit_gerrit_clear(self):
1934 self._cmd_set_commit_gerrit_common(0)
1935 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1936
1937 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07001938 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001939 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1940
tandriid9e5ce52016-07-13 02:32:59 -07001941 def test_cmd_set_commit_gerrit(self):
1942 self._cmd_set_commit_gerrit_common(2)
1943 self.assertEqual(0, git_cl.main(['set-commit']))
1944
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001945 def test_description_display(self):
1946 out = StringIO.StringIO()
1947 self.mock(git_cl.sys, 'stdout', out)
1948
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001949 self.mock(git_cl, 'Changelist', ChangelistMock)
1950 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001951
1952 self.assertEqual(0, git_cl.main(['description', '-d']))
1953 self.assertEqual('foo\n', out.getvalue())
1954
iannucci3c972b92016-08-17 13:24:10 -07001955 def test_StatusFieldOverrideIssueMissingArgs(self):
1956 out = StringIO.StringIO()
1957 self.mock(git_cl.sys, 'stderr', out)
1958
1959 try:
1960 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1961 except SystemExit as ex:
1962 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001963 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001964
1965 out = StringIO.StringIO()
1966 self.mock(git_cl.sys, 'stderr', out)
1967
1968 try:
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00001969 self.assertEqual(git_cl.main(['status', '--issue', '1', '--gerrit']), 0)
iannucci3c972b92016-08-17 13:24:10 -07001970 except SystemExit as ex:
1971 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001972 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001973
1974 def test_StatusFieldOverrideIssue(self):
1975 out = StringIO.StringIO()
1976 self.mock(git_cl.sys, 'stdout', out)
1977
1978 def assertIssue(cl_self, *_args):
1979 self.assertEquals(cl_self.issue, 1)
1980 return 'foobar'
1981
1982 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
iannuccie53c9352016-08-17 14:40:40 -07001983 self.assertEqual(
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00001984 git_cl.main(['status', '--issue', '1', '--gerrit', '--field', 'desc']),
iannuccie53c9352016-08-17 14:40:40 -07001985 0)
iannucci3c972b92016-08-17 13:24:10 -07001986 self.assertEqual(out.getvalue(), 'foobar\n')
1987
iannuccie53c9352016-08-17 14:40:40 -07001988 def test_SetCloseOverrideIssue(self):
1989 def assertIssue(cl_self, *_args):
1990 self.assertEquals(cl_self.issue, 1)
1991 return 'foobar'
1992
1993 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1994 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
iannuccie53c9352016-08-17 14:40:40 -07001995 self.assertEqual(
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00001996 git_cl.main(['set-close', '--issue', '1', '--gerrit']), 0)
iannuccie53c9352016-08-17 14:40:40 -07001997
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00001998 def test_description(self):
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001999 out = StringIO.StringIO()
2000 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002001 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002002 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2003 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2004 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2005 ((['git', 'config', 'remote.origin.url'],),
2006 'https://chromium.googlesource.com/my/repo'),
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00002007 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002008 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002009 {
2010 'current_revision': 'sha1',
2011 'revisions': {'sha1': {
2012 'commit': {'message': 'foobar'},
2013 }},
2014 }),
2015 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002016 self.assertEqual(0, git_cl.main([
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00002017 'description',
2018 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
2019 '-d']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002020 self.assertEqual('foobar\n', out.getvalue())
2021
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002022 def test_description_set_raw(self):
2023 out = StringIO.StringIO()
2024 self.mock(git_cl.sys, 'stdout', out)
2025
2026 self.mock(git_cl, 'Changelist', ChangelistMock)
2027 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2028
2029 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2030 self.assertEqual('hihi', ChangelistMock.desc)
2031
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002032 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002033 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002034
2035 def RunEditor(desc, _, **kwargs):
2036 self.assertEquals(
2037 '# Enter a description of the change.\n'
2038 '# This will be displayed on the codereview site.\n'
2039 '# The first line will also be used as the subject of the review.\n'
2040 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002041 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002042 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002043 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002044 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002045 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002046
dsansomee2d6fd92016-09-08 00:10:47 -07002047 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002048 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002049
2050 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2051 self.mock(git_cl.Changelist, 'GetDescription',
2052 lambda *args: current_desc)
2053 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2054 UpdateDescriptionRemote)
2055 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2056
2057 self.calls = [
2058 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002059 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002060 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2061 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002062 ((['git', 'config', 'core.editor'],), 'vi'),
2063 ]
2064 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2065
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002066 def test_description_set_stdin(self):
2067 out = StringIO.StringIO()
2068 self.mock(git_cl.sys, 'stdout', out)
2069
2070 self.mock(git_cl, 'Changelist', ChangelistMock)
2071 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2072
2073 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2074 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2075
kmarshall3bff56b2016-06-06 18:31:47 -07002076 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002077 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2078
kmarshall3bff56b2016-06-06 18:31:47 -07002079 self.calls = \
2080 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2081 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002082 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002083 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2084 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002085 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2086 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2087 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002088 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2089 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2090 ((['git', 'branch', '-D', 'foo'],), '')]
2091
kmarshall3bff56b2016-06-06 18:31:47 -07002092 self.mock(git_cl, 'get_cl_statuses',
2093 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002094 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2095 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2096 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002097
2098 self.assertEqual(0, git_cl.main(['archive', '-f']))
2099
2100 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002101 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002102 self.calls = \
2103 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2104 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002105 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002106 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2107 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002108 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2109
kmarshall9249e012016-08-23 12:02:16 -07002110 self.mock(git_cl, 'get_cl_statuses',
2111 lambda branches, fine_grained, max_processes:
2112 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2113
2114 self.assertEqual(1, git_cl.main(['archive', '-f']))
2115
2116 def test_archive_dry_run(self):
2117 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2118
2119 self.calls = \
2120 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2121 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2122 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2123 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2124 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2125 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2126 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2127 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2128 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002129
2130 self.mock(git_cl, 'get_cl_statuses',
2131 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002132 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2133 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2134 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002135
kmarshall9249e012016-08-23 12:02:16 -07002136 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2137
2138 def test_archive_no_tags(self):
2139 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2140
2141 self.calls = \
2142 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2143 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2144 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2145 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2146 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2147 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2148 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2149 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2150 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2151 ((['git', 'branch', '-D', 'foo'],), '')]
2152
2153 self.mock(git_cl, 'get_cl_statuses',
2154 lambda branches, fine_grained, max_processes:
2155 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2156 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2157 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2158
2159 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002160
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002161 def test_cmd_issue_erase_existing(self):
2162 out = StringIO.StringIO()
2163 self.mock(git_cl.sys, 'stdout', out)
2164 self.calls = [
2165 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002166 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2167 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002168 # Let this command raise exception (retcode=1) - it should be ignored.
2169 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002170 CERR1),
2171 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2172 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002173 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2174 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2175 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002176 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002177 ]
2178 self.assertEqual(0, git_cl.main(['issue', '0']))
2179
Aaron Gable400e9892017-07-12 15:31:21 -07002180 def test_cmd_issue_erase_existing_with_change_id(self):
2181 out = StringIO.StringIO()
2182 self.mock(git_cl.sys, 'stdout', out)
2183 self.mock(git_cl.Changelist, 'GetDescription',
2184 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2185 self.calls = [
2186 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2187 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2188 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002189 # Let this command raise exception (retcode=1) - it should be ignored.
2190 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2191 CERR1),
2192 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2193 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2194 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2195 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2196 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002197 ((['git', 'log', '-1', '--format=%B'],),
2198 'This is a description\n\nChange-Id: Ideadbeef'),
2199 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002200 ]
2201 self.assertEqual(0, git_cl.main(['issue', '0']))
2202
phajdan.jre328cf92016-08-22 04:12:17 -07002203 def test_cmd_issue_json(self):
2204 out = StringIO.StringIO()
2205 self.mock(git_cl.sys, 'stdout', out)
2206 self.calls = [
2207 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002208 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002209 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2210 ((['git', 'config', 'rietveld.server'],),
2211 'https://codereview.chromium.org'),
2212 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2213 (('write_json', 'output.json',
2214 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2215 ''),
2216 ]
2217 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2218
tandrii8c5a3532016-11-04 07:52:02 -07002219 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2220 self.mock(git_cl.Changelist, 'GetChange',
2221 lambda _, *a: (
2222 self._mocked_call(['GetChange']+list(a))))
2223 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2224 lambda *_, **__: (
2225 self._mocked_call(['DoGetTryMasters'])))
2226 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2227 lambda _, s: self._mocked_call(['SetCQState', s]))
2228
tandrii8c5a3532016-11-04 07:52:02 -07002229 self.calls = [
2230 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2231 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2232 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2233 ((['git', 'config', 'branch.feature.gerritserver'],),
2234 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002235 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2236 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2237 ((['git', 'config', 'remote.origin.url'],),
2238 'https://chromium.googlesource.com/depot_tools'),
2239 (('GetChangeDetail', 'chromium-review.googlesource.com',
2240 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002241 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2242 'project': 'depot_tools',
2243 'status': 'OPEN',
2244 'owner': {'email': 'owner@e.mail'},
2245 'revisions': {
2246 'deadbeaf': {
2247 '_number': 6,
2248 },
2249 'beeeeeef': {
2250 '_number': 7,
2251 'fetch': {'http': {
2252 'url': 'https://chromium.googlesource.com/depot_tools',
2253 'ref': 'refs/changes/56/123456/7'
2254 }},
2255 },
2256 },
2257 }),
tandrii8c5a3532016-11-04 07:52:02 -07002258 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2259 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2260 ((['get_or_create_merge_base', 'feature', 'feature'],),
2261 'fake_ancestor_sha'),
2262 ((['GetChange', 'fake_ancestor_sha', None], ),
2263 git_cl.presubmit_support.GitChange(
2264 '', '', '', '', '', '', '', '')),
2265 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2266 ((['DoGetTryMasters'], ), None),
2267 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2268 ]
2269 out = StringIO.StringIO()
2270 self.mock(git_cl.sys, 'stdout', out)
2271 self.assertEqual(0, git_cl.main(['try']))
2272 self.assertEqual(
2273 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002274 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002275 'https://chromium-review.googlesource.com/123456\n')
2276
tandrii8c5a3532016-11-04 07:52:02 -07002277 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2278 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2279 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2280
tandrii8c5a3532016-11-04 07:52:02 -07002281 self.calls = [
2282 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2283 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2284 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2285 ((['git', 'config', 'branch.feature.gerritserver'],),
2286 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002287 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2288 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2289 ((['git', 'config', 'remote.origin.url'],),
2290 'https://chromium.googlesource.com/depot_tools'),
2291 (('GetChangeDetail', 'chromium-review.googlesource.com',
2292 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002293 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002294 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002295 'status': 'OPEN',
2296 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002297 'revisions': {
2298 'deadbeaf': {
2299 '_number': 6,
2300 },
2301 'beeeeeef': {
2302 '_number': 7,
2303 'fetch': {'http': {
2304 'url': 'https://chromium.googlesource.com/depot_tools',
2305 'ref': 'refs/changes/56/123456/7'
2306 }},
2307 },
2308 },
2309 }),
2310 ]
2311
2312 def _buildbucket_retry(*_, **kw):
2313 # self.maxDiff = 10000
2314 body = json.loads(kw['body'])
2315 self.assertEqual(len(body['builds']), 1)
2316 build = body['builds'][0]
2317 params = json.loads(build.pop('parameters_json'))
2318 self.assertEqual(params, {
2319 u'builder_name': u'win',
2320 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2321 u'revision': None}],
2322 u'properties': {
2323 u'category': u'git_cl_try',
2324 u'key': u'val',
2325 u'json': [{u'a': 1}, None],
tandrii8c5a3532016-11-04 07:52:02 -07002326
2327 u'patch_gerrit_url':
2328 u'https://chromium-review.googlesource.com',
2329 u'patch_issue': 123456,
2330 u'patch_project': u'depot_tools',
2331 u'patch_ref': u'refs/changes/56/123456/7',
2332 u'patch_repository_url':
2333 u'https://chromium.googlesource.com/depot_tools',
2334 u'patch_set': 7,
2335 u'patch_storage': u'gerrit',
2336 }
2337 })
2338 self.assertEqual(build, {
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002339 u'bucket': u'luci.chromium.try',
tandrii8c5a3532016-11-04 07:52:02 -07002340 u'client_operation_id': u'uuid4',
2341 u'tags': [
2342 u'builder:win',
2343 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2344 u'user_agent:git_cl_try',
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002345 ],
tandrii8c5a3532016-11-04 07:52:02 -07002346 })
2347
2348 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2349
2350 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2351 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002352 'try', '-B', 'luci.chromium.try', '-b', 'win',
tandrii8c5a3532016-11-04 07:52:02 -07002353 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2354 self.assertRegexpMatches(
2355 git_cl.sys.stdout.getvalue(),
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002356 'Tried jobs on:\nBucket: luci.chromium.try')
tandriide281ae2016-10-12 06:02:30 -07002357
qyearsley123a4682016-10-26 09:12:17 -07002358 def test_git_cl_try_bots_on_multiple_masters(self):
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00002359 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2360 self.mock(git_cl.Changelist, 'GetChange',
2361 lambda _, *a: (
2362 self._mocked_call(['GetChange']+list(a))))
2363 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2364 lambda *_, **__: (
2365 self._mocked_call(['DoGetTryMasters'])))
2366 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2367 lambda _, s: self._mocked_call(['SetCQState', s]))
2368
qyearsley123a4682016-10-26 09:12:17 -07002369 self.calls = [
2370 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00002371 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2372 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2373 ((['git', 'config', 'branch.feature.gerritserver'],),
2374 'https://chromium-review.googlesource.com'),
2375 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2376 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2377 ((['git', 'config', 'remote.origin.url'],),
2378 'https://chromium.googlesource.com/depot_tools'),
2379 (('GetChangeDetail', 'chromium-review.googlesource.com',
2380 'depot_tools~123456',
2381 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2382 'project': 'depot_tools',
2383 'status': 'OPEN',
2384 'owner': {'email': 'owner@e.mail'},
2385 'revisions': {
2386 'deadbeaf': {
2387 '_number': 6,
2388 },
2389 'beeeeeef': {
2390 '_number': 7,
2391 'fetch': {'http': {
2392 'url': 'https://chromium.googlesource.com/depot_tools',
2393 'ref': 'refs/changes/56/123456/7'
2394 }},
2395 },
2396 },
2397 }),
qyearsley123a4682016-10-26 09:12:17 -07002398 ]
2399
2400 def _buildbucket_retry(*_, **kw):
2401 body = json.loads(kw['body'])
2402 self.assertEqual(len(body['builds']), 2)
2403
Nodir Turakulovb422e682018-02-20 22:51:30 -08002404 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2405 params = json.loads(body['builds'][0]['parameters_json'])
2406 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002407
Nodir Turakulovb422e682018-02-20 22:51:30 -08002408 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2409 params = json.loads(body['builds'][1]['parameters_json'])
2410 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002411
2412 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2413
2414 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002415 json.dumps({
2416 'builder1': {'bucket': 'bucket1'},
2417 'builder2': {'bucket': 'bucket2'},
2418 })))
qyearsley123a4682016-10-26 09:12:17 -07002419
2420 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2421 self.assertEqual(
2422 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2423 self.assertEqual(
2424 git_cl.sys.stdout.getvalue(),
2425 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002426 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002427 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002428 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002429 ' builder2: []\n'
2430 'To see results here, run: git cl try-results\n'
2431 'To see results in browser, run: git cl web\n')
2432
tandrii16e0b4e2016-06-07 10:34:28 -07002433 def _common_GerritCommitMsgHookCheck(self):
2434 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2435 self.mock(git_cl.os.path, 'abspath',
2436 lambda path: self._mocked_call(['abspath', path]))
2437 self.mock(git_cl.os.path, 'exists',
2438 lambda path: self._mocked_call(['exists', path]))
2439 self.mock(git_cl.gclient_utils, 'FileRead',
2440 lambda path: self._mocked_call(['FileRead', path]))
2441 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2442 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2443 self.calls = [
2444 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2445 ((['abspath', '../'],), '/abs/git_repo_root'),
2446 ]
2447 return git_cl.Changelist(codereview='gerrit', issue=123)
2448
2449 def test_GerritCommitMsgHookCheck_custom_hook(self):
2450 cl = self._common_GerritCommitMsgHookCheck()
2451 self.calls += [
2452 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2453 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2454 '#!/bin/sh\necho "custom hook"')
2455 ]
2456 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2457
2458 def test_GerritCommitMsgHookCheck_not_exists(self):
2459 cl = self._common_GerritCommitMsgHookCheck()
2460 self.calls += [
2461 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2462 ]
2463 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2464
2465 def test_GerritCommitMsgHookCheck(self):
2466 cl = self._common_GerritCommitMsgHookCheck()
2467 self.calls += [
2468 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2469 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2470 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002471 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002472 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2473 ''),
2474 ]
2475 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2476
tandriic4344b52016-08-29 06:04:54 -07002477 def test_GerritCmdLand(self):
2478 self.calls += [
2479 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2480 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2481 'deadbeaf'),
2482 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2483 ((['git', 'config', 'branch.feature.gerritserver'],),
2484 'chromium-review.googlesource.com'),
2485 ]
2486 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2487 cl._codereview_impl._GetChangeDetail = lambda _: {
2488 'labels': {},
2489 'current_revision': 'deadbeaf',
2490 }
agable32978d92016-11-01 12:55:02 -07002491 cl._codereview_impl._GetChangeCommit = lambda: {
2492 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002493 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002494 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2495 }
tandriic4344b52016-08-29 06:04:54 -07002496 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002497 out = StringIO.StringIO()
2498 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002499 self.assertEqual(0, cl.CMDLand(force=True,
2500 bypass_hooks=True,
2501 verbose=True,
2502 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002503 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002504 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002505
tandrii221ab252016-10-06 08:12:04 -07002506 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002507 '9000': {
2508 'id': '9000',
2509 'bucket': 'master.x.y',
2510 'created_by': 'user:someone@chromium.org',
2511 'created_ts': '147200002222000',
2512 'experimental': False,
2513 'parameters_json': json.dumps({
2514 'builder_name': 'my-bot',
2515 'properties': {'category': 'cq'},
2516 }),
2517 'status': 'STARTED',
2518 'tags': [
2519 'build_address:x.y/my-bot/2',
2520 'builder:my-bot',
2521 'experimental:false',
2522 'user_agent:cq',
2523 ],
2524 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2525 },
2526 '8000': {
2527 'id': '8000',
2528 'bucket': 'master.x.y',
2529 'created_by': 'user:someone@chromium.org',
2530 'created_ts': '147200001111000',
2531 'experimental': False,
2532 'failure_reason': 'BUILD_FAILURE',
2533 'parameters_json': json.dumps({
2534 'builder_name': 'my-bot',
2535 'properties': {'category': 'cq'},
2536 }),
2537 'result_details_json': json.dumps({
2538 'properties': {'buildnumber': 1},
2539 }),
2540 'result': 'FAILURE',
2541 'status': 'COMPLETED',
2542 'tags': [
2543 'build_address:x.y/my-bot/1',
2544 'builder:my-bot',
2545 'experimental:false',
2546 'user_agent:cq',
2547 ],
2548 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2549 },
2550 }
tandrii221ab252016-10-06 08:12:04 -07002551
2552 def test_write_try_results_json(self):
2553 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002554 {
2555 'bucket': 'master.x.y',
2556 'buildbucket_id': '8000',
2557 'builder_name': 'my-bot',
2558 'created_ts': '147200001111000',
2559 'experimental': False,
2560 'failure_reason': 'BUILD_FAILURE',
2561 'result': 'FAILURE',
2562 'status': 'COMPLETED',
2563 'tags': [
2564 'build_address:x.y/my-bot/1',
2565 'builder:my-bot',
2566 'experimental:false',
2567 'user_agent:cq',
2568 ],
2569 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2570 },
2571 {
2572 'bucket': 'master.x.y',
2573 'buildbucket_id': '9000',
2574 'builder_name': 'my-bot',
2575 'created_ts': '147200002222000',
2576 'experimental': False,
2577 'failure_reason': None,
2578 'result': None,
2579 'status': 'STARTED',
2580 'tags': [
2581 'build_address:x.y/my-bot/2',
2582 'builder:my-bot',
2583 'experimental:false',
2584 'user_agent:cq',
2585 ],
2586 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2587 },
tandrii221ab252016-10-06 08:12:04 -07002588 ]
2589 self.calls = [(('write_json', 'output.json', expected_output), '')]
2590 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2591
tandrii45b2a582016-10-11 03:14:16 -07002592 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002593 out = StringIO.StringIO()
2594 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002595 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2596 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002597 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2598 self._mocked_call(['get_authenticator_for_host', host]))
2599 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2600 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002601
tandrii45b2a582016-10-11 03:14:16 -07002602 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2603 self._setup_fetch_try_jobs(most_recent_patchset=13)
2604 self.calls += [
2605 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2606 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2607 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002608 # TODO(tandrii): Uncomment the below if we decide to support checking
2609 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002610 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002611 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002612 ((['git', 'config', 'branch.feature.gerritserver'],),
2613 'https://x-review.googlesource.com'),
2614 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2615 AuthenticatorMock()),
2616 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2617
2618 def test_fetch_try_jobs_none_gerrit(self):
2619 self._setup_fetch_try_jobs_gerrit({})
2620 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002621 # TODO(tandrii): Uncomment the below if we decide to support checking
2622 # patchsets for Gerrit.
2623 # self.assertRegexpMatches(
2624 # sys.stdout.getvalue(),
2625 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002626 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2627
2628 def test_fetch_try_jobs_some_gerrit(self):
2629 self._setup_fetch_try_jobs_gerrit({
2630 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2631 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002632 # TODO(tandrii): Uncomment the below if we decide to support checking
2633 # patchsets for Gerrit.
2634 # self.calls.remove(
2635 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002636 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2637
2638 # ... and doesn't result in warning.
2639 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2640 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002641 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2642 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2643
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002644 def _mock_gerrit_changes_for_detail_cache(self):
2645 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002646
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002647 def test_gerrit_change_detail_cache_simple(self):
2648 self._mock_gerrit_changes_for_detail_cache()
2649 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002650 (('GetChangeDetail', 'host', 'my%2Frepo~1', []), 'a'),
2651 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b'),
2652 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002653 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002654 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002655 cl1._cached_remote_url = (
2656 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002657 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002658 cl2._cached_remote_url = (
2659 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002660 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2661 self.assertEqual(cl1._GetChangeDetail(), 'a')
2662 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
2663 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
2664 self.assertEqual(cl1._GetChangeDetail(), 'a')
2665 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002666
2667 def test_gerrit_change_detail_cache_options(self):
2668 self._mock_gerrit_changes_for_detail_cache()
2669 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002670 (('GetChangeDetail', 'host', 'repo~1', ['C', 'A', 'B']), 'cab'),
2671 (('GetChangeDetail', 'host', 'repo~1', ['A', 'D']), 'ad'),
2672 (('GetChangeDetail', 'host', 'repo~1', ['A']), 'a'), # no_cache=True
2673 # no longer in cache.
2674 (('GetChangeDetail', 'host', 'repo~1', ['B']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002675 ]
2676 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002677 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002678 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2679 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2680 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2681 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2682 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2683 self.assertEqual(cl._GetChangeDetail(), 'cab')
2684
2685 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2686 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2687 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2688 self.assertEqual(cl._GetChangeDetail(), 'cab')
2689
2690 # Finally, no_cache should invalidate all caches for given change.
2691 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2692 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2693
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002694 def test_gerrit_description_caching(self):
2695 def gen_detail(rev, desc):
2696 return {
2697 'current_revision': rev,
2698 'revisions': {rev: {'commit': {'message': desc}}}
2699 }
2700 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002701 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002702 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2703 gen_detail('rev1', 'desc1')),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002704 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002705 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2706 gen_detail('rev2', 'desc2')),
2707 ]
2708
2709 self._mock_gerrit_changes_for_detail_cache()
2710 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002711 cl._cached_remote_url = (
2712 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002713 self.assertEqual(cl.GetDescription(), 'desc1')
2714 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
2715 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002716
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002717 def test_print_current_creds(self):
2718 class CookiesAuthenticatorMock(object):
2719 def __init__(self):
2720 self.gitcookies = {
2721 'host.googlesource.com': ('user', 'pass'),
2722 'host-review.googlesource.com': ('user', 'pass'),
2723 }
2724 self.netrc = self
2725 self.netrc.hosts = {
2726 'github.com': ('user2', None, 'pass2'),
2727 'host2.googlesource.com': ('user3', None, 'pass'),
2728 }
2729 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2730 CookiesAuthenticatorMock)
2731 self.mock(sys, 'stdout', StringIO.StringIO())
2732 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2733 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2734 ' Host\t User\t Which file',
2735 '============================\t=====\t===========',
2736 'host-review.googlesource.com\t user\t.gitcookies',
2737 ' host.googlesource.com\t user\t.gitcookies',
2738 ' host2.googlesource.com\tuser3\t .netrc',
2739 ])
2740 sys.stdout.buf = ''
2741 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2742 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2743 ' Host\tUser\t Which file',
2744 '============================\t====\t===========',
2745 'host-review.googlesource.com\tuser\t.gitcookies',
2746 ' host.googlesource.com\tuser\t.gitcookies',
2747 ])
2748
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002749 def _common_creds_check_mocks(self):
2750 def exists_mock(path):
2751 dirname = os.path.dirname(path)
2752 if dirname == os.path.expanduser('~'):
2753 dirname = '~'
2754 base = os.path.basename(path)
2755 if base in ('.netrc', '.gitcookies'):
2756 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
2757 # git cl also checks for existence other files not relevant to this test.
2758 return None
2759 self.mock(os.path, 'exists', exists_mock)
2760 self.mock(sys, 'stdout', StringIO.StringIO())
2761
2762 def test_creds_check_gitcookies_not_configured(self):
2763 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002764 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002765 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002766 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08002767 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002768 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
2769 (('os.path.exists', '~/.netrc'), True),
2770 (('ask_for_data', 'Press Enter to setup .gitcookies, '
2771 'or Ctrl+C to abort'), ''),
2772 ((['git', 'config', '--global', 'http.cookiefile',
2773 os.path.expanduser('~/.gitcookies')], ), ''),
2774 ]
2775 self.assertEqual(0, git_cl.main(['creds-check']))
2776 self.assertRegexpMatches(
2777 sys.stdout.getvalue(),
2778 '^You seem to be using outdated .netrc for git credentials:')
2779 self.assertRegexpMatches(
2780 sys.stdout.getvalue(),
2781 '\nConfigured git to use .gitcookies from')
2782
2783 def test_creds_check_gitcookies_configured_custom_broken(self):
2784 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002785 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002786 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002787 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08002788 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002789 ((['git', 'config', '--global', 'http.cookiefile'],),
2790 '/custom/.gitcookies'),
2791 (('os.path.exists', '/custom/.gitcookies'), False),
2792 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
2793 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
2794 ((['git', 'config', '--global', 'http.cookiefile',
2795 os.path.expanduser('~/.gitcookies')], ), ''),
2796 ]
2797 self.assertEqual(0, git_cl.main(['creds-check']))
2798 self.assertRegexpMatches(
2799 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002800 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002801 self.assertRegexpMatches(
2802 sys.stdout.getvalue(),
2803 'However, your configured .gitcookies file is missing.')
2804
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002805 def test_git_cl_comment_add_gerrit(self):
2806 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07002807 lambda host, change, msg, ready:
2808 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002809 self.calls = [
2810 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2811 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2812 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
2813 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
2814 'origin/master'),
2815 ((['git', 'config', 'remote.origin.url'],),
2816 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002817 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
2818 'msg', None),
Aaron Gable636b13f2017-07-14 10:42:48 -07002819 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002820 ]
2821 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
2822 '-a', 'msg']))
2823
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002824 def test_git_cl_comments_fetch_gerrit(self):
2825 self.mock(sys, 'stdout', StringIO.StringIO())
2826 self.calls = [
2827 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2828 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2829 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
2830 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
2831 'origin/master'),
2832 ((['git', 'config', 'remote.origin.url'],),
2833 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002834 (('GetChangeDetail', 'chromium-review.googlesource.com',
2835 'infra%2Finfra~1',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002836 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002837 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002838 'messages': [
2839 {
2840 u'_revision_number': 1,
2841 u'author': {
2842 u'_account_id': 1111084,
2843 u'email': u'commit-bot@chromium.org',
2844 u'name': u'Commit Bot'
2845 },
2846 u'date': u'2017-03-15 20:08:45.000000000',
2847 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07002848 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002849 u'tag': u'autogenerated:cq:dry-run'
2850 },
2851 {
2852 u'_revision_number': 2,
2853 u'author': {
2854 u'_account_id': 11151243,
2855 u'email': u'owner@example.com',
2856 u'name': u'owner'
2857 },
2858 u'date': u'2017-03-16 20:00:41.000000000',
2859 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2860 u'message': u'PTAL',
2861 },
2862 {
2863 u'_revision_number': 2,
2864 u'author': {
2865 u'_account_id': 148512 ,
2866 u'email': u'reviewer@example.com',
2867 u'name': u'reviewer'
2868 },
2869 u'date': u'2017-03-17 05:19:37.500000000',
2870 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2871 u'message': u'Patch Set 2: Code-Review+1',
2872 },
2873 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002874 }),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002875 (('GetChangeComments', 'chromium-review.googlesource.com',
2876 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002877 '/COMMIT_MSG': [
2878 {
2879 'author': {'email': u'reviewer@example.com'},
2880 'updated': u'2017-03-17 05:19:37.500000000',
2881 'patch_set': 2,
2882 'side': 'REVISION',
2883 'message': 'Please include a bug link',
2884 },
2885 ],
2886 'codereview.settings': [
2887 {
2888 'author': {'email': u'owner@example.com'},
2889 'updated': u'2017-03-16 20:00:41.000000000',
2890 'patch_set': 2,
2891 'side': 'PARENT',
2892 'line': 42,
2893 'message': 'I removed this because it is bad',
2894 },
2895 ]
Leszek Swirski45b20c42018-09-17 17:05:26 +00002896 })
2897 ] * 2 + [
2898 (('write_json', 'output.json', [
2899 {
2900 u'date': u'2017-03-16 20:00:41.000000',
2901 u'message': (
2902 u'PTAL\n' +
2903 u'\n' +
2904 u'codereview.settings\n' +
2905 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2906 u'c/1/2/codereview.settings#b42\n' +
2907 u' I removed this because it is bad\n'),
2908 u'approval': False,
2909 u'disapproval': False,
2910 u'sender': u'owner@example.com'
2911 }, {
2912 u'date': u'2017-03-17 05:19:37.500000',
2913 u'message': (
2914 u'Patch Set 2: Code-Review+1\n' +
2915 u'\n' +
2916 u'/COMMIT_MSG\n' +
2917 u' PS2, File comment: https://chromium-review.googlesource' +
2918 u'.com/c/1/2//COMMIT_MSG#\n' +
2919 u' Please include a bug link\n'),
2920 u'approval': False,
2921 u'disapproval': False,
2922 u'sender': u'reviewer@example.com'
2923 }
2924 ]),'')
2925 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002926 expected_comments_summary = [
2927 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002928 message=(
2929 u'PTAL\n' +
2930 u'\n' +
2931 u'codereview.settings\n' +
2932 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2933 u'c/1/2/codereview.settings#b42\n' +
2934 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002935 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
2936 disapproval=False, approval=False, sender=u'owner@example.com'),
2937 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002938 message=(
2939 u'Patch Set 2: Code-Review+1\n' +
2940 u'\n' +
2941 u'/COMMIT_MSG\n' +
2942 u' PS2, File comment: https://chromium-review.googlesource.com/' +
2943 u'c/1/2//COMMIT_MSG#\n' +
2944 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002945 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
2946 disapproval=False, approval=False, sender=u'reviewer@example.com'),
2947 ]
2948 cl = git_cl.Changelist(codereview='gerrit', issue=1)
2949 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00002950 self.assertEqual(0, git_cl.main(['comment', '-i', '1',
Leszek Swirski45b20c42018-09-17 17:05:26 +00002951 '-j', 'output.json']))
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002952
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002953 def test_get_remote_url_with_mirror(self):
2954 original_os_path_isdir = os.path.isdir
2955 def selective_os_path_isdir_mock(path):
2956 if path == '/cache/this-dir-exists':
2957 return self._mocked_call('os.path.isdir', path)
2958 return original_os_path_isdir(path)
2959 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
2960
2961 url = 'https://chromium.googlesource.com/my/repo'
2962 self.calls = [
2963 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2964 ((['git', 'config', 'branch.master.merge'],), 'master'),
2965 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2966 ((['git', 'config', 'remote.origin.url'],),
2967 '/cache/this-dir-exists'),
2968 (('os.path.isdir', '/cache/this-dir-exists'),
2969 True),
2970 # Runs in /cache/this-dir-exists.
2971 ((['git', 'config', 'remote.origin.url'],),
2972 url),
2973 ]
2974 cl = git_cl.Changelist(codereview='gerrit', issue=1)
2975 self.assertEqual(cl.GetRemoteUrl(), url)
2976 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
2977
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002978 def test_gerrit_change_identifier_with_project(self):
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002979 self.calls = [
2980 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2981 ((['git', 'config', 'branch.master.merge'],), 'master'),
2982 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2983 ((['git', 'config', 'remote.origin.url'],),
2984 'https://chromium.googlesource.com/a/my/repo.git/'),
2985 ]
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002986 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
2987 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
2988
2989 def test_gerrit_change_identifier_without_project(self):
2990 self.calls = [
2991 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2992 ((['git', 'config', 'branch.master.merge'],), 'master'),
2993 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2994 ((['git', 'config', 'remote.origin.url'],), CERR1),
2995 ]
2996 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
2997 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002998
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002999
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003000if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003001 logging.basicConfig(
3002 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003003 unittest.main()