blob: 0c1ab8670ecbf29a5aa25010f48b79a997de783f [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Unit tests for git_cl.py."""
7
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01009import datetime
tandriide281ae2016-10-12 06:02:30 -070010import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010011import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000013import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070015import tempfile
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000017import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000018
19sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
20
21from testing_support.auto_stub import TestCase
22
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000023import metrics
24# We have to disable monitoring before importing git_cl.
25metrics.DISABLE_METRICS_COLLECTION = True
26
Eric Boren2fb63102018-10-05 13:05:03 +000027import gerrit_util
maruel@chromium.orgddd59412011-11-30 14:20:38 +000028import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000029import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000030import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000031import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000032
tandrii5d48c322016-08-18 16:19:37 -070033def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
34 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
35
36
37CERR1 = callError(1)
38
39
Aaron Gable9a03ae02017-11-03 11:31:07 -070040def MakeNamedTemporaryFileMock(expected_content):
41 class NamedTemporaryFileMock(object):
42 def __init__(self, *args, **kwargs):
43 self.name = '/tmp/named'
44 self.expected_content = expected_content
45
46 def __enter__(self):
47 return self
48
49 def __exit__(self, _type, _value, _tb):
50 pass
51
52 def write(self, content):
53 if self.expected_content:
54 assert content == self.expected_content
55
56 def close(self):
57 pass
58
59 return NamedTemporaryFileMock
60
61
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000062class ChangelistMock(object):
63 # A class variable so we can access it when we don't have access to the
64 # instance that's being set.
65 desc = ""
66 def __init__(self, **kwargs):
67 pass
68 def GetIssue(self):
69 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080070 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000071 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070072 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000073 ChangelistMock.desc = desc
74
tandrii5d48c322016-08-18 16:19:37 -070075
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000076class PresubmitMock(object):
77 def __init__(self, *args, **kwargs):
78 self.reviewers = []
Daniel Cheng7227d212017-11-17 08:12:37 -080079 self.more_cc = ['chromium-reviews+test-more-cc@chromium.org']
80
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000081 @staticmethod
82 def should_continue():
83 return True
84
85
skobes6468b902016-10-24 08:45:10 -070086class GitCheckoutMock(object):
87 def __init__(self, *args, **kwargs):
88 pass
89
90 @staticmethod
91 def reset():
92 GitCheckoutMock.conflict = False
93
94 def apply_patch(self, p):
95 if GitCheckoutMock.conflict:
96 raise Exception('failed')
97
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000098
99class WatchlistsMock(object):
100 def __init__(self, _):
101 pass
102 @staticmethod
103 def GetWatchersForPaths(_):
104 return ['joe@example.com']
105
106
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000107class CodereviewSettingsFileMock(object):
108 def __init__(self):
109 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800110 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000111 def read(self):
112 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000113 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000114
115
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000116class AuthenticatorMock(object):
117 def __init__(self, *_args):
118 pass
119 def has_cached_credentials(self):
120 return True
tandrii221ab252016-10-06 08:12:04 -0700121 def authorize(self, http):
122 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000123
124
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100125def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000126 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
127
128 Usage:
129 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100130 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000131
132 OR
133 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100134 CookiesAuthenticatorMockFactory(
135 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000136 """
137 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800138 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000139 # Intentionally not calling super() because it reads actual cookie files.
140 pass
141 @classmethod
142 def get_gitcookies_path(cls):
143 return '~/.gitcookies'
144 @classmethod
145 def get_netrc_path(cls):
146 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100147 def _get_auth_for_host(self, host):
148 if same_auth:
149 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000150 return (hosts_with_creds or {}).get(host)
151 return CookiesAuthenticatorMock
152
Aaron Gable9a03ae02017-11-03 11:31:07 -0700153
kmarshall9249e012016-08-23 12:02:16 -0700154class MockChangelistWithBranchAndIssue():
155 def __init__(self, branch, issue):
156 self.branch = branch
157 self.issue = issue
158 def GetBranch(self):
159 return self.branch
160 def GetIssue(self):
161 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000162
tandriic2405f52016-10-10 08:13:15 -0700163
164class SystemExitMock(Exception):
165 pass
166
167
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000168class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100169 def test_get_description(self):
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +0000170 cl = git_cl.Changelist(issue=1, codereview='gerrit',
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100171 codereview_host='host')
172 cl.description = 'x'
173 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800174 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100175 self.assertEquals(cl.GetDescription(), 'x')
176 self.assertEquals(cl.GetDescription(force=True), 'y')
177 self.assertEquals(cl.GetDescription(), 'y')
178
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700179 def test_description_footers(self):
180 cl = git_cl.Changelist(issue=1, codereview='gerrit',
181 codereview_host='host')
182 cl.description = '\n'.join([
183 'This is some message',
184 '',
185 'It has some lines',
186 'and, also',
187 '',
188 'Some: Really',
189 'Awesome: Footers',
190 ])
191 cl.has_description = True
192 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
193 msg, footers = cl.GetDescriptionFooters()
194 self.assertEquals(
195 msg, ['This is some message', '', 'It has some lines', 'and, also'])
196 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
197
198 msg.append('wut')
199 footers.append(('gnarly-dude', 'beans'))
200 cl.UpdateDescriptionFooters(msg, footers)
201 self.assertEquals(cl.GetDescription().splitlines(), [
202 'This is some message',
203 '',
204 'It has some lines',
205 'and, also',
206 'wut'
207 '',
208 'Some: Really',
209 'Awesome: Footers',
210 'Gnarly-Dude: beans',
211 ])
212
tandriif9aefb72016-07-01 09:06:51 -0700213 def test_get_bug_line_values(self):
214 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
215 self.assertEqual(f('', ''), [])
216 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
217 self.assertEqual(f('v8', '456'), ['v8:456'])
218 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
219 # Not nice, but not worth carying.
220 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
221 ['v8:456', 'chromium:123', 'v8:123'])
222
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100223 def _test_git_number(self, parent_msg, dest_ref, child_msg,
224 parent_hash='parenthash'):
225 desc = git_cl.ChangeDescription(child_msg)
226 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
227 return desc.description
228
229 def assertEqualByLine(self, actual, expected):
230 self.assertEqual(actual.splitlines(), expected.splitlines())
231
232 def test_git_number_bad_parent(self):
233 with self.assertRaises(ValueError):
234 self._test_git_number('Parent', 'refs/heads/master', 'Child')
235
236 def test_git_number_bad_parent_footer(self):
237 with self.assertRaises(AssertionError):
238 self._test_git_number(
239 'Parent\n'
240 '\n'
241 'Cr-Commit-Position: wrong',
242 'refs/heads/master', 'Child')
243
244 def test_git_number_bad_lineage_ignored(self):
245 actual = self._test_git_number(
246 'Parent\n'
247 '\n'
248 'Cr-Commit-Position: refs/heads/master@{#1}\n'
249 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
250 'refs/heads/master', 'Child')
251 self.assertEqualByLine(
252 actual,
253 'Child\n'
254 '\n'
255 'Cr-Commit-Position: refs/heads/master@{#2}\n'
256 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
257
258 def test_git_number_same_branch(self):
259 actual = self._test_git_number(
260 'Parent\n'
261 '\n'
262 'Cr-Commit-Position: refs/heads/master@{#12}',
263 dest_ref='refs/heads/master',
264 child_msg='Child')
265 self.assertEqualByLine(
266 actual,
267 'Child\n'
268 '\n'
269 'Cr-Commit-Position: refs/heads/master@{#13}')
270
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200271 def test_git_number_same_branch_mixed_footers(self):
272 actual = self._test_git_number(
273 'Parent\n'
274 '\n'
275 'Cr-Commit-Position: refs/heads/master@{#12}',
276 dest_ref='refs/heads/master',
277 child_msg='Child\n'
278 '\n'
279 'Broken-by: design\n'
280 'BUG=123')
281 self.assertEqualByLine(
282 actual,
283 'Child\n'
284 '\n'
285 'Broken-by: design\n'
286 'BUG=123\n'
287 'Cr-Commit-Position: refs/heads/master@{#13}')
288
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100289 def test_git_number_same_branch_with_originals(self):
290 actual = self._test_git_number(
291 'Parent\n'
292 '\n'
293 'Cr-Commit-Position: refs/heads/master@{#12}',
294 dest_ref='refs/heads/master',
295 child_msg='Child\n'
296 '\n'
297 'Some users are smart and insert their own footers\n'
298 '\n'
299 'Cr-Whatever: value\n'
300 'Cr-Commit-Position: refs/copy/paste@{#22}')
301 self.assertEqualByLine(
302 actual,
303 'Child\n'
304 '\n'
305 'Some users are smart and insert their own footers\n'
306 '\n'
307 'Cr-Original-Whatever: value\n'
308 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
309 'Cr-Commit-Position: refs/heads/master@{#13}')
310
311 def test_git_number_new_branch(self):
312 actual = self._test_git_number(
313 'Parent\n'
314 '\n'
315 'Cr-Commit-Position: refs/heads/master@{#12}',
316 dest_ref='refs/heads/branch',
317 child_msg='Child')
318 self.assertEqualByLine(
319 actual,
320 'Child\n'
321 '\n'
322 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
323 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
324
325 def test_git_number_lineage(self):
326 actual = self._test_git_number(
327 'Parent\n'
328 '\n'
329 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
330 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
331 dest_ref='refs/heads/branch',
332 child_msg='Child')
333 self.assertEqualByLine(
334 actual,
335 'Child\n'
336 '\n'
337 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
338 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
339
340 def test_git_number_moooooooore_lineage(self):
341 actual = self._test_git_number(
342 'Parent\n'
343 '\n'
344 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
345 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
346 dest_ref='refs/heads/mooore',
347 child_msg='Child')
348 self.assertEqualByLine(
349 actual,
350 'Child\n'
351 '\n'
352 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
353 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
354 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
355
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100356 def test_git_number_ever_moooooooore_lineage(self):
Robert Iannucci456b0d62018-03-13 19:15:50 -0700357 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100358 actual = self._test_git_number(
359 'CQ commit on fresh new branch + numbering.\n'
360 '\n'
361 'NOTRY=True\n'
362 'NOPRESUBMIT=True\n'
363 'BUG=\n'
364 '\n'
365 'Review-Url: https://codereview.chromium.org/2577703003\n'
366 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
367 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
368 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
369 dest_ref='refs/heads/gnumb-test/cl',
370 child_msg='git cl on fresh new branch + numbering.\n'
371 '\n'
372 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
373 self.assertEqualByLine(
374 actual,
375 'git cl on fresh new branch + numbering.\n'
376 '\n'
377 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
378 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
379 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
380 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
381 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100382
383 def test_git_number_cherry_pick(self):
384 actual = self._test_git_number(
385 'Parent\n'
386 '\n'
387 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
388 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
389 dest_ref='refs/heads/branch',
390 child_msg='Child, which is cherry-pick from master\n'
391 '\n'
392 'Cr-Commit-Position: refs/heads/master@{#100}\n'
393 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
394 self.assertEqualByLine(
395 actual,
396 'Child, which is cherry-pick from master\n'
397 '\n'
398 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
399 '\n'
400 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
401 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
402 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
403
Andrii Shyshkalovd4c86732018-09-25 04:29:31 +0000404 def test_gerrit_mirror_hack(self):
405 cr = 'chromium-review.googlesource.com'
406 url0 = 'https://%s/a/changes/x?a=b' % cr
407 origMirrors = git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES
408 try:
409 git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES = ['us1', 'us2']
410 url1 = git_cl.gerrit_util._UseGerritMirror(url0, cr)
411 url2 = git_cl.gerrit_util._UseGerritMirror(url1, cr)
412 url3 = git_cl.gerrit_util._UseGerritMirror(url2, cr)
413
414 self.assertNotEqual(url1, url2)
415 self.assertEqual(sorted((url1, url2)), [
416 'https://us1-mirror-chromium-review.googlesource.com/a/changes/x?a=b',
417 'https://us2-mirror-chromium-review.googlesource.com/a/changes/x?a=b'])
418 self.assertEqual(url1, url3)
419 finally:
420 git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES = origMirrors
421
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000422 def test_valid_accounts(self):
423 mock_per_account = {
424 'u1': None, # 404, doesn't exist.
425 'u2': {
426 '_account_id': 123124,
427 'avatars': [],
428 'email': 'u2@example.com',
429 'name': 'User Number 2',
430 'status': 'OOO',
431 },
432 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
433 }
434 def GetAccountDetailsMock(_, account):
435 # Poor-man's mock library's side_effect.
436 v = mock_per_account.pop(account)
437 if isinstance(v, Exception):
438 raise v
439 return v
440
441 original = git_cl.gerrit_util.GetAccountDetails
442 try:
443 git_cl.gerrit_util.GetAccountDetails = GetAccountDetailsMock
444 actual = git_cl.gerrit_util.ValidAccounts(
445 'host', ['u1', 'u2', 'u3'], max_threads=1)
446 finally:
447 git_cl.gerrit_util.GetAccountDetails = original
448 self.assertEqual(actual, {
449 'u2': {
450 '_account_id': 123124,
451 'avatars': [],
452 'email': 'u2@example.com',
453 'name': 'User Number 2',
454 'status': 'OOO',
455 },
456 })
457
458
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000459
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200460class TestParseIssueURL(unittest.TestCase):
461 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
462 codereview=None, fail=False):
463 self.assertIsNotNone(parsed)
464 if fail:
465 self.assertFalse(parsed.valid)
466 return
467 self.assertTrue(parsed.valid)
468 self.assertEqual(parsed.issue, issue)
469 self.assertEqual(parsed.patchset, patchset)
470 self.assertEqual(parsed.hostname, hostname)
471 self.assertEqual(parsed.codereview, codereview)
472
473 def _run_and_validate(self, func, url, *args, **kwargs):
474 result = func(urlparse.urlparse(url))
475 if kwargs.pop('fail', False):
476 self.assertIsNone(result)
477 return None
478 self._validate(result, *args, fail=False, **kwargs)
479
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200480 def test_gerrit(self):
481 def test(url, issue=None, patchset=None, hostname=None, fail=None):
482 self._test_ParseIssueUrl(
483 git_cl._GerritChangelistImpl.ParseIssueURL,
484 url, issue, patchset, hostname, fail)
485 def test(url, *args, **kwargs):
486 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
487 *args, codereview='gerrit', **kwargs)
488
489 test('http://chrome-review.source.com/c/123',
490 123, None, 'chrome-review.source.com')
491 test('https://chrome-review.source.com/c/123/',
492 123, None, 'chrome-review.source.com')
493 test('https://chrome-review.source.com/c/123/4',
494 123, 4, 'chrome-review.source.com')
495 test('https://chrome-review.source.com/#/c/123/4',
496 123, 4, 'chrome-review.source.com')
497 test('https://chrome-review.source.com/c/123/4',
498 123, 4, 'chrome-review.source.com')
499 test('https://chrome-review.source.com/123',
500 123, None, 'chrome-review.source.com')
501 test('https://chrome-review.source.com/123/4',
502 123, 4, 'chrome-review.source.com')
503
504 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
505 test('https://chrome-review.source.com/c/abc/', fail=True)
506 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
507
508 def test_ParseIssueNumberArgument(self):
509 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200510 codereview_hint = kwargs.pop('hint', None)
511 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
512 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200513
514 test('123', 123)
515 test('', fail=True)
516 test('abc', fail=True)
517 test('123/1', fail=True)
518 test('123a', fail=True)
519 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +0000520
521 # Looks like Rietveld and Gerrit, but we should select Gerrit now
522 # w/ or w/o hint.
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200523 test('https://codereview.source.com/123',
524 123, None, 'codereview.source.com', 'gerrit',
525 hint='gerrit')
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +0000526 test('https://codereview.source.com/123',
527 123, None, 'codereview.source.com', 'gerrit')
528
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200529 # Gerrrit.
530 test('https://chrome-review.source.com/c/123/4',
531 123, 4, 'chrome-review.source.com', 'gerrit')
532 test('https://chrome-review.source.com/bad/123/4', fail=True)
533
534
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100535class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100536 def setUp(self):
537 super(GitCookiesCheckerTest, self).setUp()
538 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100539 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100540
541 def mock_hosts_creds(self, subhost_identity_pairs):
542 def ensure_googlesource(h):
543 if not h.endswith(self.c._GOOGLESOURCE):
544 assert not h.endswith('.')
545 return h + '.' + self.c._GOOGLESOURCE
546 return h
547 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
548 for h, i in subhost_identity_pairs]
549
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200550 def test_identity_parsing(self):
551 self.assertEqual(self.c._parse_identity('ldap.google.com'),
552 ('ldap', 'google.com'))
553 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
554 ('ldap', 'example.com'))
555 # Specical case because we know there are no subdomains in chromium.org.
556 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
557 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800558 # Pathological: ".period." can be either username OR domain, more likely
559 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200560 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
561 ('note', 'period.example.com'))
562
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100563 def test_analysis_nothing(self):
564 self.c._all_hosts = []
565 self.assertFalse(self.c.has_generic_host())
566 self.assertEqual(set(), self.c.get_conflicting_hosts())
567 self.assertEqual(set(), self.c.get_duplicated_hosts())
568 self.assertEqual(set(), self.c.get_partially_configured_hosts())
569 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
570
571 def test_analysis(self):
572 self.mock_hosts_creds([
573 ('.googlesource.com', 'git-example.chromium.org'),
574
575 ('chromium', 'git-example.google.com'),
576 ('chromium-review', 'git-example.google.com'),
577 ('chrome-internal', 'git-example.chromium.org'),
578 ('chrome-internal-review', 'git-example.chromium.org'),
579 ('conflict', 'git-example.google.com'),
580 ('conflict-review', 'git-example.chromium.org'),
581 ('dup', 'git-example.google.com'),
582 ('dup', 'git-example.google.com'),
583 ('dup-review', 'git-example.google.com'),
584 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200585 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100586 ])
587 self.assertTrue(self.c.has_generic_host())
588 self.assertEqual(set(['conflict.googlesource.com']),
589 self.c.get_conflicting_hosts())
590 self.assertEqual(set(['dup.googlesource.com']),
591 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200592 self.assertEqual(set(['partial.googlesource.com',
593 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100594 self.c.get_partially_configured_hosts())
595 self.assertEqual(set(['chromium.googlesource.com',
596 'chrome-internal.googlesource.com']),
597 self.c.get_hosts_with_wrong_identities())
598
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100599 def test_report_no_problems(self):
600 self.test_analysis_nothing()
601 self.mock(sys, 'stdout', StringIO.StringIO())
602 self.assertFalse(self.c.find_and_report_problems())
603 self.assertEqual(sys.stdout.getvalue(), '')
604
605 def test_report(self):
606 self.test_analysis()
607 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200608 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
609 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100610 self.assertTrue(self.c.find_and_report_problems())
611 with open(os.path.join(os.path.dirname(__file__),
612 'git_cl_creds_check_report.txt')) as f:
613 expected = f.read()
614 def by_line(text):
615 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700616 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200617 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100618
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800619
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000620class TestGitCl(TestCase):
621 def setUp(self):
622 super(TestGitCl, self).setUp()
623 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700624 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000625 self.mock(subprocess2, 'call', self._mocked_call)
626 self.mock(subprocess2, 'check_call', self._mocked_call)
627 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700628 self.mock(subprocess2, 'communicate',
629 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000630 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000631 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000632 self.mock(git_common, 'get_or_create_merge_base',
633 lambda *a: (
634 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000635 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000636 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000637 self.mock(git_cl, 'SaveDescriptionBackup', lambda _:
638 self._mocked_call('SaveDescriptionBackup'))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100639 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000640 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700641 self.mock(git_cl, 'write_json', lambda path, contents:
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000642 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000643 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
skobes6468b902016-10-24 08:45:10 -0700644 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
645 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000646 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000647 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000648 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100649 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
650 lambda *args, **kwargs: self._mocked_call(
651 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700652 self.mock(git_cl.gerrit_util, 'GetChangeComments',
653 lambda *args, **kwargs: self._mocked_call(
654 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100655 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700656 lambda h, i, reviewers, ccs, notify: self._mocked_call(
657 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700658 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700659 lambda h, i, msg=None, labels=None, notify=None:
660 self._mocked_call('SetReview', h, i, msg, labels, notify))
Andrii Shyshkalov733d4ec2018-04-19 11:48:58 -0700661 self.mock(git_cl.gerrit_util.LuciContextAuthenticator, 'is_luci',
662 staticmethod(lambda: False))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000663 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
664 classmethod(lambda _: False))
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000665 self.mock(git_cl.gerrit_util, 'ValidAccounts',
666 lambda host, accounts:
667 self._mocked_call('ValidAccounts', host, accounts))
tandriic2405f52016-10-10 08:13:15 -0700668 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100669 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000670 # It's important to reset settings to not have inter-tests interference.
671 git_cl.settings = None
672
673 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000674 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100675 self.assertEquals([], self.calls)
676 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000677 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100678 raise
679 # Sadly, has_failed() returns True if this OR any other tests before this
680 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200681 git_cl.logging.error(
682 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100683 'There are un-consumed self.calls after this test has finished.\n'
684 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700685 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200686 'If you are already running only this test, then **first** fix the '
687 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100688 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700689 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100690 'and follow instructions above.\n' +
691 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000692 finally:
693 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000695 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000696 self.assertTrue(
697 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700698 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000699 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000700 expected_args, result = top
701
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000702 # Also logs otherwise it could get caught in a try/finally and be hard to
703 # diagnose.
704 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700705 N = 5
706 prior_calls = '\n '.join(
707 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
708 for i, c in enumerate(self._calls_done[-N:]))
709 following_calls = '\n '.join(
710 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
711 for i, c in enumerate(self.calls[:N]))
712 extended_msg = (
713 'A few prior calls:\n %s\n\n'
714 'This (expected):\n @%d: %r\n'
715 'This (actual):\n @%d: %r\n\n'
716 'A few following expected calls:\n %s' %
717 (prior_calls, len(self._calls_done), expected_args,
718 len(self._calls_done), args, following_calls))
719 git_cl.logging.error(extended_msg)
720
tandrii99a72f22016-08-17 14:33:24 -0700721 self.fail('@%d\n'
722 ' Expected: %r\n'
723 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700724 len(self._calls_done), expected_args, args))
725
726 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700727 if isinstance(result, Exception):
728 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000729 return result
730
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100731 def test_ask_for_explicit_yes_true(self):
732 self.calls = [
733 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
734 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
735 ]
736 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
737
tandrii48df5812016-10-17 03:55:37 -0700738 def test_LoadCodereviewSettingsFromFile_gerrit(self):
739 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
740 self.calls = [
741 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
742 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
743 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
744 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
745 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700747 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
748 CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700750 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
751 CERR1),
752 ((['git', 'config', 'gerrit.host', 'true'],), ''),
753 ]
754 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
755
maruel@chromium.orga3353652011-11-30 14:26:57 +0000756 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000757 def _is_gerrit_calls(cls, gerrit=False):
758 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
759 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
760
761 @classmethod
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000762 def _git_post_upload_calls(cls):
763 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000764 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
765 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
766 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000767 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000768 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000769 ]
770
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000771 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000772 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000773 fake_ancestor = 'fake_ancestor'
774 fake_cl = 'fake_cl_for_patch'
775 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000776 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000777 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000778 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000779 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000780 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000781 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000782 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700784 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000785 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000786 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000787 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000788 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000789 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000791 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000792 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000793 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000794 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000795 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000796
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000797 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +0000798 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000799 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +0000800 if skip_auth_check:
801 return [((cmd, ), 'true')]
802
tandrii5d48c322016-08-18 16:19:37 -0700803 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000804 if issue:
805 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100806 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000807 ])
808 calls.extend([
809 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
810 ((['git', 'config', 'branch.master.remote'],), 'origin'),
811 ((['git', 'config', 'remote.origin.url'],),
812 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000813 ])
814 return calls
815
816 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100817 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200818 fetched_status=None, other_cl_owner=None,
819 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -0800820 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100821 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200822 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
823 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
824 ((['git', 'config', 'branch.master.gerritissue'],),
825 CERR1 if issue is None else str(issue)),
826 ]
827
828 if custom_cl_base:
829 ancestor_revision = custom_cl_base
830 else:
831 # Determine ancestor_revision to be merge base.
832 ancestor_revision = 'fake_ancestor_sha'
833 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000834 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000835 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000836 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200837 'refs/remotes/origin/master'],), ancestor_revision),
838 ]
839
840 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100841 calls += cls._gerrit_ensure_auth_calls(issue=issue)
842
843 if issue:
844 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100845 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +0000846 'my%2Frepo~123456',
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +0000847 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS']
848 ),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100849 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100850 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100851 'change_id': '123456789',
852 'current_revision': 'sha1_of_current_revision',
853 'revisions': { 'sha1_of_current_revision': {
854 'commit': {'message': fetched_description},
855 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100856 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +0100857 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100858 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100859 if fetched_status == 'ABANDONED':
860 calls += [
861 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
862 '123456 has been abandoned, new uploads are not '
863 'allowed'), SystemExitMock()),
864 ]
865 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100866 if other_cl_owner:
867 calls += [
868 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
869 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100870
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200871 calls += cls._git_sanity_checks(ancestor_revision, 'master',
872 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100873 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200874 ((['git', 'rev-parse', '--show-cdup'],), ''),
875 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000876
Aaron Gable7817f022017-12-12 09:43:17 -0800877 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
878 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200879 'M\t.gitignore\n'),
880 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100881 ]
882
883 if not issue:
884 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200885 ((['git', 'log', '--pretty=format:%s%n%n%b',
886 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000887 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100888 ]
889
890 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200891 ((['git', 'config', 'user.email'],), 'me@example.com'),
892 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
893 ([custom_cl_base] if custom_cl_base else
894 [ancestor_revision, 'HEAD']),),
895 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100896 ]
897 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +0000898
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000899 @classmethod
900 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700901 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000902 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -0700903 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +0100904 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +0000905 custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000906 if post_amend_description is None:
907 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -0700908 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200909 # Determined in `_gerrit_base_calls`.
910 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
911
912 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000913
tandriia60502f2016-06-20 02:01:53 -0700914 if squash_mode == 'default':
915 calls.extend([
916 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
917 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
918 ])
919 elif squash_mode in ('override_squash', 'override_nosquash'):
920 calls.extend([
921 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
922 'true' if squash_mode == 'override_squash' else 'false'),
923 ])
924 else:
925 assert squash_mode in ('squash', 'nosquash')
926
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000927 # If issue is given, then description is fetched from Gerrit instead.
928 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000929 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200930 ((['git', 'log', '--pretty=format:%s\n\n%b',
931 ((custom_cl_base + '..') if custom_cl_base else
932 'fake_ancestor_sha..HEAD')],),
933 description),
934 ]
Aaron Gableb56ad332017-01-06 15:24:31 -0800935 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000936 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -0800937 else:
938 if not title:
939 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200940 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
941 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -0800942 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000943 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000944 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000945 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200946 (('DownloadGerritHook', False), ''),
947 # Amending of commit message to get the Change-Id.
948 ((['git', 'log', '--pretty=format:%s\n\n%b',
949 determined_ancestor_revision + '..HEAD'],),
950 description),
951 ((['git', 'commit', '--amend', '-m', description],), ''),
952 ((['git', 'log', '--pretty=format:%s\n\n%b',
953 determined_ancestor_revision + '..HEAD'],),
954 post_amend_description)
955 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000956 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000957 if not issue:
958 # Prompting to edit description on first upload.
959 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200960 ((['git', 'config', 'core.editor'],), ''),
961 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000962 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000963 ref_to_push = 'abcdef0123456789'
964 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200965 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
966 ((['git', 'config', 'branch.master.remote'],), 'origin'),
967 ]
968
969 if custom_cl_base is None:
970 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000971 ((['get_or_create_merge_base', 'master',
972 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000973 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200974 ]
975 parent = 'origin/master'
976 else:
977 calls += [
978 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
979 'refs/remotes/origin/master'],),
980 callError(1)), # Means not ancenstor.
981 (('ask_for_data',
982 'Do you take responsibility for cleaning up potential mess '
983 'resulting from proceeding with upload? Press Enter to upload, '
984 'or Ctrl+C to abort'), ''),
985 ]
986 parent = custom_cl_base
987
988 calls += [
989 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
990 '0123456789abcdef'),
991 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -0700992 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200993 ref_to_push),
994 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000995 else:
996 ref_to_push = 'HEAD'
997
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000998 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000999 (('SaveDescriptionBackup',), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001000 ((['git', 'rev-list',
1001 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1002 ref_to_push],),
1003 '1hashPerLine\n'),
1004 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001005
Aaron Gableafd52772017-06-27 16:40:10 -07001006 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001007 ref_suffix = '%ready,notify=ALL'
1008 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001009 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001010 ref_suffix = '%wip'
1011 else:
1012 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001013
Aaron Gable70f4e242017-06-26 10:45:59 -07001014 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001015 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001016
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001017 calls += [
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +00001018 ((['git', 'config', 'rietveld.cc'],), ''),
1019 (('ValidAccounts', 'chromium-review.googlesource.com',
1020 sorted(reviewers) + ['joe@example.com',
1021 'chromium-reviews+test-more-cc@chromium.org'] + cc),
1022 {
1023 # TODO(tandrii): add here some valid accounts and make use of them.
1024 }),
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001025 ]
1026
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001027 calls.append((
1028 (['git', 'push',
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001029 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001030 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1031 ('remote:\n'
1032 'remote: Processing changes: (\)\n'
1033 'remote: Processing changes: (|)\n'
1034 'remote: Processing changes: (/)\n'
1035 'remote: Processing changes: (-)\n'
1036 'remote: Processing changes: new: 1 (/)\n'
1037 'remote: Processing changes: new: 1, done\n'
1038 'remote:\n'
1039 'remote: New Changes:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001040 'remote: https://chromium-review.googlesource.com/#/c/my/repo/+/123456'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001041 ' XXX\n'
1042 'remote:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001043 'To https://chromium.googlesource.com/my/repo\n'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001044 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')
1045 ))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001046 if squash:
1047 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001048 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001049 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001050 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001051 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001052 ((['git', 'config', 'branch.master.gerritsquashhash',
1053 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001054 ]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001055 if squash:
1056 calls += [
1057 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001058 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001059 sorted(reviewers),
1060 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1061 cc, notify), ''),
1062 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001063 if tbr:
1064 calls += [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001065 (('GetChangeDetail', 'chromium-review.googlesource.com',
1066 'my%2Frepo~123456', ['LABELS']), {
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001067 'labels': {
1068 'Code-Review': {
1069 'default_value': 0,
1070 'all': [],
1071 'values': {
1072 '+2': 'lgtm, approved',
1073 '+1': 'lgtm, but someone else must approve',
1074 ' 0': 'No score',
1075 '-1': 'Don\'t submit as-is',
1076 }
1077 }
1078 }
1079 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001080 (('SetReview',
1081 'chromium-review.googlesource.com',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001082 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001083 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001084 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001085 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001086 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001087 return calls
1088
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001089 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001090 self,
1091 upload_args,
1092 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001093 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001094 squash=True,
1095 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001096 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001097 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001098 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001099 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001100 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001101 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001102 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001103 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001104 custom_cl_base=None,
1105 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001106 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001107 if squash_mode is None:
1108 if '--no-squash' in upload_args:
1109 squash_mode = 'nosquash'
1110 elif '--squash' in upload_args:
1111 squash_mode = 'squash'
1112 else:
1113 squash_mode = 'default'
1114
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001115 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001116 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001117 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001118 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001119 CookiesAuthenticatorMockFactory(
1120 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001121 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1122 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001123 self.mock(git_cl.gclient_utils, 'RunEditor',
1124 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001125 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1126 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001127
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001128 self.calls = self._gerrit_base_calls(
1129 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001130 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001131 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001132 other_cl_owner=other_cl_owner,
1133 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001134 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001135 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1136 expected_content=description))
1137 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001138 self.calls += self._gerrit_upload_calls(
1139 description, reviewers, squash,
1140 squash_mode=squash_mode,
1141 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001142 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001143 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001144 issue=issue, cc=cc,
Aaron Gablefd238082017-06-07 13:42:34 -07001145 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001146 # Uncomment when debugging.
1147 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001148 git_cl.main(['upload'] + upload_args)
1149
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001150 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001151 self._run_gerrit_upload_test(
1152 ['--no-squash'],
1153 'desc\n\nBUG=\n',
1154 [],
1155 squash=False,
1156 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1157
1158 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001159 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001160 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001161 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001162 [],
tandriia60502f2016-06-20 02:01:53 -07001163 squash=False,
1164 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001165 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001166
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001167 def test_gerrit_no_reviewer(self):
1168 self._run_gerrit_upload_test(
1169 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001170 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001171 [],
1172 squash=False,
1173 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001174
Nick Carter8692b182017-11-06 16:30:38 -08001175 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001176 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1177 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001178 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001179 'desc\n\nBUG=\n\nChange-Id: I123456789',
1180 squash=False,
1181 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001182 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001183
ukai@chromium.orge8077812012-02-03 03:41:46 +00001184 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001185 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001186 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001187 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001188 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001189 squash=False,
1190 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001191 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001192
1193 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001194 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001195 [],
bradnelsond975b302016-10-23 12:20:23 -07001196 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1197 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001198 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001199 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001200 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001201 cc=['more@example.com', 'people@example.com'],
1202 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001203
1204 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001205 self._run_gerrit_upload_test(
1206 [],
1207 'desc\nBUG=\n\nChange-Id: 123456789',
1208 [],
1209 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001210
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001211 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001212 self._run_gerrit_upload_test(
1213 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001214 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001215 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001216 squash=True,
1217 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001218
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001219 def test_gerrit_upload_squash_first_against_rev(self):
1220 custom_cl_base = 'custom_cl_base_rev_or_branch'
1221 self._run_gerrit_upload_test(
1222 ['--squash', custom_cl_base],
1223 'desc\nBUG=\n\nChange-Id: 123456789',
1224 [],
1225 squash=True,
1226 expected_upstream_ref='origin/master',
1227 custom_cl_base=custom_cl_base)
1228 self.assertIn(
1229 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1230 sys.stdout.getvalue())
1231
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001232 def test_gerrit_upload_squash_reupload(self):
1233 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001234 self._run_gerrit_upload_test(
1235 ['--squash'],
1236 description,
1237 [],
1238 squash=True,
1239 expected_upstream_ref='origin/master',
1240 issue=123456)
1241
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001242 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1243 self.mock(git_cl, 'DieWithError',
1244 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1245 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1246 with self.assertRaises(SystemExitMock):
1247 self._run_gerrit_upload_test(
1248 ['--squash'],
1249 description,
1250 [],
1251 squash=True,
1252 expected_upstream_ref='origin/master',
1253 issue=123456,
1254 fetched_status='ABANDONED')
1255
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001256 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1257 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1258 lambda *_, **__: {'email': 'yet-another@example.com'})
1259 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1260 self._run_gerrit_upload_test(
1261 ['--squash'],
1262 description,
1263 [],
1264 squash=True,
1265 expected_upstream_ref='origin/master',
1266 issue=123456,
1267 other_cl_owner='other@example.com')
1268 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001269 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001270 'authenticate to Gerrit as yet-another@example.com.\n'
1271 'Uploading may fail due to lack of permissions',
1272 git_cl.sys.stdout.getvalue())
1273
rmistry@google.com2dd99862015-06-22 12:22:18 +00001274 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001275 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001276 def mock_run_git(*args, **_kwargs):
1277 if args[0] == ['for-each-ref',
1278 '--format=%(refname:short) %(upstream:short)',
1279 'refs/heads']:
1280 # Create a local branch dependency tree that looks like this:
1281 # test1 -> test2 -> test3 -> test4 -> test5
1282 # -> test3.1
1283 # test6 -> test0
1284 branch_deps = [
1285 'test2 test1', # test1 -> test2
1286 'test3 test2', # test2 -> test3
1287 'test3.1 test2', # test2 -> test3.1
1288 'test4 test3', # test3 -> test4
1289 'test5 test4', # test4 -> test5
1290 'test6 test0', # test0 -> test6
1291 'test7', # test7
1292 ]
1293 return '\n'.join(branch_deps)
1294 self.mock(git_cl, 'RunGit', mock_run_git)
1295
1296 class RecordCalls:
1297 times_called = 0
1298 record_calls = RecordCalls()
1299 def mock_CMDupload(*args, **_kwargs):
1300 record_calls.times_called += 1
1301 return 0
1302 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1303
1304 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001305 (('ask_for_data', 'This command will checkout all dependent branches '
1306 'and run "git cl upload". Press Enter to continue, '
1307 'or Ctrl+C to abort'), ''),
1308 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001309
1310 class MockChangelist():
1311 def __init__(self):
1312 pass
1313 def GetBranch(self):
1314 return 'test1'
1315 def GetIssue(self):
1316 return '123'
1317 def GetPatchset(self):
1318 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001319 def IsGerrit(self):
1320 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001321
1322 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1323 # CMDupload should have been called 5 times because of 5 dependent branches.
1324 self.assertEquals(5, record_calls.times_called)
1325 self.assertEquals(0, ret)
1326
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001327 def test_gerrit_change_id(self):
1328 self.calls = [
1329 ((['git', 'write-tree'], ),
1330 'hashtree'),
1331 ((['git', 'rev-parse', 'HEAD~0'], ),
1332 'branch-parent'),
1333 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1334 'A B <a@b.org> 1456848326 +0100'),
1335 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1336 'C D <c@d.org> 1456858326 +0100'),
1337 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1338 'hashchange'),
1339 ]
1340 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1341 self.assertEqual(change_id, 'Ihashchange')
1342
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001343 def test_desecription_append_footer(self):
1344 for init_desc, footer_line, expected_desc in [
1345 # Use unique desc first lines for easy test failure identification.
1346 ('foo', 'R=one', 'foo\n\nR=one'),
1347 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1348 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1349 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1350 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1351 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1352 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1353 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1354 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1355 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1356 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1357 ]:
1358 desc = git_cl.ChangeDescription(init_desc)
1359 desc.append_footer(footer_line)
1360 self.assertEqual(desc.description, expected_desc)
1361
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001362 def test_update_reviewers(self):
1363 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001364 ('foo', [], [],
1365 'foo'),
1366 ('foo\nR=xx', [], [],
1367 'foo\nR=xx'),
1368 ('foo\nTBR=xx', [], [],
1369 'foo\nTBR=xx'),
1370 ('foo', ['a@c'], [],
1371 'foo\n\nR=a@c'),
1372 ('foo\nR=xx', ['a@c'], [],
1373 'foo\n\nR=a@c, xx'),
1374 ('foo\nTBR=xx', ['a@c'], [],
1375 'foo\n\nR=a@c\nTBR=xx'),
1376 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1377 'foo\n\nR=a@c, yy\nTBR=xx'),
1378 ('foo\nBUG=', ['a@c'], [],
1379 'foo\nBUG=\nR=a@c'),
1380 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1381 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1382 ('foo', ['a@c', 'b@c'], [],
1383 'foo\n\nR=a@c, b@c'),
1384 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1385 'foo\nBar\n\nR=c@c\nBUG='),
1386 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1387 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001388 # Same as the line before, but full of whitespaces.
1389 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001390 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001391 'foo\nBar\n\nR=c@c\n BUG =',
1392 ),
1393 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001394 ('foo BUG=allo R=joe ', ['c@c'], [],
1395 'foo BUG=allo R=joe\n\nR=c@c'),
1396 # Redundant TBRs get promoted to Rs
1397 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1398 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001399 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001400 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001401 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001402 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001403 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001404 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001405 actual.append(obj.description)
1406 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001407
Nodir Turakulov23b82142017-11-16 11:04:25 -08001408 def test_get_hash_tags(self):
1409 cases = [
1410 ('', []),
1411 ('a', []),
1412 ('[a]', ['a']),
1413 ('[aa]', ['aa']),
1414 ('[a ]', ['a']),
1415 ('[a- ]', ['a']),
1416 ('[a- b]', ['a-b']),
1417 ('[a--b]', ['a-b']),
1418 ('[a', []),
1419 ('[a]x', ['a']),
1420 ('[aa]x', ['aa']),
1421 ('[a b]', ['a-b']),
1422 ('[a b]', ['a-b']),
1423 ('[a__b]', ['a-b']),
1424 ('[a] x', ['a']),
1425 ('[a][b]', ['a', 'b']),
1426 ('[a] [b]', ['a', 'b']),
1427 ('[a][b]x', ['a', 'b']),
1428 ('[a][b] x', ['a', 'b']),
1429 ('[a]\n[b]', ['a']),
1430 ('[a\nb]', []),
1431 ('[a][', ['a']),
1432 ('Revert "[a] feature"', ['a']),
1433 ('Reland "[a] feature"', ['a']),
1434 ('Revert: [a] feature', ['a']),
1435 ('Reland: [a] feature', ['a']),
1436 ('Revert "Reland: [a] feature"', ['a']),
1437 ('Foo: feature', ['foo']),
1438 ('Foo Bar: feature', ['foo-bar']),
1439 ('Revert "Foo bar: feature"', ['foo-bar']),
1440 ('Reland "Foo bar: feature"', ['foo-bar']),
1441 ]
1442 for desc, expected in cases:
1443 change_desc = git_cl.ChangeDescription(desc)
1444 actual = change_desc.get_hash_tags()
1445 self.assertEqual(
1446 actual,
1447 expected,
1448 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1449
wittman@chromium.org455dc922015-01-26 20:15:50 +00001450 def test_get_target_ref(self):
1451 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001452 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001453 self.assertEqual(None, git_cl.GetTargetRef(None,
1454 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001455 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001456
wittman@chromium.org455dc922015-01-26 20:15:50 +00001457 # Check default target refs for branches.
1458 self.assertEqual('refs/heads/master',
1459 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001460 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001461 self.assertEqual('refs/heads/master',
1462 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001463 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001464 self.assertEqual('refs/heads/master',
1465 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001466 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001467 self.assertEqual('refs/branch-heads/123',
1468 git_cl.GetTargetRef('origin',
1469 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001470 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001471 self.assertEqual('refs/diff/test',
1472 git_cl.GetTargetRef('origin',
1473 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001474 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001475 self.assertEqual('refs/heads/chrome/m42',
1476 git_cl.GetTargetRef('origin',
1477 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001478 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001479
1480 # Check target refs for user-specified target branch.
1481 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1482 'refs/remotes/branch-heads/123'):
1483 self.assertEqual('refs/branch-heads/123',
1484 git_cl.GetTargetRef('origin',
1485 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001486 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001487 for branch in ('origin/master', 'remotes/origin/master',
1488 'refs/remotes/origin/master'):
1489 self.assertEqual('refs/heads/master',
1490 git_cl.GetTargetRef('origin',
1491 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001492 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001493 for branch in ('master', 'heads/master', 'refs/heads/master'):
1494 self.assertEqual('refs/heads/master',
1495 git_cl.GetTargetRef('origin',
1496 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001497 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001498
wychen@chromium.orga872e752015-04-28 23:42:18 +00001499 def test_patch_when_dirty(self):
1500 # Patch when local tree is dirty
1501 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1502 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1503
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001504 @staticmethod
1505 def _get_gerrit_codereview_server_calls(branch, value=None,
1506 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001507 detect_branch=True,
1508 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001509 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1510
1511 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1512 """
1513 calls = []
1514 if detect_branch:
1515 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001516 if detect_server:
1517 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1518 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001519 if value is None:
1520 calls += [
1521 ((['git', 'config', 'branch.' + branch + '.merge'],),
1522 'refs/heads' + branch),
1523 ((['git', 'config', 'branch.' + branch + '.remote'],),
1524 'origin'),
1525 ((['git', 'config', 'remote.origin.url'],),
1526 'https://%s.googlesource.com/my/repo' % git_short_host),
1527 ]
1528 return calls
1529
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001530 def _patch_common(self, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001531 new_branch=False, git_short_host='host',
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001532 detect_gerrit_server=False,
1533 actual_codereview=None,
1534 codereview_in_url=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001535 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001536 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1537 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001538 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001539 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001540 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1541
tandriidf09a462016-08-18 16:23:55 -07001542 if new_branch:
1543 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001544
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001545 if codereview_in_url and actual_codereview == 'rietveld':
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001546 self.calls += [
1547 ((['git', 'rev-parse', '--show-cdup'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001548 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001549 ]
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001550
1551 if not force_codereview and not codereview_in_url:
1552 # These calls detect codereview to use.
1553 self.calls += [
1554 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1555 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1556 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1557 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1558 ((['git', 'config', 'gerrit.host'],), 'true'),
1559 ]
1560 if detect_gerrit_server:
1561 self.calls += self._get_gerrit_codereview_server_calls(
1562 'master', git_short_host=git_short_host,
1563 detect_branch=not new_branch and force_codereview)
1564 actual_codereview = 'gerrit'
1565
1566 if actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001567 self.calls += [
1568 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001569 'my%2Frepo~123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001570 {
1571 'current_revision': '7777777777',
1572 'revisions': {
1573 '1111111111': {
1574 '_number': 1,
1575 'fetch': {'http': {
1576 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1577 'ref': 'refs/changes/56/123456/1',
1578 }},
1579 },
1580 '7777777777': {
1581 '_number': 7,
1582 'fetch': {'http': {
1583 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1584 'ref': 'refs/changes/56/123456/7',
1585 }},
1586 },
1587 },
1588 }),
1589 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001590
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001591 def test_patch_gerrit_default(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001592 self._patch_common(git_short_host='chromium', detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001593 self.calls += [
1594 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1595 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001596 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001597 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001598 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001599 ((['git', 'config', 'branch.master.gerritserver',
1600 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001601 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001602 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1603 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1604 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001605 ]
1606 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1607
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001608 def test_patch_gerrit_new_branch(self):
1609 self._patch_common(
1610 git_short_host='chromium', detect_gerrit_server=True, new_branch=True)
1611 self.calls += [
1612 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1613 'refs/changes/56/123456/7'],), ''),
1614 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1615 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1616 ''),
1617 ((['git', 'config', 'branch.master.gerritserver',
1618 'https://chromium-review.googlesource.com'],), ''),
1619 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1620 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1621 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1622 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1623 ]
1624 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1625
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001626 def test_patch_gerrit_force(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001627 self._patch_common(
1628 force_codereview=True, git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001629 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001630 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001631 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001632 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001633 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001634 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001635 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001636 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001637 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001638 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1639 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1640 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001641 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001642 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001643
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001644 def test_patch_gerrit_guess_by_url(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001645 self.calls += self._get_gerrit_codereview_server_calls(
1646 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001647 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001648 actual_codereview='gerrit', git_short_host='else',
1649 codereview_in_url=True, detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001650 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001651 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001652 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001653 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001654 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001655 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001656 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001657 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001658 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001659 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1660 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1661 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001662 ]
1663 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001664 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001665
Aaron Gable697a91b2018-01-19 15:20:15 -08001666 def test_patch_gerrit_guess_by_url_with_repo(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001667 self.calls += self._get_gerrit_codereview_server_calls(
1668 'master', git_short_host='else', detect_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001669 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001670 actual_codereview='gerrit', git_short_host='else',
1671 codereview_in_url=True, detect_gerrit_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001672 self.calls += [
1673 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1674 'refs/changes/56/123456/1'],), ''),
1675 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1676 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1677 ''),
1678 ((['git', 'config', 'branch.master.gerritserver',
1679 'https://else-review.googlesource.com'],), ''),
1680 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1681 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1682 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1683 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1684 ]
1685 self.assertEqual(git_cl.main(
1686 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1687 0)
1688
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001689 def test_patch_gerrit_conflict(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001690 self._patch_common(detect_gerrit_server=True, git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001691 self.calls += [
1692 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001693 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001694 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1695 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1696 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001697 ]
1698 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001699 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001700
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001701 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001702 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001703 raise git_cl.gerrit_util.GerritError(404, '')
1704 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1705
tandriic2405f52016-10-10 08:13:15 -07001706 self.calls = [
1707 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07001708 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1709 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1710 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1711 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001712 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
1713 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1714 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1715 ((['git', 'config', 'remote.origin.url'],),
1716 'https://chromium.googlesource.com/my/repo'),
1717 ((['DieWithError',
1718 'change 123456 at https://chromium-review.googlesource.com does not '
1719 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07001720 ]
1721 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001722 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07001723
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001724 def _checkout_calls(self):
1725 return [
1726 ((['git', 'config', '--local', '--get-regexp',
1727 'branch\\..*\\.rietveldissue'], ),
1728 ('branch.retrying.rietveldissue 1111111111\n'
1729 'branch.some-fix.rietveldissue 2222222222\n')),
1730 ((['git', 'config', '--local', '--get-regexp',
1731 'branch\\..*\\.gerritissue'], ),
1732 ('branch.ger-branch.gerritissue 123456\n'
1733 'branch.gbranch654.gerritissue 654321\n')),
1734 ]
1735
1736 def test_checkout_gerrit(self):
1737 """Tests git cl checkout <issue>."""
1738 self.calls = self._checkout_calls()
1739 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1740 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1741
1742 def test_checkout_rietveld(self):
1743 """Tests git cl checkout <issue>."""
1744 self.calls = self._checkout_calls()
1745 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1746 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1747
1748 def test_checkout_not_found(self):
1749 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001750 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001751 self.calls = self._checkout_calls()
1752 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1753
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001754 def test_checkout_no_branch_issues(self):
1755 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001756 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001757 self.calls = [
1758 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001759 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001760 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001761 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001762 ]
1763 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1764
tandrii@chromium.org28253532016-04-14 13:46:56 +00001765 def _test_gerrit_ensure_authenticated_common(self, auth,
1766 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001767 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1768 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1769 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001770 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001771 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001772 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001773 cl.branch = 'master'
1774 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001775 cl.lookedup_issue = True
1776 return cl
1777
1778 def test_gerrit_ensure_authenticated_missing(self):
1779 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001780 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001781 })
1782 self.calls.append(
1783 ((['DieWithError',
1784 'Credentials for the following hosts are required:\n'
1785 ' chromium-review.googlesource.com\n'
1786 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001787 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001788 'https://chromium-review.googlesource.com/new-password'],), ''),)
1789 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1790
1791 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001792 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001793 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001794 'chromium.googlesource.com':
1795 ('git-one.example.com', None, 'secret1'),
1796 'chromium-review.googlesource.com':
1797 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001798 })
1799 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001800 (('ask_for_data', 'If you know what you are doing '
1801 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001802 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1803
1804 def test_gerrit_ensure_authenticated_ok(self):
1805 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001806 'chromium.googlesource.com':
1807 ('git-same.example.com', None, 'secret'),
1808 'chromium-review.googlesource.com':
1809 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001810 })
1811 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1812
tandrii@chromium.org28253532016-04-14 13:46:56 +00001813 def test_gerrit_ensure_authenticated_skipped(self):
1814 cl = self._test_gerrit_ensure_authenticated_common(
1815 auth={}, skip_auth_check=True)
1816 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1817
Eric Boren2fb63102018-10-05 13:05:03 +00001818 def test_gerrit_ensure_authenticated_bearer_token(self):
1819 cl = self._test_gerrit_ensure_authenticated_common(auth={
1820 'chromium.googlesource.com':
1821 ('', None, 'secret'),
1822 'chromium-review.googlesource.com':
1823 ('', None, 'secret'),
1824 })
1825 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1826 header = gerrit_util.CookiesAuthenticator().get_auth_header(
1827 'chromium.googlesource.com')
1828 self.assertTrue('Bearer' in header)
1829
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001830 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001831 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001832 lambda h, i, labels, notify=None:
1833 self._mocked_call(['SetReview', h, i, labels, notify]))
1834
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001835 self.calls = [
1836 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001837 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
1838 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001839 ((['git', 'config', 'branch.feature.gerritserver'],),
1840 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001841 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1842 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1843 ((['git', 'config', 'remote.origin.url'],),
1844 'https://chromium.googlesource.com/infra/infra.git'),
1845 ((['SetReview', 'chromium-review.googlesource.com',
1846 'infra%2Finfra~123',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001847 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001848 ]
tandriid9e5ce52016-07-13 02:32:59 -07001849
1850 def test_cmd_set_commit_gerrit_clear(self):
1851 self._cmd_set_commit_gerrit_common(0)
1852 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1853
1854 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07001855 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001856 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1857
tandriid9e5ce52016-07-13 02:32:59 -07001858 def test_cmd_set_commit_gerrit(self):
1859 self._cmd_set_commit_gerrit_common(2)
1860 self.assertEqual(0, git_cl.main(['set-commit']))
1861
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001862 def test_description_display(self):
1863 out = StringIO.StringIO()
1864 self.mock(git_cl.sys, 'stdout', out)
1865
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001866 self.mock(git_cl, 'Changelist', ChangelistMock)
1867 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001868
1869 self.assertEqual(0, git_cl.main(['description', '-d']))
1870 self.assertEqual('foo\n', out.getvalue())
1871
iannucci3c972b92016-08-17 13:24:10 -07001872 def test_StatusFieldOverrideIssueMissingArgs(self):
1873 out = StringIO.StringIO()
1874 self.mock(git_cl.sys, 'stderr', out)
1875
1876 try:
1877 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
1878 except SystemExit as ex:
1879 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001880 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001881
1882 out = StringIO.StringIO()
1883 self.mock(git_cl.sys, 'stderr', out)
1884
1885 try:
1886 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
1887 except SystemExit as ex:
1888 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07001889 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07001890
1891 def test_StatusFieldOverrideIssue(self):
1892 out = StringIO.StringIO()
1893 self.mock(git_cl.sys, 'stdout', out)
1894
1895 def assertIssue(cl_self, *_args):
1896 self.assertEquals(cl_self.issue, 1)
1897 return 'foobar'
1898
1899 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1900 self.calls = [
1901 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1902 ((['git', 'config', 'rietveld.server'],), ''),
1903 ((['git', 'config', 'rietveld.server'],), ''),
1904 ]
iannuccie53c9352016-08-17 14:40:40 -07001905 self.assertEqual(
1906 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
1907 0)
iannucci3c972b92016-08-17 13:24:10 -07001908 self.assertEqual(out.getvalue(), 'foobar\n')
1909
iannuccie53c9352016-08-17 14:40:40 -07001910 def test_SetCloseOverrideIssue(self):
1911 def assertIssue(cl_self, *_args):
1912 self.assertEquals(cl_self.issue, 1)
1913 return 'foobar'
1914
1915 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
1916 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
1917 self.calls = [
1918 ((['git', 'config', 'rietveld.autoupdate'],), ''),
1919 ((['git', 'config', 'rietveld.server'],), ''),
1920 ((['git', 'config', 'rietveld.server'],), ''),
1921 ]
1922 self.assertEqual(
1923 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
1924
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001925 def test_description_gerrit(self):
1926 out = StringIO.StringIO()
1927 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001928 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001929 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1930 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
1931 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1932 ((['git', 'config', 'remote.origin.url'],),
1933 'https://chromium.googlesource.com/my/repo'),
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001934 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001935 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001936 {
1937 'current_revision': 'sha1',
1938 'revisions': {'sha1': {
1939 'commit': {'message': 'foobar'},
1940 }},
1941 }),
1942 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001943 self.assertEqual(0, git_cl.main([
1944 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
1945 self.assertEqual('foobar\n', out.getvalue())
1946
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001947 def test_description_set_raw(self):
1948 out = StringIO.StringIO()
1949 self.mock(git_cl.sys, 'stdout', out)
1950
1951 self.mock(git_cl, 'Changelist', ChangelistMock)
1952 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
1953
1954 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1955 self.assertEqual('hihi', ChangelistMock.desc)
1956
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001957 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001958 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001959
1960 def RunEditor(desc, _, **kwargs):
1961 self.assertEquals(
1962 '# Enter a description of the change.\n'
1963 '# This will be displayed on the codereview site.\n'
1964 '# The first line will also be used as the subject of the review.\n'
1965 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001966 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07001967 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001968 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001969 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07001970 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001971
dsansomee2d6fd92016-09-08 00:10:47 -07001972 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07001973 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001974
1975 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1976 self.mock(git_cl.Changelist, 'GetDescription',
1977 lambda *args: current_desc)
1978 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
1979 UpdateDescriptionRemote)
1980 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1981
1982 self.calls = [
1983 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07001984 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07001985 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1986 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001987 ((['git', 'config', 'core.editor'],), 'vi'),
1988 ]
1989 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
1990
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001991 def test_description_set_stdin(self):
1992 out = StringIO.StringIO()
1993 self.mock(git_cl.sys, 'stdout', out)
1994
1995 self.mock(git_cl, 'Changelist', ChangelistMock)
1996 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
1997
1998 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
1999 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2000
kmarshall3bff56b2016-06-06 18:31:47 -07002001 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002002 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2003
kmarshall3bff56b2016-06-06 18:31:47 -07002004 self.calls = \
2005 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2006 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002007 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002008 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2009 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002010 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2011 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2012 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002013 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2014 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2015 ((['git', 'branch', '-D', 'foo'],), '')]
2016
kmarshall3bff56b2016-06-06 18:31:47 -07002017 self.mock(git_cl, 'get_cl_statuses',
2018 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002019 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2020 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2021 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002022
2023 self.assertEqual(0, git_cl.main(['archive', '-f']))
2024
2025 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002026 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002027 self.calls = \
2028 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2029 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002030 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002031 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2032 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002033 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2034
kmarshall9249e012016-08-23 12:02:16 -07002035 self.mock(git_cl, 'get_cl_statuses',
2036 lambda branches, fine_grained, max_processes:
2037 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2038
2039 self.assertEqual(1, git_cl.main(['archive', '-f']))
2040
2041 def test_archive_dry_run(self):
2042 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2043
2044 self.calls = \
2045 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2046 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2047 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2048 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2049 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2050 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2051 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2052 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2053 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002054
2055 self.mock(git_cl, 'get_cl_statuses',
2056 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002057 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2058 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2059 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002060
kmarshall9249e012016-08-23 12:02:16 -07002061 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2062
2063 def test_archive_no_tags(self):
2064 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2065
2066 self.calls = \
2067 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2068 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2069 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2070 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2071 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2072 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2073 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2074 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2075 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2076 ((['git', 'branch', '-D', 'foo'],), '')]
2077
2078 self.mock(git_cl, 'get_cl_statuses',
2079 lambda branches, fine_grained, max_processes:
2080 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2081 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2082 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2083
2084 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002085
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002086 def test_cmd_issue_erase_existing(self):
2087 out = StringIO.StringIO()
2088 self.mock(git_cl.sys, 'stdout', out)
2089 self.calls = [
2090 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002091 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2092 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002093 # Let this command raise exception (retcode=1) - it should be ignored.
2094 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002095 CERR1),
2096 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2097 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002098 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2099 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2100 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002101 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002102 ]
2103 self.assertEqual(0, git_cl.main(['issue', '0']))
2104
Aaron Gable400e9892017-07-12 15:31:21 -07002105 def test_cmd_issue_erase_existing_with_change_id(self):
2106 out = StringIO.StringIO()
2107 self.mock(git_cl.sys, 'stdout', out)
2108 self.mock(git_cl.Changelist, 'GetDescription',
2109 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2110 self.calls = [
2111 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2112 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2113 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002114 # Let this command raise exception (retcode=1) - it should be ignored.
2115 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2116 CERR1),
2117 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2118 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2119 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2120 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2121 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002122 ((['git', 'log', '-1', '--format=%B'],),
2123 'This is a description\n\nChange-Id: Ideadbeef'),
2124 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002125 ]
2126 self.assertEqual(0, git_cl.main(['issue', '0']))
2127
phajdan.jre328cf92016-08-22 04:12:17 -07002128 def test_cmd_issue_json(self):
2129 out = StringIO.StringIO()
2130 self.mock(git_cl.sys, 'stdout', out)
2131 self.calls = [
2132 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002133 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002134 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2135 ((['git', 'config', 'rietveld.server'],),
2136 'https://codereview.chromium.org'),
2137 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2138 (('write_json', 'output.json',
2139 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2140 ''),
2141 ]
2142 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2143
tandrii8c5a3532016-11-04 07:52:02 -07002144 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2145 self.mock(git_cl.Changelist, 'GetChange',
2146 lambda _, *a: (
2147 self._mocked_call(['GetChange']+list(a))))
2148 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2149 lambda *_, **__: (
2150 self._mocked_call(['DoGetTryMasters'])))
2151 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2152 lambda _, s: self._mocked_call(['SetCQState', s]))
2153
tandrii8c5a3532016-11-04 07:52:02 -07002154 self.calls = [
2155 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2156 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2157 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2158 ((['git', 'config', 'branch.feature.gerritserver'],),
2159 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002160 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2161 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2162 ((['git', 'config', 'remote.origin.url'],),
2163 'https://chromium.googlesource.com/depot_tools'),
2164 (('GetChangeDetail', 'chromium-review.googlesource.com',
2165 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002166 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2167 'project': 'depot_tools',
2168 'status': 'OPEN',
2169 'owner': {'email': 'owner@e.mail'},
2170 'revisions': {
2171 'deadbeaf': {
2172 '_number': 6,
2173 },
2174 'beeeeeef': {
2175 '_number': 7,
2176 'fetch': {'http': {
2177 'url': 'https://chromium.googlesource.com/depot_tools',
2178 'ref': 'refs/changes/56/123456/7'
2179 }},
2180 },
2181 },
2182 }),
tandrii8c5a3532016-11-04 07:52:02 -07002183 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2184 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2185 ((['get_or_create_merge_base', 'feature', 'feature'],),
2186 'fake_ancestor_sha'),
2187 ((['GetChange', 'fake_ancestor_sha', None], ),
2188 git_cl.presubmit_support.GitChange(
2189 '', '', '', '', '', '', '', '')),
2190 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2191 ((['DoGetTryMasters'], ), None),
2192 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2193 ]
2194 out = StringIO.StringIO()
2195 self.mock(git_cl.sys, 'stdout', out)
2196 self.assertEqual(0, git_cl.main(['try']))
2197 self.assertEqual(
2198 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002199 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002200 'https://chromium-review.googlesource.com/123456\n')
2201
tandrii8c5a3532016-11-04 07:52:02 -07002202 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2203 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2204 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2205
tandrii8c5a3532016-11-04 07:52:02 -07002206 self.calls = [
2207 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2208 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2209 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2210 ((['git', 'config', 'branch.feature.gerritserver'],),
2211 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002212 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2213 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2214 ((['git', 'config', 'remote.origin.url'],),
2215 'https://chromium.googlesource.com/depot_tools'),
2216 (('GetChangeDetail', 'chromium-review.googlesource.com',
2217 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002218 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002219 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002220 'status': 'OPEN',
2221 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002222 'revisions': {
2223 'deadbeaf': {
2224 '_number': 6,
2225 },
2226 'beeeeeef': {
2227 '_number': 7,
2228 'fetch': {'http': {
2229 'url': 'https://chromium.googlesource.com/depot_tools',
2230 'ref': 'refs/changes/56/123456/7'
2231 }},
2232 },
2233 },
2234 }),
2235 ]
2236
2237 def _buildbucket_retry(*_, **kw):
2238 # self.maxDiff = 10000
2239 body = json.loads(kw['body'])
2240 self.assertEqual(len(body['builds']), 1)
2241 build = body['builds'][0]
2242 params = json.loads(build.pop('parameters_json'))
2243 self.assertEqual(params, {
2244 u'builder_name': u'win',
2245 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2246 u'revision': None}],
2247 u'properties': {
2248 u'category': u'git_cl_try',
2249 u'key': u'val',
2250 u'json': [{u'a': 1}, None],
tandrii8c5a3532016-11-04 07:52:02 -07002251
2252 u'patch_gerrit_url':
2253 u'https://chromium-review.googlesource.com',
2254 u'patch_issue': 123456,
2255 u'patch_project': u'depot_tools',
2256 u'patch_ref': u'refs/changes/56/123456/7',
2257 u'patch_repository_url':
2258 u'https://chromium.googlesource.com/depot_tools',
2259 u'patch_set': 7,
2260 u'patch_storage': u'gerrit',
2261 }
2262 })
2263 self.assertEqual(build, {
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002264 u'bucket': u'luci.chromium.try',
tandrii8c5a3532016-11-04 07:52:02 -07002265 u'client_operation_id': u'uuid4',
2266 u'tags': [
2267 u'builder:win',
2268 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2269 u'user_agent:git_cl_try',
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002270 ],
tandrii8c5a3532016-11-04 07:52:02 -07002271 })
2272
2273 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2274
2275 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2276 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002277 'try', '-B', 'luci.chromium.try', '-b', 'win',
tandrii8c5a3532016-11-04 07:52:02 -07002278 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2279 self.assertRegexpMatches(
2280 git_cl.sys.stdout.getvalue(),
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00002281 'Tried jobs on:\nBucket: luci.chromium.try')
tandriide281ae2016-10-12 06:02:30 -07002282
qyearsley123a4682016-10-26 09:12:17 -07002283 def test_git_cl_try_bots_on_multiple_masters(self):
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00002284 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2285 self.mock(git_cl.Changelist, 'GetChange',
2286 lambda _, *a: (
2287 self._mocked_call(['GetChange']+list(a))))
2288 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2289 lambda *_, **__: (
2290 self._mocked_call(['DoGetTryMasters'])))
2291 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2292 lambda _, s: self._mocked_call(['SetCQState', s]))
2293
qyearsley123a4682016-10-26 09:12:17 -07002294 self.calls = [
2295 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00002296 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2297 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2298 ((['git', 'config', 'branch.feature.gerritserver'],),
2299 'https://chromium-review.googlesource.com'),
2300 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2301 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2302 ((['git', 'config', 'remote.origin.url'],),
2303 'https://chromium.googlesource.com/depot_tools'),
2304 (('GetChangeDetail', 'chromium-review.googlesource.com',
2305 'depot_tools~123456',
2306 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2307 'project': 'depot_tools',
2308 'status': 'OPEN',
2309 'owner': {'email': 'owner@e.mail'},
2310 'revisions': {
2311 'deadbeaf': {
2312 '_number': 6,
2313 },
2314 'beeeeeef': {
2315 '_number': 7,
2316 'fetch': {'http': {
2317 'url': 'https://chromium.googlesource.com/depot_tools',
2318 'ref': 'refs/changes/56/123456/7'
2319 }},
2320 },
2321 },
2322 }),
qyearsley123a4682016-10-26 09:12:17 -07002323 ]
2324
2325 def _buildbucket_retry(*_, **kw):
2326 body = json.loads(kw['body'])
2327 self.assertEqual(len(body['builds']), 2)
2328
Nodir Turakulovb422e682018-02-20 22:51:30 -08002329 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2330 params = json.loads(body['builds'][0]['parameters_json'])
2331 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002332
Nodir Turakulovb422e682018-02-20 22:51:30 -08002333 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2334 params = json.loads(body['builds'][1]['parameters_json'])
2335 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002336
2337 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2338
2339 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002340 json.dumps({
2341 'builder1': {'bucket': 'bucket1'},
2342 'builder2': {'bucket': 'bucket2'},
2343 })))
qyearsley123a4682016-10-26 09:12:17 -07002344
2345 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2346 self.assertEqual(
2347 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2348 self.assertEqual(
2349 git_cl.sys.stdout.getvalue(),
2350 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002351 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002352 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002353 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002354 ' builder2: []\n'
2355 'To see results here, run: git cl try-results\n'
2356 'To see results in browser, run: git cl web\n')
2357
tandrii16e0b4e2016-06-07 10:34:28 -07002358 def _common_GerritCommitMsgHookCheck(self):
2359 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2360 self.mock(git_cl.os.path, 'abspath',
2361 lambda path: self._mocked_call(['abspath', path]))
2362 self.mock(git_cl.os.path, 'exists',
2363 lambda path: self._mocked_call(['exists', path]))
2364 self.mock(git_cl.gclient_utils, 'FileRead',
2365 lambda path: self._mocked_call(['FileRead', path]))
2366 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2367 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2368 self.calls = [
2369 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2370 ((['abspath', '../'],), '/abs/git_repo_root'),
2371 ]
2372 return git_cl.Changelist(codereview='gerrit', issue=123)
2373
2374 def test_GerritCommitMsgHookCheck_custom_hook(self):
2375 cl = self._common_GerritCommitMsgHookCheck()
2376 self.calls += [
2377 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2378 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2379 '#!/bin/sh\necho "custom hook"')
2380 ]
2381 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2382
2383 def test_GerritCommitMsgHookCheck_not_exists(self):
2384 cl = self._common_GerritCommitMsgHookCheck()
2385 self.calls += [
2386 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2387 ]
2388 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2389
2390 def test_GerritCommitMsgHookCheck(self):
2391 cl = self._common_GerritCommitMsgHookCheck()
2392 self.calls += [
2393 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2394 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2395 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002396 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002397 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2398 ''),
2399 ]
2400 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2401
tandriic4344b52016-08-29 06:04:54 -07002402 def test_GerritCmdLand(self):
2403 self.calls += [
2404 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2405 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2406 'deadbeaf'),
2407 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2408 ((['git', 'config', 'branch.feature.gerritserver'],),
2409 'chromium-review.googlesource.com'),
2410 ]
2411 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2412 cl._codereview_impl._GetChangeDetail = lambda _: {
2413 'labels': {},
2414 'current_revision': 'deadbeaf',
2415 }
agable32978d92016-11-01 12:55:02 -07002416 cl._codereview_impl._GetChangeCommit = lambda: {
2417 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002418 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002419 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2420 }
tandriic4344b52016-08-29 06:04:54 -07002421 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002422 out = StringIO.StringIO()
2423 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002424 self.assertEqual(0, cl.CMDLand(force=True,
2425 bypass_hooks=True,
2426 verbose=True,
2427 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002428 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002429 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002430
tandrii221ab252016-10-06 08:12:04 -07002431 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002432 '9000': {
2433 'id': '9000',
2434 'bucket': 'master.x.y',
2435 'created_by': 'user:someone@chromium.org',
2436 'created_ts': '147200002222000',
2437 'experimental': False,
2438 'parameters_json': json.dumps({
2439 'builder_name': 'my-bot',
2440 'properties': {'category': 'cq'},
2441 }),
2442 'status': 'STARTED',
2443 'tags': [
2444 'build_address:x.y/my-bot/2',
2445 'builder:my-bot',
2446 'experimental:false',
2447 'user_agent:cq',
2448 ],
2449 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2450 },
2451 '8000': {
2452 'id': '8000',
2453 'bucket': 'master.x.y',
2454 'created_by': 'user:someone@chromium.org',
2455 'created_ts': '147200001111000',
2456 'experimental': False,
2457 'failure_reason': 'BUILD_FAILURE',
2458 'parameters_json': json.dumps({
2459 'builder_name': 'my-bot',
2460 'properties': {'category': 'cq'},
2461 }),
2462 'result_details_json': json.dumps({
2463 'properties': {'buildnumber': 1},
2464 }),
2465 'result': 'FAILURE',
2466 'status': 'COMPLETED',
2467 'tags': [
2468 'build_address:x.y/my-bot/1',
2469 'builder:my-bot',
2470 'experimental:false',
2471 'user_agent:cq',
2472 ],
2473 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2474 },
2475 }
tandrii221ab252016-10-06 08:12:04 -07002476
2477 def test_write_try_results_json(self):
2478 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002479 {
2480 'bucket': 'master.x.y',
2481 'buildbucket_id': '8000',
2482 'builder_name': 'my-bot',
2483 'created_ts': '147200001111000',
2484 'experimental': False,
2485 'failure_reason': 'BUILD_FAILURE',
2486 'result': 'FAILURE',
2487 'status': 'COMPLETED',
2488 'tags': [
2489 'build_address:x.y/my-bot/1',
2490 'builder:my-bot',
2491 'experimental:false',
2492 'user_agent:cq',
2493 ],
2494 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2495 },
2496 {
2497 'bucket': 'master.x.y',
2498 'buildbucket_id': '9000',
2499 'builder_name': 'my-bot',
2500 'created_ts': '147200002222000',
2501 'experimental': False,
2502 'failure_reason': None,
2503 'result': None,
2504 'status': 'STARTED',
2505 'tags': [
2506 'build_address:x.y/my-bot/2',
2507 'builder:my-bot',
2508 'experimental:false',
2509 'user_agent:cq',
2510 ],
2511 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2512 },
tandrii221ab252016-10-06 08:12:04 -07002513 ]
2514 self.calls = [(('write_json', 'output.json', expected_output), '')]
2515 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2516
tandrii45b2a582016-10-11 03:14:16 -07002517 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002518 out = StringIO.StringIO()
2519 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002520 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2521 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002522 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2523 self._mocked_call(['get_authenticator_for_host', host]))
2524 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2525 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002526
2527 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2528 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002529 self.calls += [
2530 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2531 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2532 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2533 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2534 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2535 ((['git', 'config', 'branch.feature.rietveldserver'],),
2536 'codereview.example.com'),
2537 ((['get_authenticator_for_host', 'codereview.example.com'],),
2538 AuthenticatorMock()),
2539 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2540
2541 def test_fetch_try_jobs_none_rietveld(self):
2542 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002543 # Simulate that user isn't logged in.
2544 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002545 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002546 self.assertRegexpMatches(sys.stdout.getvalue(),
2547 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002548 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2549
2550 def test_fetch_try_jobs_some_rietveld(self):
2551 self._setup_fetch_try_jobs_rietveld({
2552 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2553 })
2554 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002555 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2556 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2557 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2558
2559 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2560 self._setup_fetch_try_jobs(most_recent_patchset=13)
2561 self.calls += [
2562 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2563 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2564 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002565 # TODO(tandrii): Uncomment the below if we decide to support checking
2566 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002567 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002568 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002569 ((['git', 'config', 'branch.feature.gerritserver'],),
2570 'https://x-review.googlesource.com'),
2571 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2572 AuthenticatorMock()),
2573 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2574
2575 def test_fetch_try_jobs_none_gerrit(self):
2576 self._setup_fetch_try_jobs_gerrit({})
2577 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002578 # TODO(tandrii): Uncomment the below if we decide to support checking
2579 # patchsets for Gerrit.
2580 # self.assertRegexpMatches(
2581 # sys.stdout.getvalue(),
2582 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002583 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2584
2585 def test_fetch_try_jobs_some_gerrit(self):
2586 self._setup_fetch_try_jobs_gerrit({
2587 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2588 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002589 # TODO(tandrii): Uncomment the below if we decide to support checking
2590 # patchsets for Gerrit.
2591 # self.calls.remove(
2592 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002593 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2594
2595 # ... and doesn't result in warning.
2596 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2597 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002598 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2599 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2600
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002601 def _mock_gerrit_changes_for_detail_cache(self):
2602 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002603
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002604 def test_gerrit_change_detail_cache_simple(self):
2605 self._mock_gerrit_changes_for_detail_cache()
2606 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002607 (('GetChangeDetail', 'host', 'my%2Frepo~1', []), 'a'),
2608 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b'),
2609 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002610 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002611 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002612 cl1._cached_remote_url = (
2613 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002614 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002615 cl2._cached_remote_url = (
2616 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002617 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2618 self.assertEqual(cl1._GetChangeDetail(), 'a')
2619 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
2620 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
2621 self.assertEqual(cl1._GetChangeDetail(), 'a')
2622 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002623
2624 def test_gerrit_change_detail_cache_options(self):
2625 self._mock_gerrit_changes_for_detail_cache()
2626 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002627 (('GetChangeDetail', 'host', 'repo~1', ['C', 'A', 'B']), 'cab'),
2628 (('GetChangeDetail', 'host', 'repo~1', ['A', 'D']), 'ad'),
2629 (('GetChangeDetail', 'host', 'repo~1', ['A']), 'a'), # no_cache=True
2630 # no longer in cache.
2631 (('GetChangeDetail', 'host', 'repo~1', ['B']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002632 ]
2633 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002634 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002635 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2636 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2637 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2638 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2639 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2640 self.assertEqual(cl._GetChangeDetail(), 'cab')
2641
2642 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2643 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2644 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2645 self.assertEqual(cl._GetChangeDetail(), 'cab')
2646
2647 # Finally, no_cache should invalidate all caches for given change.
2648 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2649 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2650
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002651 def test_gerrit_description_caching(self):
2652 def gen_detail(rev, desc):
2653 return {
2654 'current_revision': rev,
2655 'revisions': {rev: {'commit': {'message': desc}}}
2656 }
2657 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002658 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002659 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2660 gen_detail('rev1', 'desc1')),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002661 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002662 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2663 gen_detail('rev2', 'desc2')),
2664 ]
2665
2666 self._mock_gerrit_changes_for_detail_cache()
2667 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002668 cl._cached_remote_url = (
2669 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002670 self.assertEqual(cl.GetDescription(), 'desc1')
2671 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
2672 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002673
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002674 def test_print_current_creds(self):
2675 class CookiesAuthenticatorMock(object):
2676 def __init__(self):
2677 self.gitcookies = {
2678 'host.googlesource.com': ('user', 'pass'),
2679 'host-review.googlesource.com': ('user', 'pass'),
2680 }
2681 self.netrc = self
2682 self.netrc.hosts = {
2683 'github.com': ('user2', None, 'pass2'),
2684 'host2.googlesource.com': ('user3', None, 'pass'),
2685 }
2686 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2687 CookiesAuthenticatorMock)
2688 self.mock(sys, 'stdout', StringIO.StringIO())
2689 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2690 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2691 ' Host\t User\t Which file',
2692 '============================\t=====\t===========',
2693 'host-review.googlesource.com\t user\t.gitcookies',
2694 ' host.googlesource.com\t user\t.gitcookies',
2695 ' host2.googlesource.com\tuser3\t .netrc',
2696 ])
2697 sys.stdout.buf = ''
2698 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2699 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2700 ' Host\tUser\t Which file',
2701 '============================\t====\t===========',
2702 'host-review.googlesource.com\tuser\t.gitcookies',
2703 ' host.googlesource.com\tuser\t.gitcookies',
2704 ])
2705
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002706 def _common_creds_check_mocks(self):
2707 def exists_mock(path):
2708 dirname = os.path.dirname(path)
2709 if dirname == os.path.expanduser('~'):
2710 dirname = '~'
2711 base = os.path.basename(path)
2712 if base in ('.netrc', '.gitcookies'):
2713 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
2714 # git cl also checks for existence other files not relevant to this test.
2715 return None
2716 self.mock(os.path, 'exists', exists_mock)
2717 self.mock(sys, 'stdout', StringIO.StringIO())
2718
2719 def test_creds_check_gitcookies_not_configured(self):
2720 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002721 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002722 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002723 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08002724 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002725 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
2726 (('os.path.exists', '~/.netrc'), True),
2727 (('ask_for_data', 'Press Enter to setup .gitcookies, '
2728 'or Ctrl+C to abort'), ''),
2729 ((['git', 'config', '--global', 'http.cookiefile',
2730 os.path.expanduser('~/.gitcookies')], ), ''),
2731 ]
2732 self.assertEqual(0, git_cl.main(['creds-check']))
2733 self.assertRegexpMatches(
2734 sys.stdout.getvalue(),
2735 '^You seem to be using outdated .netrc for git credentials:')
2736 self.assertRegexpMatches(
2737 sys.stdout.getvalue(),
2738 '\nConfigured git to use .gitcookies from')
2739
2740 def test_creds_check_gitcookies_configured_custom_broken(self):
2741 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002742 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002743 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002744 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08002745 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002746 ((['git', 'config', '--global', 'http.cookiefile'],),
2747 '/custom/.gitcookies'),
2748 (('os.path.exists', '/custom/.gitcookies'), False),
2749 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
2750 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
2751 ((['git', 'config', '--global', 'http.cookiefile',
2752 os.path.expanduser('~/.gitcookies')], ), ''),
2753 ]
2754 self.assertEqual(0, git_cl.main(['creds-check']))
2755 self.assertRegexpMatches(
2756 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002757 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002758 self.assertRegexpMatches(
2759 sys.stdout.getvalue(),
2760 'However, your configured .gitcookies file is missing.')
2761
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01002762 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002763 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07002764 lambda _, message, publish: self._mocked_call(
2765 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002766 self.calls = [
2767 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2768 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07002769 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002770 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01002771 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
2772 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002773
2774 def test_git_cl_comment_add_gerrit(self):
2775 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07002776 lambda host, change, msg, ready:
2777 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002778 self.calls = [
2779 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2780 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2781 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
2782 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
2783 'origin/master'),
2784 ((['git', 'config', 'remote.origin.url'],),
2785 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002786 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
2787 'msg', None),
Aaron Gable636b13f2017-07-14 10:42:48 -07002788 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002789 ]
2790 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
2791 '-a', 'msg']))
2792
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002793 def test_git_cl_comments_fetch_rietveld(self):
2794 self.mock(sys, 'stdout', StringIO.StringIO())
2795 self.calls = [
2796 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2797 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Leszek Swirski45b20c42018-09-17 17:05:26 +00002798 ] * 2 + [
2799 (('write_json', 'output.json', [
2800 {
2801 'date': '2000-03-13 20:49:34.515270',
2802 'message': 'PTAL',
2803 'approval': False,
2804 'disapproval': False,
2805 'sender': 'owner@example.com'
2806 }, {
2807 'date': '2017-03-13 20:49:34.515270',
2808 'message': 'lgtm',
2809 'approval': True,
2810 'disapproval': False,
2811 'sender': 'r@example.com'
2812 }, {
2813 'date': '2017-03-13 21:50:34.515270',
2814 'message': 'not lgtm',
2815 'approval': False,
2816 'disapproval': True,
2817 'sender': 'r2@example.com'
2818 }
2819 ]),'')
2820 ]
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002821 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
2822 'messages': [
2823 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
2824 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
2825 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
2826 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
2827 # Intentionally wrong order here.
2828 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
2829 'disapproval': False, 'approval': False,
2830 'sender': 'owner@example.com'},
2831 ],
2832 'owner_email': 'owner@example.com',
2833 })
2834 expected_comments_summary = [
2835 git_cl._CommentSummary(
2836 message='lgtm',
2837 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
2838 disapproval=False, approval=True, sender='r@example.com'),
2839 git_cl._CommentSummary(
2840 message='not lgtm',
2841 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
2842 disapproval=True, approval=False, sender='r2@example.com'),
2843 # Note: same order as in whatever Rietveld returns.
2844 git_cl._CommentSummary(
2845 message='PTAL',
2846 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
2847 disapproval=False, approval=False, sender='owner@example.com'),
2848 ]
2849 cl = git_cl.Changelist(codereview='rietveld', issue=1)
2850 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00002851 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
2852 '-j', 'output.json']))
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002853
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002854 def test_git_cl_comments_fetch_gerrit(self):
2855 self.mock(sys, 'stdout', StringIO.StringIO())
2856 self.calls = [
2857 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2858 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
2859 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
2860 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
2861 'origin/master'),
2862 ((['git', 'config', 'remote.origin.url'],),
2863 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002864 (('GetChangeDetail', 'chromium-review.googlesource.com',
2865 'infra%2Finfra~1',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002866 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002867 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002868 'messages': [
2869 {
2870 u'_revision_number': 1,
2871 u'author': {
2872 u'_account_id': 1111084,
2873 u'email': u'commit-bot@chromium.org',
2874 u'name': u'Commit Bot'
2875 },
2876 u'date': u'2017-03-15 20:08:45.000000000',
2877 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07002878 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002879 u'tag': u'autogenerated:cq:dry-run'
2880 },
2881 {
2882 u'_revision_number': 2,
2883 u'author': {
2884 u'_account_id': 11151243,
2885 u'email': u'owner@example.com',
2886 u'name': u'owner'
2887 },
2888 u'date': u'2017-03-16 20:00:41.000000000',
2889 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2890 u'message': u'PTAL',
2891 },
2892 {
2893 u'_revision_number': 2,
2894 u'author': {
2895 u'_account_id': 148512 ,
2896 u'email': u'reviewer@example.com',
2897 u'name': u'reviewer'
2898 },
2899 u'date': u'2017-03-17 05:19:37.500000000',
2900 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2901 u'message': u'Patch Set 2: Code-Review+1',
2902 },
2903 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002904 }),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002905 (('GetChangeComments', 'chromium-review.googlesource.com',
2906 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002907 '/COMMIT_MSG': [
2908 {
2909 'author': {'email': u'reviewer@example.com'},
2910 'updated': u'2017-03-17 05:19:37.500000000',
2911 'patch_set': 2,
2912 'side': 'REVISION',
2913 'message': 'Please include a bug link',
2914 },
2915 ],
2916 'codereview.settings': [
2917 {
2918 'author': {'email': u'owner@example.com'},
2919 'updated': u'2017-03-16 20:00:41.000000000',
2920 'patch_set': 2,
2921 'side': 'PARENT',
2922 'line': 42,
2923 'message': 'I removed this because it is bad',
2924 },
2925 ]
Leszek Swirski45b20c42018-09-17 17:05:26 +00002926 })
2927 ] * 2 + [
2928 (('write_json', 'output.json', [
2929 {
2930 u'date': u'2017-03-16 20:00:41.000000',
2931 u'message': (
2932 u'PTAL\n' +
2933 u'\n' +
2934 u'codereview.settings\n' +
2935 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2936 u'c/1/2/codereview.settings#b42\n' +
2937 u' I removed this because it is bad\n'),
2938 u'approval': False,
2939 u'disapproval': False,
2940 u'sender': u'owner@example.com'
2941 }, {
2942 u'date': u'2017-03-17 05:19:37.500000',
2943 u'message': (
2944 u'Patch Set 2: Code-Review+1\n' +
2945 u'\n' +
2946 u'/COMMIT_MSG\n' +
2947 u' PS2, File comment: https://chromium-review.googlesource' +
2948 u'.com/c/1/2//COMMIT_MSG#\n' +
2949 u' Please include a bug link\n'),
2950 u'approval': False,
2951 u'disapproval': False,
2952 u'sender': u'reviewer@example.com'
2953 }
2954 ]),'')
2955 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002956 expected_comments_summary = [
2957 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002958 message=(
2959 u'PTAL\n' +
2960 u'\n' +
2961 u'codereview.settings\n' +
2962 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2963 u'c/1/2/codereview.settings#b42\n' +
2964 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002965 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
2966 disapproval=False, approval=False, sender=u'owner@example.com'),
2967 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002968 message=(
2969 u'Patch Set 2: Code-Review+1\n' +
2970 u'\n' +
2971 u'/COMMIT_MSG\n' +
2972 u' PS2, File comment: https://chromium-review.googlesource.com/' +
2973 u'c/1/2//COMMIT_MSG#\n' +
2974 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002975 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
2976 disapproval=False, approval=False, sender=u'reviewer@example.com'),
2977 ]
2978 cl = git_cl.Changelist(codereview='gerrit', issue=1)
2979 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00002980 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
2981 '-j', 'output.json']))
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002982
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002983 def test_get_remote_url_with_mirror(self):
2984 original_os_path_isdir = os.path.isdir
2985 def selective_os_path_isdir_mock(path):
2986 if path == '/cache/this-dir-exists':
2987 return self._mocked_call('os.path.isdir', path)
2988 return original_os_path_isdir(path)
2989 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
2990
2991 url = 'https://chromium.googlesource.com/my/repo'
2992 self.calls = [
2993 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2994 ((['git', 'config', 'branch.master.merge'],), 'master'),
2995 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2996 ((['git', 'config', 'remote.origin.url'],),
2997 '/cache/this-dir-exists'),
2998 (('os.path.isdir', '/cache/this-dir-exists'),
2999 True),
3000 # Runs in /cache/this-dir-exists.
3001 ((['git', 'config', 'remote.origin.url'],),
3002 url),
3003 ]
3004 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3005 self.assertEqual(cl.GetRemoteUrl(), url)
3006 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
3007
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003008 def test_gerrit_change_identifier_with_project(self):
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003009 self.calls = [
3010 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3011 ((['git', 'config', 'branch.master.merge'],), 'master'),
3012 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3013 ((['git', 'config', 'remote.origin.url'],),
3014 'https://chromium.googlesource.com/a/my/repo.git/'),
3015 ]
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003016 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3017 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
3018
3019 def test_gerrit_change_identifier_without_project(self):
3020 self.calls = [
3021 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3022 ((['git', 'config', 'branch.master.merge'],), 'master'),
3023 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3024 ((['git', 'config', 'remote.origin.url'],), CERR1),
3025 ]
3026 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3027 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003028
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003029
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003030if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003031 logging.basicConfig(
3032 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003033 unittest.main()