blob: 57b3e25ae9bd0dfc50761a1e8e884158acb65e3c [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
86class RietveldMock(object):
87 def __init__(self, *args, **kwargs):
88 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000089
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000090 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080091 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000092 return 'Issue: %d' % issue
93
maruel@chromium.org78936cb2013-04-11 00:17:52 +000094 @staticmethod
95 def get_issue_properties(_issue, _messages):
96 return {
97 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
98 'messages': [
99 {
100 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -0700101 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000102 'sender': 'john@chromium.org',
103 },
104 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100105 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000106 }
107
iannuccie53c9352016-08-17 14:40:40 -0700108 @staticmethod
109 def close_issue(_issue):
110 return 'Closed'
111
skobes6468b902016-10-24 08:45:10 -0700112 @staticmethod
113 def get_patch(issue, patchset):
114 return 'patch set from issue %s patchset %s' % (issue, patchset)
115
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100116 @staticmethod
117 def update_description(_issue, _description):
118 return 'Updated'
119
120 @staticmethod
121 def add_comment(_issue, _comment):
122 return 'Commented'
123
124
skobes6468b902016-10-24 08:45:10 -0700125class GitCheckoutMock(object):
126 def __init__(self, *args, **kwargs):
127 pass
128
129 @staticmethod
130 def reset():
131 GitCheckoutMock.conflict = False
132
133 def apply_patch(self, p):
134 if GitCheckoutMock.conflict:
135 raise Exception('failed')
136
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000137
138class WatchlistsMock(object):
139 def __init__(self, _):
140 pass
141 @staticmethod
142 def GetWatchersForPaths(_):
143 return ['joe@example.com']
144
145
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000146class CodereviewSettingsFileMock(object):
147 def __init__(self):
148 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800149 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000150 def read(self):
151 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000152 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000153
154
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000155class AuthenticatorMock(object):
156 def __init__(self, *_args):
157 pass
158 def has_cached_credentials(self):
159 return True
tandrii221ab252016-10-06 08:12:04 -0700160 def authorize(self, http):
161 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000162
163
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100164def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000165 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
166
167 Usage:
168 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100169 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000170
171 OR
172 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100173 CookiesAuthenticatorMockFactory(
174 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000175 """
176 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800177 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000178 # Intentionally not calling super() because it reads actual cookie files.
179 pass
180 @classmethod
181 def get_gitcookies_path(cls):
182 return '~/.gitcookies'
183 @classmethod
184 def get_netrc_path(cls):
185 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100186 def _get_auth_for_host(self, host):
187 if same_auth:
188 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000189 return (hosts_with_creds or {}).get(host)
190 return CookiesAuthenticatorMock
191
Aaron Gable9a03ae02017-11-03 11:31:07 -0700192
kmarshall9249e012016-08-23 12:02:16 -0700193class MockChangelistWithBranchAndIssue():
194 def __init__(self, branch, issue):
195 self.branch = branch
196 self.issue = issue
197 def GetBranch(self):
198 return self.branch
199 def GetIssue(self):
200 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000201
tandriic2405f52016-10-10 08:13:15 -0700202
203class SystemExitMock(Exception):
204 pass
205
206
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000207class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100208 def test_get_description(self):
209 cl = git_cl.Changelist(issue=1, codereview='rietveld',
210 codereview_host='host')
211 cl.description = 'x'
212 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800213 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100214 self.assertEquals(cl.GetDescription(), 'x')
215 self.assertEquals(cl.GetDescription(force=True), 'y')
216 self.assertEquals(cl.GetDescription(), 'y')
217
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700218 def test_description_footers(self):
219 cl = git_cl.Changelist(issue=1, codereview='gerrit',
220 codereview_host='host')
221 cl.description = '\n'.join([
222 'This is some message',
223 '',
224 'It has some lines',
225 'and, also',
226 '',
227 'Some: Really',
228 'Awesome: Footers',
229 ])
230 cl.has_description = True
231 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
232 msg, footers = cl.GetDescriptionFooters()
233 self.assertEquals(
234 msg, ['This is some message', '', 'It has some lines', 'and, also'])
235 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
236
237 msg.append('wut')
238 footers.append(('gnarly-dude', 'beans'))
239 cl.UpdateDescriptionFooters(msg, footers)
240 self.assertEquals(cl.GetDescription().splitlines(), [
241 'This is some message',
242 '',
243 'It has some lines',
244 'and, also',
245 'wut'
246 '',
247 'Some: Really',
248 'Awesome: Footers',
249 'Gnarly-Dude: beans',
250 ])
251
tandriif9aefb72016-07-01 09:06:51 -0700252 def test_get_bug_line_values(self):
253 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
254 self.assertEqual(f('', ''), [])
255 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
256 self.assertEqual(f('v8', '456'), ['v8:456'])
257 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
258 # Not nice, but not worth carying.
259 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
260 ['v8:456', 'chromium:123', 'v8:123'])
261
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100262 def _test_git_number(self, parent_msg, dest_ref, child_msg,
263 parent_hash='parenthash'):
264 desc = git_cl.ChangeDescription(child_msg)
265 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
266 return desc.description
267
268 def assertEqualByLine(self, actual, expected):
269 self.assertEqual(actual.splitlines(), expected.splitlines())
270
271 def test_git_number_bad_parent(self):
272 with self.assertRaises(ValueError):
273 self._test_git_number('Parent', 'refs/heads/master', 'Child')
274
275 def test_git_number_bad_parent_footer(self):
276 with self.assertRaises(AssertionError):
277 self._test_git_number(
278 'Parent\n'
279 '\n'
280 'Cr-Commit-Position: wrong',
281 'refs/heads/master', 'Child')
282
283 def test_git_number_bad_lineage_ignored(self):
284 actual = self._test_git_number(
285 'Parent\n'
286 '\n'
287 'Cr-Commit-Position: refs/heads/master@{#1}\n'
288 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
289 'refs/heads/master', 'Child')
290 self.assertEqualByLine(
291 actual,
292 'Child\n'
293 '\n'
294 'Cr-Commit-Position: refs/heads/master@{#2}\n'
295 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
296
297 def test_git_number_same_branch(self):
298 actual = self._test_git_number(
299 'Parent\n'
300 '\n'
301 'Cr-Commit-Position: refs/heads/master@{#12}',
302 dest_ref='refs/heads/master',
303 child_msg='Child')
304 self.assertEqualByLine(
305 actual,
306 'Child\n'
307 '\n'
308 'Cr-Commit-Position: refs/heads/master@{#13}')
309
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200310 def test_git_number_same_branch_mixed_footers(self):
311 actual = self._test_git_number(
312 'Parent\n'
313 '\n'
314 'Cr-Commit-Position: refs/heads/master@{#12}',
315 dest_ref='refs/heads/master',
316 child_msg='Child\n'
317 '\n'
318 'Broken-by: design\n'
319 'BUG=123')
320 self.assertEqualByLine(
321 actual,
322 'Child\n'
323 '\n'
324 'Broken-by: design\n'
325 'BUG=123\n'
326 'Cr-Commit-Position: refs/heads/master@{#13}')
327
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100328 def test_git_number_same_branch_with_originals(self):
329 actual = self._test_git_number(
330 'Parent\n'
331 '\n'
332 'Cr-Commit-Position: refs/heads/master@{#12}',
333 dest_ref='refs/heads/master',
334 child_msg='Child\n'
335 '\n'
336 'Some users are smart and insert their own footers\n'
337 '\n'
338 'Cr-Whatever: value\n'
339 'Cr-Commit-Position: refs/copy/paste@{#22}')
340 self.assertEqualByLine(
341 actual,
342 'Child\n'
343 '\n'
344 'Some users are smart and insert their own footers\n'
345 '\n'
346 'Cr-Original-Whatever: value\n'
347 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
348 'Cr-Commit-Position: refs/heads/master@{#13}')
349
350 def test_git_number_new_branch(self):
351 actual = self._test_git_number(
352 'Parent\n'
353 '\n'
354 'Cr-Commit-Position: refs/heads/master@{#12}',
355 dest_ref='refs/heads/branch',
356 child_msg='Child')
357 self.assertEqualByLine(
358 actual,
359 'Child\n'
360 '\n'
361 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
362 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
363
364 def test_git_number_lineage(self):
365 actual = self._test_git_number(
366 'Parent\n'
367 '\n'
368 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
369 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
370 dest_ref='refs/heads/branch',
371 child_msg='Child')
372 self.assertEqualByLine(
373 actual,
374 'Child\n'
375 '\n'
376 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
377 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
378
379 def test_git_number_moooooooore_lineage(self):
380 actual = self._test_git_number(
381 'Parent\n'
382 '\n'
383 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
384 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
385 dest_ref='refs/heads/mooore',
386 child_msg='Child')
387 self.assertEqualByLine(
388 actual,
389 'Child\n'
390 '\n'
391 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
392 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
393 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
394
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100395 def test_git_number_ever_moooooooore_lineage(self):
Robert Iannucci456b0d62018-03-13 19:15:50 -0700396 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100397 actual = self._test_git_number(
398 'CQ commit on fresh new branch + numbering.\n'
399 '\n'
400 'NOTRY=True\n'
401 'NOPRESUBMIT=True\n'
402 'BUG=\n'
403 '\n'
404 'Review-Url: https://codereview.chromium.org/2577703003\n'
405 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
406 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
407 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
408 dest_ref='refs/heads/gnumb-test/cl',
409 child_msg='git cl on fresh new branch + numbering.\n'
410 '\n'
411 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
412 self.assertEqualByLine(
413 actual,
414 'git cl on fresh new branch + numbering.\n'
415 '\n'
416 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
417 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
418 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
419 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
420 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100421
422 def test_git_number_cherry_pick(self):
423 actual = self._test_git_number(
424 'Parent\n'
425 '\n'
426 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
427 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
428 dest_ref='refs/heads/branch',
429 child_msg='Child, which is cherry-pick from master\n'
430 '\n'
431 'Cr-Commit-Position: refs/heads/master@{#100}\n'
432 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
433 self.assertEqualByLine(
434 actual,
435 'Child, which is cherry-pick from master\n'
436 '\n'
437 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
438 '\n'
439 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
440 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
441 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
442
Andrii Shyshkalovd4c86732018-09-25 04:29:31 +0000443 def test_gerrit_mirror_hack(self):
444 cr = 'chromium-review.googlesource.com'
445 url0 = 'https://%s/a/changes/x?a=b' % cr
446 origMirrors = git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES
447 try:
448 git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES = ['us1', 'us2']
449 url1 = git_cl.gerrit_util._UseGerritMirror(url0, cr)
450 url2 = git_cl.gerrit_util._UseGerritMirror(url1, cr)
451 url3 = git_cl.gerrit_util._UseGerritMirror(url2, cr)
452
453 self.assertNotEqual(url1, url2)
454 self.assertEqual(sorted((url1, url2)), [
455 'https://us1-mirror-chromium-review.googlesource.com/a/changes/x?a=b',
456 'https://us2-mirror-chromium-review.googlesource.com/a/changes/x?a=b'])
457 self.assertEqual(url1, url3)
458 finally:
459 git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES = origMirrors
460
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000461 def test_valid_accounts(self):
462 mock_per_account = {
463 'u1': None, # 404, doesn't exist.
464 'u2': {
465 '_account_id': 123124,
466 'avatars': [],
467 'email': 'u2@example.com',
468 'name': 'User Number 2',
469 'status': 'OOO',
470 },
471 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
472 }
473 def GetAccountDetailsMock(_, account):
474 # Poor-man's mock library's side_effect.
475 v = mock_per_account.pop(account)
476 if isinstance(v, Exception):
477 raise v
478 return v
479
480 original = git_cl.gerrit_util.GetAccountDetails
481 try:
482 git_cl.gerrit_util.GetAccountDetails = GetAccountDetailsMock
483 actual = git_cl.gerrit_util.ValidAccounts(
484 'host', ['u1', 'u2', 'u3'], max_threads=1)
485 finally:
486 git_cl.gerrit_util.GetAccountDetails = original
487 self.assertEqual(actual, {
488 'u2': {
489 '_account_id': 123124,
490 'avatars': [],
491 'email': 'u2@example.com',
492 'name': 'User Number 2',
493 'status': 'OOO',
494 },
495 })
496
497
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000498
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200499class TestParseIssueURL(unittest.TestCase):
500 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
501 codereview=None, fail=False):
502 self.assertIsNotNone(parsed)
503 if fail:
504 self.assertFalse(parsed.valid)
505 return
506 self.assertTrue(parsed.valid)
507 self.assertEqual(parsed.issue, issue)
508 self.assertEqual(parsed.patchset, patchset)
509 self.assertEqual(parsed.hostname, hostname)
510 self.assertEqual(parsed.codereview, codereview)
511
512 def _run_and_validate(self, func, url, *args, **kwargs):
513 result = func(urlparse.urlparse(url))
514 if kwargs.pop('fail', False):
515 self.assertIsNone(result)
516 return None
517 self._validate(result, *args, fail=False, **kwargs)
518
519 def test_rietveld(self):
520 def test(url, *args, **kwargs):
521 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
522 *args, codereview='rietveld', **kwargs)
523
524 test('http://codereview.chromium.org/123',
525 123, None, 'codereview.chromium.org')
526 test('https://codereview.chromium.org/123',
527 123, None, 'codereview.chromium.org')
528 test('https://codereview.chromium.org/123/',
529 123, None, 'codereview.chromium.org')
530 test('https://codereview.chromium.org/123/whatever',
531 123, None, 'codereview.chromium.org')
532 test('https://codereview.chromium.org/123/#ps20001',
533 123, 20001, 'codereview.chromium.org')
534 test('http://codereview.chromium.org/download/issue123_4.diff',
535 123, 4, 'codereview.chromium.org')
536 # This looks like bad Gerrit, but is actually valid Rietveld, too.
537 test('https://chrome-review.source.com/123/4/',
538 123, None, 'chrome-review.source.com')
539
540 test('https://codereview.chromium.org/deadbeaf', fail=True)
541 test('https://codereview.chromium.org/api/123', fail=True)
542 test('bad://codereview.chromium.org/123', fail=True)
543 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
544
545 def test_gerrit(self):
546 def test(url, issue=None, patchset=None, hostname=None, fail=None):
547 self._test_ParseIssueUrl(
548 git_cl._GerritChangelistImpl.ParseIssueURL,
549 url, issue, patchset, hostname, fail)
550 def test(url, *args, **kwargs):
551 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
552 *args, codereview='gerrit', **kwargs)
553
554 test('http://chrome-review.source.com/c/123',
555 123, None, 'chrome-review.source.com')
556 test('https://chrome-review.source.com/c/123/',
557 123, None, 'chrome-review.source.com')
558 test('https://chrome-review.source.com/c/123/4',
559 123, 4, 'chrome-review.source.com')
560 test('https://chrome-review.source.com/#/c/123/4',
561 123, 4, 'chrome-review.source.com')
562 test('https://chrome-review.source.com/c/123/4',
563 123, 4, 'chrome-review.source.com')
564 test('https://chrome-review.source.com/123',
565 123, None, 'chrome-review.source.com')
566 test('https://chrome-review.source.com/123/4',
567 123, 4, 'chrome-review.source.com')
568
569 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
570 test('https://chrome-review.source.com/c/abc/', fail=True)
571 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
572
573 def test_ParseIssueNumberArgument(self):
574 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200575 codereview_hint = kwargs.pop('hint', None)
576 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
577 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200578
579 test('123', 123)
580 test('', fail=True)
581 test('abc', fail=True)
582 test('123/1', fail=True)
583 test('123a', fail=True)
584 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
585 # Rietveld.
586 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200587 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200588 test('https://codereview.source.com/123',
589 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200590 # Matches both, but we take Gerrit if specifically requested.
591 test('https://codereview.source.com/123',
592 123, None, 'codereview.source.com', 'gerrit',
593 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200594 # Gerrrit.
595 test('https://chrome-review.source.com/c/123/4',
596 123, 4, 'chrome-review.source.com', 'gerrit')
597 test('https://chrome-review.source.com/bad/123/4', fail=True)
598
599
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100600class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100601 def setUp(self):
602 super(GitCookiesCheckerTest, self).setUp()
603 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100604 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100605
606 def mock_hosts_creds(self, subhost_identity_pairs):
607 def ensure_googlesource(h):
608 if not h.endswith(self.c._GOOGLESOURCE):
609 assert not h.endswith('.')
610 return h + '.' + self.c._GOOGLESOURCE
611 return h
612 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
613 for h, i in subhost_identity_pairs]
614
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200615 def test_identity_parsing(self):
616 self.assertEqual(self.c._parse_identity('ldap.google.com'),
617 ('ldap', 'google.com'))
618 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
619 ('ldap', 'example.com'))
620 # Specical case because we know there are no subdomains in chromium.org.
621 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
622 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800623 # Pathological: ".period." can be either username OR domain, more likely
624 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200625 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
626 ('note', 'period.example.com'))
627
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100628 def test_analysis_nothing(self):
629 self.c._all_hosts = []
630 self.assertFalse(self.c.has_generic_host())
631 self.assertEqual(set(), self.c.get_conflicting_hosts())
632 self.assertEqual(set(), self.c.get_duplicated_hosts())
633 self.assertEqual(set(), self.c.get_partially_configured_hosts())
634 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
635
636 def test_analysis(self):
637 self.mock_hosts_creds([
638 ('.googlesource.com', 'git-example.chromium.org'),
639
640 ('chromium', 'git-example.google.com'),
641 ('chromium-review', 'git-example.google.com'),
642 ('chrome-internal', 'git-example.chromium.org'),
643 ('chrome-internal-review', 'git-example.chromium.org'),
644 ('conflict', 'git-example.google.com'),
645 ('conflict-review', 'git-example.chromium.org'),
646 ('dup', 'git-example.google.com'),
647 ('dup', 'git-example.google.com'),
648 ('dup-review', 'git-example.google.com'),
649 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200650 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100651 ])
652 self.assertTrue(self.c.has_generic_host())
653 self.assertEqual(set(['conflict.googlesource.com']),
654 self.c.get_conflicting_hosts())
655 self.assertEqual(set(['dup.googlesource.com']),
656 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200657 self.assertEqual(set(['partial.googlesource.com',
658 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100659 self.c.get_partially_configured_hosts())
660 self.assertEqual(set(['chromium.googlesource.com',
661 'chrome-internal.googlesource.com']),
662 self.c.get_hosts_with_wrong_identities())
663
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100664 def test_report_no_problems(self):
665 self.test_analysis_nothing()
666 self.mock(sys, 'stdout', StringIO.StringIO())
667 self.assertFalse(self.c.find_and_report_problems())
668 self.assertEqual(sys.stdout.getvalue(), '')
669
670 def test_report(self):
671 self.test_analysis()
672 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200673 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
674 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100675 self.assertTrue(self.c.find_and_report_problems())
676 with open(os.path.join(os.path.dirname(__file__),
677 'git_cl_creds_check_report.txt')) as f:
678 expected = f.read()
679 def by_line(text):
680 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700681 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200682 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100683
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800684
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000685class TestGitCl(TestCase):
686 def setUp(self):
687 super(TestGitCl, self).setUp()
688 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700689 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000690 self.mock(subprocess2, 'call', self._mocked_call)
691 self.mock(subprocess2, 'check_call', self._mocked_call)
692 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700693 self.mock(subprocess2, 'communicate',
694 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000695 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000696 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000697 self.mock(git_common, 'get_or_create_merge_base',
698 lambda *a: (
699 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000700 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000701 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000702 self.mock(git_cl, 'SaveDescriptionBackup', lambda _:
703 self._mocked_call('SaveDescriptionBackup'))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100704 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000705 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700706 self.mock(git_cl, 'write_json', lambda path, contents:
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000707 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000708 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000709 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000710 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700711 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
712 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000713 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000714 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000715 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100716 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
717 lambda *args, **kwargs: self._mocked_call(
718 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700719 self.mock(git_cl.gerrit_util, 'GetChangeComments',
720 lambda *args, **kwargs: self._mocked_call(
721 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100722 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700723 lambda h, i, reviewers, ccs, notify: self._mocked_call(
724 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700725 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700726 lambda h, i, msg=None, labels=None, notify=None:
727 self._mocked_call('SetReview', h, i, msg, labels, notify))
Andrii Shyshkalov733d4ec2018-04-19 11:48:58 -0700728 self.mock(git_cl.gerrit_util.LuciContextAuthenticator, 'is_luci',
729 staticmethod(lambda: False))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000730 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
731 classmethod(lambda _: False))
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000732 self.mock(git_cl.gerrit_util, 'ValidAccounts',
733 lambda host, accounts:
734 self._mocked_call('ValidAccounts', host, accounts))
tandriic2405f52016-10-10 08:13:15 -0700735 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100736 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000737 # It's important to reset settings to not have inter-tests interference.
738 git_cl.settings = None
739
740 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000741 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100742 self.assertEquals([], self.calls)
743 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000744 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100745 raise
746 # Sadly, has_failed() returns True if this OR any other tests before this
747 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200748 git_cl.logging.error(
749 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100750 'There are un-consumed self.calls after this test has finished.\n'
751 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700752 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200753 'If you are already running only this test, then **first** fix the '
754 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100755 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700756 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100757 'and follow instructions above.\n' +
758 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000759 finally:
760 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000761
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000762 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000763 self.assertTrue(
764 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700765 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000766 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000767 expected_args, result = top
768
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000769 # Also logs otherwise it could get caught in a try/finally and be hard to
770 # diagnose.
771 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700772 N = 5
773 prior_calls = '\n '.join(
774 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
775 for i, c in enumerate(self._calls_done[-N:]))
776 following_calls = '\n '.join(
777 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
778 for i, c in enumerate(self.calls[:N]))
779 extended_msg = (
780 'A few prior calls:\n %s\n\n'
781 'This (expected):\n @%d: %r\n'
782 'This (actual):\n @%d: %r\n\n'
783 'A few following expected calls:\n %s' %
784 (prior_calls, len(self._calls_done), expected_args,
785 len(self._calls_done), args, following_calls))
786 git_cl.logging.error(extended_msg)
787
tandrii99a72f22016-08-17 14:33:24 -0700788 self.fail('@%d\n'
789 ' Expected: %r\n'
790 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700791 len(self._calls_done), expected_args, args))
792
793 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700794 if isinstance(result, Exception):
795 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000796 return result
797
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100798 def test_ask_for_explicit_yes_true(self):
799 self.calls = [
800 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
801 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
802 ]
803 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
804
tandrii48df5812016-10-17 03:55:37 -0700805 def test_LoadCodereviewSettingsFromFile_gerrit(self):
806 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
807 self.calls = [
808 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
809 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
810 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
811 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
812 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
813 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700814 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
815 CERR1),
816 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700817 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
818 CERR1),
819 ((['git', 'config', 'gerrit.host', 'true'],), ''),
820 ]
821 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
822
maruel@chromium.orga3353652011-11-30 14:26:57 +0000823 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000824 def _is_gerrit_calls(cls, gerrit=False):
825 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
826 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
827
828 @classmethod
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000829 def _upload_calls(cls, private, no_autocc):
Aaron Gable13101a62018-02-09 13:20:41 -0800830 return (cls._rietveld_git_base_calls() +
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000831 cls._git_upload_calls(private, no_autocc))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000832
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000833 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800834 def _rietveld_upload_no_rev_calls(cls):
835 return (cls._rietveld_git_base_calls() + [
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200836 ((['git', 'config', 'core.editor'],), ''),
837 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000838
839 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800840 def _rietveld_git_base_calls(cls):
841 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
842 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000843
Aaron Gable13101a62018-02-09 13:20:41 -0800844 return cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000845 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700846 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
847 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000848 ((['git', 'config', 'rietveld.server'],),
849 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000850 ((['git', 'config', 'branch.master.merge'],), 'master'),
851 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000852 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000853 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000854 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000855 ((['git', 'rev-parse', '--show-cdup'],), ''),
856 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Aaron Gable7817f022017-12-12 09:43:17 -0800857 ((['git', '-c', 'core.quotePath=false', 'diff',
858 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000859 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700860 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000861 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000862 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000863 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000864 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000865 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000866 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000867 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000868 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700869 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000870 ]
871
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000872 @classmethod
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000873 def _git_upload_calls(cls, private, no_autocc):
874 if private or no_autocc:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000875 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000876 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000877 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000878
879 if private:
880 private_call = []
881 else:
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000882 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000883 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000884
maruel@chromium.orga3353652011-11-30 14:26:57 +0000885 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000886 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000887 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000888 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800889 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000890 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700891 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000892 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000893 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000894 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700895 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000896 ] + cls._git_post_upload_calls()
897
898 @classmethod
899 def _git_post_upload_calls(cls):
900 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000901 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
902 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
903 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000904 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000905 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000906 ]
907
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000908 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000909 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000910 fake_ancestor = 'fake_ancestor'
911 fake_cl = 'fake_cl_for_patch'
912 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000913 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000914 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000915 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000916 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000917 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000918 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000919 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000920 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700921 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000922 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000923 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000924 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000925 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000926 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000927 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000928 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000929 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000930 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000931 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000932 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000933
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000934 @staticmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800935 def _cmd_line(description, args, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000936 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000937 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800938 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000939 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000940 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800941 '--cc',
942 ','.join(
943 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
944 cc),
Aaron Gable13101a62018-02-09 13:20:41 -0800945 ] + (['--private'] if private else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000946
947 def _run_reviewer_test(
948 self,
949 upload_args,
950 expected_description,
951 returned_description,
952 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000953 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700954 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000955 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000956 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org79540052012-10-19 23:15:26 +0000957
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000958 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700959 cc = cc or []
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000960 no_autocc = '--no-autocc' in upload_args
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000961
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000962 self.calls = self._upload_calls(private, no_autocc)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000963
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000964 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000965 self.assertEquals(
966 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000967 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000968 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000969 '#--------------------This line is 72 characters long'
970 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000971 expected_description,
972 desc)
973 return returned_description
974 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000975
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000976 def check_upload(args):
Aaron Gable13101a62018-02-09 13:20:41 -0800977 cmd_line = self._cmd_line(final_description, reviewers, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000978 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000979 return 1, 2
980 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000981
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000982 git_cl.main(['upload'] + upload_args)
983
984 def test_no_reviewer(self):
985 self._run_reviewer_test(
986 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000987 'desc\n\nBUG=',
988 '# Blah blah comment.\ndesc\n\nBUG=',
989 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000990 [])
991
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000992 def test_private(self):
993 self._run_reviewer_test(
994 ['--private'],
995 'desc\n\nBUG=',
996 '# Blah blah comment.\ndesc\n\nBUG=\n',
997 'desc\n\nBUG=',
998 [])
999
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00001000 def test_no_autocc(self):
1001 self._run_reviewer_test(
1002 ['--no-autocc'],
1003 'desc\n\nBUG=',
1004 '# Blah blah comment.\ndesc\n\nBUG=\n',
1005 'desc\n\nBUG=',
1006 [])
1007
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001008 def test_reviewers_cmd_line(self):
1009 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001010 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001011 self._run_reviewer_test(
1012 ['-r' 'foo@example.com'],
1013 description,
1014 '\n%s\n' % description,
1015 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001016 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001017
1018 def test_reviewer_tbr_overriden(self):
1019 # Reviewer is overriden with TBR
1020 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001021 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001022 self._run_reviewer_test(
1023 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001024 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001025 description.strip('\n'),
1026 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001027 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001028
1029 def test_reviewer_multiple(self):
1030 # Handles multiple R= or TBR= lines.
1031 description = (
bradnelsond975b302016-10-23 12:20:23 -07001032 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1033 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001034 self._run_reviewer_test(
1035 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001036 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001037 description,
1038 description,
bradnelsond975b302016-10-23 12:20:23 -07001039 ['--reviewers=another@example.com,reviewer@example.com'],
1040 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001041
maruel@chromium.orga3353652011-11-30 14:26:57 +00001042 def test_reviewer_send_mail(self):
1043 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001044 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +00001045 self._run_reviewer_test(
1046 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001047 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +00001048 description.strip('\n'),
1049 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001050 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +00001051
1052 def test_reviewer_send_mail_no_rev(self):
1053 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001054 stdout = StringIO.StringIO()
Aaron Gable13101a62018-02-09 13:20:41 -08001055 self.calls = self._rietveld_upload_no_rev_calls() + [
tandriic2405f52016-10-10 08:13:15 -07001056 ((['DieWithError', 'Must specify reviewers to send email.'],),
1057 SystemExitMock())
1058 ]
1059
1060 def RunEditor(desc, _, **kwargs):
1061 return desc
1062 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1063 self.mock(sys, 'stdout', stdout)
1064 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001065 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001066 self.assertEqual(
1067 '=====================================\n'
1068 'NOTICE: Rietveld is being deprecated. '
1069 'You can upload changes to Gerrit with\n'
1070 ' git cl upload --gerrit\n'
1071 'or set Gerrit to be your default code review tool with\n'
1072 ' git config gerrit.host true\n'
1073 '=====================================\n',
1074 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001075
tandriif9aefb72016-07-01 09:06:51 -07001076 def test_bug_on_cmd(self):
1077 self._run_reviewer_test(
1078 ['--bug=500658,proj:123'],
1079 'desc\n\nBUG=500658\nBUG=proj:123',
1080 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1081 'desc\n\nBUG=500658\nBUG=proj:1234',
1082 [])
1083
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001084 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001085 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001086 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001087 if skip_auth_check:
1088 return [((cmd, ), 'true')]
1089
tandrii5d48c322016-08-18 16:19:37 -07001090 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001091 if issue:
1092 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001093 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001094 ])
1095 calls.extend([
1096 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1097 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1098 ((['git', 'config', 'remote.origin.url'],),
1099 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001100 ])
1101 return calls
1102
1103 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001104 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001105 fetched_status=None, other_cl_owner=None,
1106 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001107 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001108 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001109 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1110 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1111 ((['git', 'config', 'branch.master.gerritissue'],),
1112 CERR1 if issue is None else str(issue)),
1113 ]
1114
1115 if custom_cl_base:
1116 ancestor_revision = custom_cl_base
1117 else:
1118 # Determine ancestor_revision to be merge base.
1119 ancestor_revision = 'fake_ancestor_sha'
1120 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001121 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001122 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001123 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001124 'refs/remotes/origin/master'],), ancestor_revision),
1125 ]
1126
1127 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001128 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1129
1130 if issue:
1131 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001132 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001133 'my%2Frepo~123456',
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001134 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS']
1135 ),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001136 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001137 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001138 'change_id': '123456789',
1139 'current_revision': 'sha1_of_current_revision',
1140 'revisions': { 'sha1_of_current_revision': {
1141 'commit': {'message': fetched_description},
1142 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001143 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001144 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001145 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001146 if fetched_status == 'ABANDONED':
1147 calls += [
1148 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1149 '123456 has been abandoned, new uploads are not '
1150 'allowed'), SystemExitMock()),
1151 ]
1152 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001153 if other_cl_owner:
1154 calls += [
1155 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1156 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001157
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001158 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1159 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001160 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001161 ((['git', 'rev-parse', '--show-cdup'],), ''),
1162 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001163
Aaron Gable7817f022017-12-12 09:43:17 -08001164 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1165 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001166 'M\t.gitignore\n'),
1167 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001168 ]
1169
1170 if not issue:
1171 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001172 ((['git', 'log', '--pretty=format:%s%n%n%b',
1173 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001174 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001175 ]
1176
1177 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001178 ((['git', 'config', 'user.email'],), 'me@example.com'),
1179 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1180 ([custom_cl_base] if custom_cl_base else
1181 [ancestor_revision, 'HEAD']),),
1182 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001183 ]
1184 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001185
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001186 @classmethod
1187 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001188 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001189 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001190 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001191 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001192 custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001193 if post_amend_description is None:
1194 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001195 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001196 # Determined in `_gerrit_base_calls`.
1197 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1198
1199 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001200
tandriia60502f2016-06-20 02:01:53 -07001201 if squash_mode == 'default':
1202 calls.extend([
1203 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1204 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1205 ])
1206 elif squash_mode in ('override_squash', 'override_nosquash'):
1207 calls.extend([
1208 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1209 'true' if squash_mode == 'override_squash' else 'false'),
1210 ])
1211 else:
1212 assert squash_mode in ('squash', 'nosquash')
1213
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001214 # If issue is given, then description is fetched from Gerrit instead.
1215 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001216 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001217 ((['git', 'log', '--pretty=format:%s\n\n%b',
1218 ((custom_cl_base + '..') if custom_cl_base else
1219 'fake_ancestor_sha..HEAD')],),
1220 description),
1221 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001222 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001223 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001224 else:
1225 if not title:
1226 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001227 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1228 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001229 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001230 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001231 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001232 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001233 (('DownloadGerritHook', False), ''),
1234 # Amending of commit message to get the Change-Id.
1235 ((['git', 'log', '--pretty=format:%s\n\n%b',
1236 determined_ancestor_revision + '..HEAD'],),
1237 description),
1238 ((['git', 'commit', '--amend', '-m', description],), ''),
1239 ((['git', 'log', '--pretty=format:%s\n\n%b',
1240 determined_ancestor_revision + '..HEAD'],),
1241 post_amend_description)
1242 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001243 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001244 if not issue:
1245 # Prompting to edit description on first upload.
1246 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001247 ((['git', 'config', 'core.editor'],), ''),
1248 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001249 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001250 ref_to_push = 'abcdef0123456789'
1251 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001252 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1253 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1254 ]
1255
1256 if custom_cl_base is None:
1257 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001258 ((['get_or_create_merge_base', 'master',
1259 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001260 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001261 ]
1262 parent = 'origin/master'
1263 else:
1264 calls += [
1265 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1266 'refs/remotes/origin/master'],),
1267 callError(1)), # Means not ancenstor.
1268 (('ask_for_data',
1269 'Do you take responsibility for cleaning up potential mess '
1270 'resulting from proceeding with upload? Press Enter to upload, '
1271 'or Ctrl+C to abort'), ''),
1272 ]
1273 parent = custom_cl_base
1274
1275 calls += [
1276 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1277 '0123456789abcdef'),
1278 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001279 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001280 ref_to_push),
1281 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001282 else:
1283 ref_to_push = 'HEAD'
1284
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001285 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00001286 (('SaveDescriptionBackup',), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001287 ((['git', 'rev-list',
1288 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1289 ref_to_push],),
1290 '1hashPerLine\n'),
1291 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001292
Aaron Gableafd52772017-06-27 16:40:10 -07001293 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001294 ref_suffix = '%ready,notify=ALL'
1295 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001296 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001297 ref_suffix = '%wip'
1298 else:
1299 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001300
Aaron Gable70f4e242017-06-26 10:45:59 -07001301 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001302 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001303
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001304 calls += [
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +00001305 ((['git', 'config', 'rietveld.cc'],), ''),
1306 (('ValidAccounts', 'chromium-review.googlesource.com',
1307 sorted(reviewers) + ['joe@example.com',
1308 'chromium-reviews+test-more-cc@chromium.org'] + cc),
1309 {
1310 # TODO(tandrii): add here some valid accounts and make use of them.
1311 }),
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00001312 ]
1313
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001314 calls.append((
1315 (['git', 'push',
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001316 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001317 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1318 ('remote:\n'
1319 'remote: Processing changes: (\)\n'
1320 'remote: Processing changes: (|)\n'
1321 'remote: Processing changes: (/)\n'
1322 'remote: Processing changes: (-)\n'
1323 'remote: Processing changes: new: 1 (/)\n'
1324 'remote: Processing changes: new: 1, done\n'
1325 'remote:\n'
1326 'remote: New Changes:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001327 'remote: https://chromium-review.googlesource.com/#/c/my/repo/+/123456'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001328 ' XXX\n'
1329 'remote:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001330 'To https://chromium.googlesource.com/my/repo\n'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001331 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')
1332 ))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001333 if squash:
1334 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001335 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001336 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001337 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001338 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001339 ((['git', 'config', 'branch.master.gerritsquashhash',
1340 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001341 ]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001342 if squash:
1343 calls += [
1344 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001345 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001346 sorted(reviewers),
1347 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1348 cc, notify), ''),
1349 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001350 if tbr:
1351 calls += [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001352 (('GetChangeDetail', 'chromium-review.googlesource.com',
1353 'my%2Frepo~123456', ['LABELS']), {
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001354 'labels': {
1355 'Code-Review': {
1356 'default_value': 0,
1357 'all': [],
1358 'values': {
1359 '+2': 'lgtm, approved',
1360 '+1': 'lgtm, but someone else must approve',
1361 ' 0': 'No score',
1362 '-1': 'Don\'t submit as-is',
1363 }
1364 }
1365 }
1366 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001367 (('SetReview',
1368 'chromium-review.googlesource.com',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001369 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001370 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001371 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001372 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001373 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001374 return calls
1375
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001376 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001377 self,
1378 upload_args,
1379 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001380 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001381 squash=True,
1382 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001383 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001384 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001385 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001386 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001387 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001388 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001389 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001390 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001391 custom_cl_base=None,
1392 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001393 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001394 if squash_mode is None:
1395 if '--no-squash' in upload_args:
1396 squash_mode = 'nosquash'
1397 elif '--squash' in upload_args:
1398 squash_mode = 'squash'
1399 else:
1400 squash_mode = 'default'
1401
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001402 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001403 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001404 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001405 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001406 CookiesAuthenticatorMockFactory(
1407 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001408 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1409 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001410 self.mock(git_cl.gclient_utils, 'RunEditor',
1411 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001412 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1413 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001414
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001415 self.calls = self._gerrit_base_calls(
1416 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001417 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001418 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001419 other_cl_owner=other_cl_owner,
1420 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001421 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001422 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1423 expected_content=description))
1424 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001425 self.calls += self._gerrit_upload_calls(
1426 description, reviewers, squash,
1427 squash_mode=squash_mode,
1428 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001429 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001430 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001431 issue=issue, cc=cc,
Aaron Gablefd238082017-06-07 13:42:34 -07001432 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001433 # Uncomment when debugging.
1434 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001435 git_cl.main(['upload'] + upload_args)
1436
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001437 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001438 self._run_gerrit_upload_test(
1439 ['--no-squash'],
1440 'desc\n\nBUG=\n',
1441 [],
1442 squash=False,
1443 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1444
1445 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001446 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001447 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001448 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001449 [],
tandriia60502f2016-06-20 02:01:53 -07001450 squash=False,
1451 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001452 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001453
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001454 def test_gerrit_no_reviewer(self):
1455 self._run_gerrit_upload_test(
1456 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001457 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001458 [],
1459 squash=False,
1460 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001461
Nick Carter8692b182017-11-06 16:30:38 -08001462 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001463 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1464 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001465 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001466 'desc\n\nBUG=\n\nChange-Id: I123456789',
1467 squash=False,
1468 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001469 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001470
ukai@chromium.orge8077812012-02-03 03:41:46 +00001471 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001472 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001473 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001474 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001475 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001476 squash=False,
1477 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001478 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001479
1480 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001481 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001482 [],
bradnelsond975b302016-10-23 12:20:23 -07001483 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1484 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001485 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001486 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001487 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001488 cc=['more@example.com', 'people@example.com'],
1489 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001490
1491 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001492 self._run_gerrit_upload_test(
1493 [],
1494 'desc\nBUG=\n\nChange-Id: 123456789',
1495 [],
1496 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001497
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001498 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001499 self._run_gerrit_upload_test(
1500 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001501 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001502 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001503 squash=True,
1504 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001505
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001506 def test_gerrit_upload_squash_first_against_rev(self):
1507 custom_cl_base = 'custom_cl_base_rev_or_branch'
1508 self._run_gerrit_upload_test(
1509 ['--squash', custom_cl_base],
1510 'desc\nBUG=\n\nChange-Id: 123456789',
1511 [],
1512 squash=True,
1513 expected_upstream_ref='origin/master',
1514 custom_cl_base=custom_cl_base)
1515 self.assertIn(
1516 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1517 sys.stdout.getvalue())
1518
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001519 def test_gerrit_upload_squash_reupload(self):
1520 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001521 self._run_gerrit_upload_test(
1522 ['--squash'],
1523 description,
1524 [],
1525 squash=True,
1526 expected_upstream_ref='origin/master',
1527 issue=123456)
1528
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001529 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1530 self.mock(git_cl, 'DieWithError',
1531 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1532 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1533 with self.assertRaises(SystemExitMock):
1534 self._run_gerrit_upload_test(
1535 ['--squash'],
1536 description,
1537 [],
1538 squash=True,
1539 expected_upstream_ref='origin/master',
1540 issue=123456,
1541 fetched_status='ABANDONED')
1542
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001543 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1544 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1545 lambda *_, **__: {'email': 'yet-another@example.com'})
1546 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1547 self._run_gerrit_upload_test(
1548 ['--squash'],
1549 description,
1550 [],
1551 squash=True,
1552 expected_upstream_ref='origin/master',
1553 issue=123456,
1554 other_cl_owner='other@example.com')
1555 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001556 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001557 'authenticate to Gerrit as yet-another@example.com.\n'
1558 'Uploading may fail due to lack of permissions',
1559 git_cl.sys.stdout.getvalue())
1560
rmistry@google.com2dd99862015-06-22 12:22:18 +00001561 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001562 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001563 def mock_run_git(*args, **_kwargs):
1564 if args[0] == ['for-each-ref',
1565 '--format=%(refname:short) %(upstream:short)',
1566 'refs/heads']:
1567 # Create a local branch dependency tree that looks like this:
1568 # test1 -> test2 -> test3 -> test4 -> test5
1569 # -> test3.1
1570 # test6 -> test0
1571 branch_deps = [
1572 'test2 test1', # test1 -> test2
1573 'test3 test2', # test2 -> test3
1574 'test3.1 test2', # test2 -> test3.1
1575 'test4 test3', # test3 -> test4
1576 'test5 test4', # test4 -> test5
1577 'test6 test0', # test0 -> test6
1578 'test7', # test7
1579 ]
1580 return '\n'.join(branch_deps)
1581 self.mock(git_cl, 'RunGit', mock_run_git)
1582
1583 class RecordCalls:
1584 times_called = 0
1585 record_calls = RecordCalls()
1586 def mock_CMDupload(*args, **_kwargs):
1587 record_calls.times_called += 1
1588 return 0
1589 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1590
1591 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001592 (('ask_for_data', 'This command will checkout all dependent branches '
1593 'and run "git cl upload". Press Enter to continue, '
1594 'or Ctrl+C to abort'), ''),
1595 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001596
1597 class MockChangelist():
1598 def __init__(self):
1599 pass
1600 def GetBranch(self):
1601 return 'test1'
1602 def GetIssue(self):
1603 return '123'
1604 def GetPatchset(self):
1605 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001606 def IsGerrit(self):
1607 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001608
1609 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1610 # CMDupload should have been called 5 times because of 5 dependent branches.
1611 self.assertEquals(5, record_calls.times_called)
1612 self.assertEquals(0, ret)
1613
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001614 def test_gerrit_change_id(self):
1615 self.calls = [
1616 ((['git', 'write-tree'], ),
1617 'hashtree'),
1618 ((['git', 'rev-parse', 'HEAD~0'], ),
1619 'branch-parent'),
1620 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1621 'A B <a@b.org> 1456848326 +0100'),
1622 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1623 'C D <c@d.org> 1456858326 +0100'),
1624 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1625 'hashchange'),
1626 ]
1627 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1628 self.assertEqual(change_id, 'Ihashchange')
1629
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001630 def test_desecription_append_footer(self):
1631 for init_desc, footer_line, expected_desc in [
1632 # Use unique desc first lines for easy test failure identification.
1633 ('foo', 'R=one', 'foo\n\nR=one'),
1634 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1635 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1636 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1637 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1638 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1639 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1640 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1641 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1642 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1643 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1644 ]:
1645 desc = git_cl.ChangeDescription(init_desc)
1646 desc.append_footer(footer_line)
1647 self.assertEqual(desc.description, expected_desc)
1648
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001649 def test_update_reviewers(self):
1650 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001651 ('foo', [], [],
1652 'foo'),
1653 ('foo\nR=xx', [], [],
1654 'foo\nR=xx'),
1655 ('foo\nTBR=xx', [], [],
1656 'foo\nTBR=xx'),
1657 ('foo', ['a@c'], [],
1658 'foo\n\nR=a@c'),
1659 ('foo\nR=xx', ['a@c'], [],
1660 'foo\n\nR=a@c, xx'),
1661 ('foo\nTBR=xx', ['a@c'], [],
1662 'foo\n\nR=a@c\nTBR=xx'),
1663 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1664 'foo\n\nR=a@c, yy\nTBR=xx'),
1665 ('foo\nBUG=', ['a@c'], [],
1666 'foo\nBUG=\nR=a@c'),
1667 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1668 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1669 ('foo', ['a@c', 'b@c'], [],
1670 'foo\n\nR=a@c, b@c'),
1671 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1672 'foo\nBar\n\nR=c@c\nBUG='),
1673 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1674 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001675 # Same as the line before, but full of whitespaces.
1676 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001677 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001678 'foo\nBar\n\nR=c@c\n BUG =',
1679 ),
1680 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001681 ('foo BUG=allo R=joe ', ['c@c'], [],
1682 'foo BUG=allo R=joe\n\nR=c@c'),
1683 # Redundant TBRs get promoted to Rs
1684 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1685 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001686 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001687 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001688 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001689 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001690 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001691 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001692 actual.append(obj.description)
1693 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001694
Nodir Turakulov23b82142017-11-16 11:04:25 -08001695 def test_get_hash_tags(self):
1696 cases = [
1697 ('', []),
1698 ('a', []),
1699 ('[a]', ['a']),
1700 ('[aa]', ['aa']),
1701 ('[a ]', ['a']),
1702 ('[a- ]', ['a']),
1703 ('[a- b]', ['a-b']),
1704 ('[a--b]', ['a-b']),
1705 ('[a', []),
1706 ('[a]x', ['a']),
1707 ('[aa]x', ['aa']),
1708 ('[a b]', ['a-b']),
1709 ('[a b]', ['a-b']),
1710 ('[a__b]', ['a-b']),
1711 ('[a] x', ['a']),
1712 ('[a][b]', ['a', 'b']),
1713 ('[a] [b]', ['a', 'b']),
1714 ('[a][b]x', ['a', 'b']),
1715 ('[a][b] x', ['a', 'b']),
1716 ('[a]\n[b]', ['a']),
1717 ('[a\nb]', []),
1718 ('[a][', ['a']),
1719 ('Revert "[a] feature"', ['a']),
1720 ('Reland "[a] feature"', ['a']),
1721 ('Revert: [a] feature', ['a']),
1722 ('Reland: [a] feature', ['a']),
1723 ('Revert "Reland: [a] feature"', ['a']),
1724 ('Foo: feature', ['foo']),
1725 ('Foo Bar: feature', ['foo-bar']),
1726 ('Revert "Foo bar: feature"', ['foo-bar']),
1727 ('Reland "Foo bar: feature"', ['foo-bar']),
1728 ]
1729 for desc, expected in cases:
1730 change_desc = git_cl.ChangeDescription(desc)
1731 actual = change_desc.get_hash_tags()
1732 self.assertEqual(
1733 actual,
1734 expected,
1735 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1736
wittman@chromium.org455dc922015-01-26 20:15:50 +00001737 def test_get_target_ref(self):
1738 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001739 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001740 self.assertEqual(None, git_cl.GetTargetRef(None,
1741 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001742 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001743
wittman@chromium.org455dc922015-01-26 20:15:50 +00001744 # Check default target refs for branches.
1745 self.assertEqual('refs/heads/master',
1746 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001747 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001748 self.assertEqual('refs/heads/master',
1749 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001750 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001751 self.assertEqual('refs/heads/master',
1752 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001753 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001754 self.assertEqual('refs/branch-heads/123',
1755 git_cl.GetTargetRef('origin',
1756 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001757 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001758 self.assertEqual('refs/diff/test',
1759 git_cl.GetTargetRef('origin',
1760 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001761 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001762 self.assertEqual('refs/heads/chrome/m42',
1763 git_cl.GetTargetRef('origin',
1764 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001765 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001766
1767 # Check target refs for user-specified target branch.
1768 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1769 'refs/remotes/branch-heads/123'):
1770 self.assertEqual('refs/branch-heads/123',
1771 git_cl.GetTargetRef('origin',
1772 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001773 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001774 for branch in ('origin/master', 'remotes/origin/master',
1775 'refs/remotes/origin/master'):
1776 self.assertEqual('refs/heads/master',
1777 git_cl.GetTargetRef('origin',
1778 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001779 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001780 for branch in ('master', 'heads/master', 'refs/heads/master'):
1781 self.assertEqual('refs/heads/master',
1782 git_cl.GetTargetRef('origin',
1783 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001784 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001785
wychen@chromium.orga872e752015-04-28 23:42:18 +00001786 def test_patch_when_dirty(self):
1787 # Patch when local tree is dirty
1788 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1789 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1790
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001791 @staticmethod
1792 def _get_gerrit_codereview_server_calls(branch, value=None,
1793 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001794 detect_branch=True,
1795 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001796 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1797
1798 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1799 """
1800 calls = []
1801 if detect_branch:
1802 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001803 if detect_server:
1804 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1805 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001806 if value is None:
1807 calls += [
1808 ((['git', 'config', 'branch.' + branch + '.merge'],),
1809 'refs/heads' + branch),
1810 ((['git', 'config', 'branch.' + branch + '.remote'],),
1811 'origin'),
1812 ((['git', 'config', 'remote.origin.url'],),
1813 'https://%s.googlesource.com/my/repo' % git_short_host),
1814 ]
1815 return calls
1816
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001817 def _patch_common(self, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001818 new_branch=False, git_short_host='host',
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001819 detect_gerrit_server=False,
1820 actual_codereview=None,
1821 codereview_in_url=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001822 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001823 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1824 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001825 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001826 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001827 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1828
tandriidf09a462016-08-18 16:23:55 -07001829 if new_branch:
1830 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001831
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001832 if codereview_in_url and actual_codereview == 'rietveld':
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001833 self.calls += [
1834 ((['git', 'rev-parse', '--show-cdup'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001835 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001836 ]
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001837
1838 if not force_codereview and not codereview_in_url:
1839 # These calls detect codereview to use.
1840 self.calls += [
1841 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1842 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1843 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1844 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1845 ((['git', 'config', 'gerrit.host'],), 'true'),
1846 ]
1847 if detect_gerrit_server:
1848 self.calls += self._get_gerrit_codereview_server_calls(
1849 'master', git_short_host=git_short_host,
1850 detect_branch=not new_branch and force_codereview)
1851 actual_codereview = 'gerrit'
1852
1853 if actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001854 self.calls += [
1855 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001856 'my%2Frepo~123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001857 {
1858 'current_revision': '7777777777',
1859 'revisions': {
1860 '1111111111': {
1861 '_number': 1,
1862 'fetch': {'http': {
1863 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1864 'ref': 'refs/changes/56/123456/1',
1865 }},
1866 },
1867 '7777777777': {
1868 '_number': 7,
1869 'fetch': {'http': {
1870 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1871 'ref': 'refs/changes/56/123456/7',
1872 }},
1873 },
1874 },
1875 }),
1876 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001877
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001878 def test_patch_rietveld_guess_by_url(self):
1879 self._patch_common(actual_codereview='rietveld', codereview_in_url=True)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001880 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001881 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001882 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001883 ((['git', 'config', 'branch.master.rietveldserver',
1884 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001885 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001886 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001887 ((['git', 'commit', '-m',
1888 'Description\n\n' +
1889 'patch from issue 123456 at patchset 60001 ' +
1890 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001891 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001892 self.assertEqual(git_cl.main(
1893 ['patch', 'https://codereview.example.com/123456']), 0)
1894
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001895 def test_patch_gerrit_default(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001896 self._patch_common(git_short_host='chromium', detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001897 self.calls += [
1898 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1899 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001900 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001901 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001902 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001903 ((['git', 'config', 'branch.master.gerritserver',
1904 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001905 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001906 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1907 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1908 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001909 ]
1910 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1911
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001912 def test_patch_gerrit_new_branch(self):
1913 self._patch_common(
1914 git_short_host='chromium', detect_gerrit_server=True, new_branch=True)
1915 self.calls += [
1916 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1917 'refs/changes/56/123456/7'],), ''),
1918 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1919 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1920 ''),
1921 ((['git', 'config', 'branch.master.gerritserver',
1922 'https://chromium-review.googlesource.com'],), ''),
1923 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1924 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1925 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1926 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1927 ]
1928 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1929
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001930 def test_patch_gerrit_force(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001931 self._patch_common(
1932 force_codereview=True, git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001933 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001934 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001935 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001936 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001937 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001938 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001939 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001940 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001941 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001942 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1943 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1944 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001945 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001946 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001947
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001948 def test_patch_gerrit_guess_by_url(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001949 self.calls += self._get_gerrit_codereview_server_calls(
1950 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001951 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001952 actual_codereview='gerrit', git_short_host='else',
1953 codereview_in_url=True, detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001954 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001955 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001956 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001957 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001958 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001959 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001960 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001961 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001962 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001963 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1964 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1965 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001966 ]
1967 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001968 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001969
Aaron Gable697a91b2018-01-19 15:20:15 -08001970 def test_patch_gerrit_guess_by_url_with_repo(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001971 self.calls += self._get_gerrit_codereview_server_calls(
1972 'master', git_short_host='else', detect_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001973 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001974 actual_codereview='gerrit', git_short_host='else',
1975 codereview_in_url=True, detect_gerrit_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001976 self.calls += [
1977 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1978 'refs/changes/56/123456/1'],), ''),
1979 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1980 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1981 ''),
1982 ((['git', 'config', 'branch.master.gerritserver',
1983 'https://else-review.googlesource.com'],), ''),
1984 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1985 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1986 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1987 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1988 ]
1989 self.assertEqual(git_cl.main(
1990 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1991 0)
1992
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001993 def test_patch_gerrit_conflict(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001994 self._patch_common(detect_gerrit_server=True, git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001995 self.calls += [
1996 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001997 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001998 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1999 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2000 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 ]
2002 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002003 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002004
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002005 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002006 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002007 raise git_cl.gerrit_util.GerritError(404, '')
2008 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2009
tandriic2405f52016-10-10 08:13:15 -07002010 self.calls = [
2011 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002012 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2013 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2014 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2015 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002016 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2017 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2018 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2019 ((['git', 'config', 'remote.origin.url'],),
2020 'https://chromium.googlesource.com/my/repo'),
2021 ((['DieWithError',
2022 'change 123456 at https://chromium-review.googlesource.com does not '
2023 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002024 ]
2025 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002026 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002027
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002028 def _checkout_calls(self):
2029 return [
2030 ((['git', 'config', '--local', '--get-regexp',
2031 'branch\\..*\\.rietveldissue'], ),
2032 ('branch.retrying.rietveldissue 1111111111\n'
2033 'branch.some-fix.rietveldissue 2222222222\n')),
2034 ((['git', 'config', '--local', '--get-regexp',
2035 'branch\\..*\\.gerritissue'], ),
2036 ('branch.ger-branch.gerritissue 123456\n'
2037 'branch.gbranch654.gerritissue 654321\n')),
2038 ]
2039
2040 def test_checkout_gerrit(self):
2041 """Tests git cl checkout <issue>."""
2042 self.calls = self._checkout_calls()
2043 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2044 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2045
2046 def test_checkout_rietveld(self):
2047 """Tests git cl checkout <issue>."""
2048 self.calls = self._checkout_calls()
2049 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2050 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2051
2052 def test_checkout_not_found(self):
2053 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002054 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002055 self.calls = self._checkout_calls()
2056 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2057
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002058 def test_checkout_no_branch_issues(self):
2059 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002060 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002061 self.calls = [
2062 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002063 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002064 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002065 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002066 ]
2067 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2068
tandrii@chromium.org28253532016-04-14 13:46:56 +00002069 def _test_gerrit_ensure_authenticated_common(self, auth,
2070 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002071 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2072 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2073 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002074 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002075 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002076 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002077 cl.branch = 'master'
2078 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002079 cl.lookedup_issue = True
2080 return cl
2081
2082 def test_gerrit_ensure_authenticated_missing(self):
2083 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002084 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002085 })
2086 self.calls.append(
2087 ((['DieWithError',
2088 'Credentials for the following hosts are required:\n'
2089 ' chromium-review.googlesource.com\n'
2090 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002091 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002092 'https://chromium-review.googlesource.com/new-password'],), ''),)
2093 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2094
2095 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002096 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002097 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002098 'chromium.googlesource.com':
2099 ('git-one.example.com', None, 'secret1'),
2100 'chromium-review.googlesource.com':
2101 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002102 })
2103 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002104 (('ask_for_data', 'If you know what you are doing '
2105 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002106 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2107
2108 def test_gerrit_ensure_authenticated_ok(self):
2109 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002110 'chromium.googlesource.com':
2111 ('git-same.example.com', None, 'secret'),
2112 'chromium-review.googlesource.com':
2113 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002114 })
2115 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2116
tandrii@chromium.org28253532016-04-14 13:46:56 +00002117 def test_gerrit_ensure_authenticated_skipped(self):
2118 cl = self._test_gerrit_ensure_authenticated_common(
2119 auth={}, skip_auth_check=True)
2120 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2121
Eric Boren2fb63102018-10-05 13:05:03 +00002122 def test_gerrit_ensure_authenticated_bearer_token(self):
2123 cl = self._test_gerrit_ensure_authenticated_common(auth={
2124 'chromium.googlesource.com':
2125 ('', None, 'secret'),
2126 'chromium-review.googlesource.com':
2127 ('', None, 'secret'),
2128 })
2129 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2130 header = gerrit_util.CookiesAuthenticator().get_auth_header(
2131 'chromium.googlesource.com')
2132 self.assertTrue('Bearer' in header)
2133
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002134 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002135 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2136 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002137 self.calls = [
2138 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002139 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002140 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2141 ((['git', 'config', 'rietveld.server'],), ''),
2142 ((['git', 'config', 'rietveld.server'],), ''),
2143 ((['git', 'config', 'branch.feature.rietveldserver'],),
2144 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002145 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002146 ]
2147 self.assertEqual(0, git_cl.main(['set-commit']))
2148
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002149 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002150 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002151 lambda h, i, labels, notify=None:
2152 self._mocked_call(['SetReview', h, i, labels, notify]))
2153
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002154 self.calls = [
2155 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002156 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2157 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002158 ((['git', 'config', 'branch.feature.gerritserver'],),
2159 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002160 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
2161 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2162 ((['git', 'config', 'remote.origin.url'],),
2163 'https://chromium.googlesource.com/infra/infra.git'),
2164 ((['SetReview', 'chromium-review.googlesource.com',
2165 'infra%2Finfra~123',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002166 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002167 ]
tandriid9e5ce52016-07-13 02:32:59 -07002168
2169 def test_cmd_set_commit_gerrit_clear(self):
2170 self._cmd_set_commit_gerrit_common(0)
2171 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2172
2173 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002174 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002175 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2176
tandriid9e5ce52016-07-13 02:32:59 -07002177 def test_cmd_set_commit_gerrit(self):
2178 self._cmd_set_commit_gerrit_common(2)
2179 self.assertEqual(0, git_cl.main(['set-commit']))
2180
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002181 def test_description_display(self):
2182 out = StringIO.StringIO()
2183 self.mock(git_cl.sys, 'stdout', out)
2184
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002185 self.mock(git_cl, 'Changelist', ChangelistMock)
2186 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002187
2188 self.assertEqual(0, git_cl.main(['description', '-d']))
2189 self.assertEqual('foo\n', out.getvalue())
2190
2191 def test_description_rietveld(self):
2192 out = StringIO.StringIO()
2193 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002194 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002195
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002196 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002197 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002198 self.assertEqual('foobar\n', out.getvalue())
2199
iannucci3c972b92016-08-17 13:24:10 -07002200 def test_StatusFieldOverrideIssueMissingArgs(self):
2201 out = StringIO.StringIO()
2202 self.mock(git_cl.sys, 'stderr', out)
2203
2204 try:
2205 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2206 except SystemExit as ex:
2207 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002208 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002209
2210 out = StringIO.StringIO()
2211 self.mock(git_cl.sys, 'stderr', out)
2212
2213 try:
2214 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2215 except SystemExit as ex:
2216 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002217 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002218
2219 def test_StatusFieldOverrideIssue(self):
2220 out = StringIO.StringIO()
2221 self.mock(git_cl.sys, 'stdout', out)
2222
2223 def assertIssue(cl_self, *_args):
2224 self.assertEquals(cl_self.issue, 1)
2225 return 'foobar'
2226
2227 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2228 self.calls = [
2229 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2230 ((['git', 'config', 'rietveld.server'],), ''),
2231 ((['git', 'config', 'rietveld.server'],), ''),
2232 ]
iannuccie53c9352016-08-17 14:40:40 -07002233 self.assertEqual(
2234 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2235 0)
iannucci3c972b92016-08-17 13:24:10 -07002236 self.assertEqual(out.getvalue(), 'foobar\n')
2237
iannuccie53c9352016-08-17 14:40:40 -07002238 def test_SetCloseOverrideIssue(self):
2239 def assertIssue(cl_self, *_args):
2240 self.assertEquals(cl_self.issue, 1)
2241 return 'foobar'
2242
2243 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2244 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2245 self.calls = [
2246 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2247 ((['git', 'config', 'rietveld.server'],), ''),
2248 ((['git', 'config', 'rietveld.server'],), ''),
2249 ]
2250 self.assertEqual(
2251 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2252
2253 def test_SetCommitOverrideIssue(self):
2254 def assertIssue(cl_self, *_args):
2255 self.assertEquals(cl_self.issue, 1)
2256 return 'foobar'
2257
2258 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2259 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2260 self.calls = [
2261 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2262 ((['git', 'config', 'rietveld.server'],), ''),
2263 ((['git', 'config', 'rietveld.server'],), ''),
2264 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2265 ((['git', 'config', 'rietveld.server'],), ''),
2266 ((['git', 'config', 'rietveld.server'],), ''),
2267 ]
2268 self.assertEqual(
2269 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2270
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002271 def test_description_gerrit(self):
2272 out = StringIO.StringIO()
2273 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002274 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002275 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2276 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2277 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2278 ((['git', 'config', 'remote.origin.url'],),
2279 'https://chromium.googlesource.com/my/repo'),
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002280 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002281 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002282 {
2283 'current_revision': 'sha1',
2284 'revisions': {'sha1': {
2285 'commit': {'message': 'foobar'},
2286 }},
2287 }),
2288 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002289 self.assertEqual(0, git_cl.main([
2290 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2291 self.assertEqual('foobar\n', out.getvalue())
2292
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002293 def test_description_set_raw(self):
2294 out = StringIO.StringIO()
2295 self.mock(git_cl.sys, 'stdout', out)
2296
2297 self.mock(git_cl, 'Changelist', ChangelistMock)
2298 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2299
2300 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2301 self.assertEqual('hihi', ChangelistMock.desc)
2302
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002303 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002304 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002305
2306 def RunEditor(desc, _, **kwargs):
2307 self.assertEquals(
2308 '# Enter a description of the change.\n'
2309 '# This will be displayed on the codereview site.\n'
2310 '# The first line will also be used as the subject of the review.\n'
2311 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002312 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002313 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002314 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002315 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002316 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002317
dsansomee2d6fd92016-09-08 00:10:47 -07002318 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002319 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002320
2321 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2322 self.mock(git_cl.Changelist, 'GetDescription',
2323 lambda *args: current_desc)
2324 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2325 UpdateDescriptionRemote)
2326 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2327
2328 self.calls = [
2329 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002330 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002331 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2332 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002333 ((['git', 'config', 'core.editor'],), 'vi'),
2334 ]
2335 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2336
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002337 def test_description_set_stdin(self):
2338 out = StringIO.StringIO()
2339 self.mock(git_cl.sys, 'stdout', out)
2340
2341 self.mock(git_cl, 'Changelist', ChangelistMock)
2342 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2343
2344 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2345 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2346
kmarshall3bff56b2016-06-06 18:31:47 -07002347 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002348 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2349
kmarshall3bff56b2016-06-06 18:31:47 -07002350 self.calls = \
2351 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2352 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002353 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002354 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2355 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002356 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2357 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2358 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002359 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2360 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2361 ((['git', 'branch', '-D', 'foo'],), '')]
2362
kmarshall3bff56b2016-06-06 18:31:47 -07002363 self.mock(git_cl, 'get_cl_statuses',
2364 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002365 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2366 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2367 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002368
2369 self.assertEqual(0, git_cl.main(['archive', '-f']))
2370
2371 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002372 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002373 self.calls = \
2374 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2375 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002376 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002377 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2378 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002379 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2380
kmarshall9249e012016-08-23 12:02:16 -07002381 self.mock(git_cl, 'get_cl_statuses',
2382 lambda branches, fine_grained, max_processes:
2383 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2384
2385 self.assertEqual(1, git_cl.main(['archive', '-f']))
2386
2387 def test_archive_dry_run(self):
2388 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2389
2390 self.calls = \
2391 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2392 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2393 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2394 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2395 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2396 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2397 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2398 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2399 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002400
2401 self.mock(git_cl, 'get_cl_statuses',
2402 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002403 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2404 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2405 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002406
kmarshall9249e012016-08-23 12:02:16 -07002407 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2408
2409 def test_archive_no_tags(self):
2410 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2411
2412 self.calls = \
2413 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2414 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2415 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2416 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2417 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2418 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2419 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2420 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2421 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2422 ((['git', 'branch', '-D', 'foo'],), '')]
2423
2424 self.mock(git_cl, 'get_cl_statuses',
2425 lambda branches, fine_grained, max_processes:
2426 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2427 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2428 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2429
2430 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002431
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002432 def test_cmd_issue_erase_existing(self):
2433 out = StringIO.StringIO()
2434 self.mock(git_cl.sys, 'stdout', out)
2435 self.calls = [
2436 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002437 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2438 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002439 # Let this command raise exception (retcode=1) - it should be ignored.
2440 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002441 CERR1),
2442 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2443 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002444 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2445 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2446 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002447 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002448 ]
2449 self.assertEqual(0, git_cl.main(['issue', '0']))
2450
Aaron Gable400e9892017-07-12 15:31:21 -07002451 def test_cmd_issue_erase_existing_with_change_id(self):
2452 out = StringIO.StringIO()
2453 self.mock(git_cl.sys, 'stdout', out)
2454 self.mock(git_cl.Changelist, 'GetDescription',
2455 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2456 self.calls = [
2457 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2458 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2459 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002460 # Let this command raise exception (retcode=1) - it should be ignored.
2461 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2462 CERR1),
2463 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2464 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2465 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2466 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2467 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002468 ((['git', 'log', '-1', '--format=%B'],),
2469 'This is a description\n\nChange-Id: Ideadbeef'),
2470 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002471 ]
2472 self.assertEqual(0, git_cl.main(['issue', '0']))
2473
phajdan.jre328cf92016-08-22 04:12:17 -07002474 def test_cmd_issue_json(self):
2475 out = StringIO.StringIO()
2476 self.mock(git_cl.sys, 'stdout', out)
2477 self.calls = [
2478 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002479 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002480 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2481 ((['git', 'config', 'rietveld.server'],),
2482 'https://codereview.chromium.org'),
2483 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2484 (('write_json', 'output.json',
2485 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2486 ''),
2487 ]
2488 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2489
tandriide281ae2016-10-12 06:02:30 -07002490 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002491 self.mock(git_cl.Changelist, 'GetChange',
2492 lambda _, *a: (
2493 self._mocked_call(['GetChange']+list(a))))
2494 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2495 lambda *_, **__: (
2496 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002497 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2498 lambda _, s: self._mocked_call(['SetCQState', s]))
2499 self.calls = [
2500 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002501 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002502 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2503 ((['git', 'config', 'rietveld.server'],),
2504 'https://codereview.chromium.org'),
2505 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2506 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2507 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2508 ((['get_or_create_merge_base', 'feature', 'feature'],),
2509 'fake_ancestor_sha'),
2510 ((['GetChange', 'fake_ancestor_sha', None], ),
2511 git_cl.presubmit_support.GitChange(
2512 '', '', '', '', '', '', '', '')),
2513 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2514 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002515 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2516 ]
2517 out = StringIO.StringIO()
2518 self.mock(git_cl.sys, 'stdout', out)
2519 self.assertEqual(0, git_cl.main(['try']))
2520 self.assertEqual(
2521 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002522 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002523
tandrii8c5a3532016-11-04 07:52:02 -07002524 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2525 self.mock(git_cl.Changelist, 'GetChange',
2526 lambda _, *a: (
2527 self._mocked_call(['GetChange']+list(a))))
2528 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2529 lambda *_, **__: (
2530 self._mocked_call(['DoGetTryMasters'])))
2531 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2532 lambda _, s: self._mocked_call(['SetCQState', s]))
2533
tandrii8c5a3532016-11-04 07:52:02 -07002534 self.calls = [
2535 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2536 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2537 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2538 ((['git', 'config', 'branch.feature.gerritserver'],),
2539 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002540 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2541 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2542 ((['git', 'config', 'remote.origin.url'],),
2543 'https://chromium.googlesource.com/depot_tools'),
2544 (('GetChangeDetail', 'chromium-review.googlesource.com',
2545 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002546 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2547 'project': 'depot_tools',
2548 'status': 'OPEN',
2549 'owner': {'email': 'owner@e.mail'},
2550 'revisions': {
2551 'deadbeaf': {
2552 '_number': 6,
2553 },
2554 'beeeeeef': {
2555 '_number': 7,
2556 'fetch': {'http': {
2557 'url': 'https://chromium.googlesource.com/depot_tools',
2558 'ref': 'refs/changes/56/123456/7'
2559 }},
2560 },
2561 },
2562 }),
tandrii8c5a3532016-11-04 07:52:02 -07002563 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2564 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2565 ((['get_or_create_merge_base', 'feature', 'feature'],),
2566 'fake_ancestor_sha'),
2567 ((['GetChange', 'fake_ancestor_sha', None], ),
2568 git_cl.presubmit_support.GitChange(
2569 '', '', '', '', '', '', '', '')),
2570 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2571 ((['DoGetTryMasters'], ), None),
2572 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2573 ]
2574 out = StringIO.StringIO()
2575 self.mock(git_cl.sys, 'stdout', out)
2576 self.assertEqual(0, git_cl.main(['try']))
2577 self.assertEqual(
2578 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002579 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002580 'https://chromium-review.googlesource.com/123456\n')
2581
2582 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2583 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2584 lambda _: {
2585 'owner_email': 'owner@e.mail',
2586 'private': False,
2587 'closed': False,
2588 'project': 'depot_tools',
2589 'patchsets': [20001],
2590 })
tandriide281ae2016-10-12 06:02:30 -07002591 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2592 self.calls = [
2593 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2594 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2595 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2596 ((['git', 'config', 'rietveld.server'],),
2597 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002598 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002599 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002600 ]
2601
2602 def _buildbucket_retry(*_, **kw):
2603 # self.maxDiff = 10000
2604 body = json.loads(kw['body'])
2605 self.assertEqual(len(body['builds']), 1)
2606 build = body['builds'][0]
2607 params = json.loads(build.pop('parameters_json'))
2608 self.assertEqual(params, {
2609 u'builder_name': u'win',
2610 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2611 u'revision': None}],
2612 u'properties': {
2613 u'category': u'git_cl_try',
2614 u'issue': 123,
2615 u'key': u'val',
2616 u'json': [{u'a': 1}, None],
2617 u'master': u'tryserver.chromium',
2618 u'patch_project': u'depot_tools',
2619 u'patch_storage': u'rietveld',
2620 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002621 u'rietveld': u'https://codereview.chromium.org',
2622 }
2623 })
2624 self.assertEqual(build, {
2625 u'bucket': u'master.tryserver.chromium',
2626 u'client_operation_id': u'uuid4',
2627 u'tags': [u'builder:win',
2628 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002629 u'user_agent:git_cl_try',
2630 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002631 })
2632
2633 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2634
2635 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2636 self.assertEqual(0, git_cl.main([
2637 'try', '-m', 'tryserver.chromium', '-b', 'win',
2638 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2639 self.assertRegexpMatches(
2640 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002641 'Tried jobs on:\nBucket: master.tryserver.chromium')
2642
tandrii8c5a3532016-11-04 07:52:02 -07002643 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2644 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2645 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2646
tandrii8c5a3532016-11-04 07:52:02 -07002647 self.calls = [
2648 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2649 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2650 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2651 ((['git', 'config', 'branch.feature.gerritserver'],),
2652 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002653 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2654 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2655 ((['git', 'config', 'remote.origin.url'],),
2656 'https://chromium.googlesource.com/depot_tools'),
2657 (('GetChangeDetail', 'chromium-review.googlesource.com',
2658 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002659 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002660 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002661 'status': 'OPEN',
2662 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002663 'revisions': {
2664 'deadbeaf': {
2665 '_number': 6,
2666 },
2667 'beeeeeef': {
2668 '_number': 7,
2669 'fetch': {'http': {
2670 'url': 'https://chromium.googlesource.com/depot_tools',
2671 'ref': 'refs/changes/56/123456/7'
2672 }},
2673 },
2674 },
2675 }),
2676 ]
2677
2678 def _buildbucket_retry(*_, **kw):
2679 # self.maxDiff = 10000
2680 body = json.loads(kw['body'])
2681 self.assertEqual(len(body['builds']), 1)
2682 build = body['builds'][0]
2683 params = json.loads(build.pop('parameters_json'))
2684 self.assertEqual(params, {
2685 u'builder_name': u'win',
2686 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2687 u'revision': None}],
2688 u'properties': {
2689 u'category': u'git_cl_try',
2690 u'key': u'val',
2691 u'json': [{u'a': 1}, None],
2692 u'master': u'tryserver.chromium',
2693
2694 u'patch_gerrit_url':
2695 u'https://chromium-review.googlesource.com',
2696 u'patch_issue': 123456,
2697 u'patch_project': u'depot_tools',
2698 u'patch_ref': u'refs/changes/56/123456/7',
2699 u'patch_repository_url':
2700 u'https://chromium.googlesource.com/depot_tools',
2701 u'patch_set': 7,
2702 u'patch_storage': u'gerrit',
2703 }
2704 })
2705 self.assertEqual(build, {
2706 u'bucket': u'master.tryserver.chromium',
2707 u'client_operation_id': u'uuid4',
2708 u'tags': [
2709 u'builder:win',
2710 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2711 u'user_agent:git_cl_try',
2712 u'master:tryserver.chromium'],
2713 })
2714
2715 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2716
2717 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2718 self.assertEqual(0, git_cl.main([
2719 'try', '-m', 'tryserver.chromium', '-b', 'win',
2720 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2721 self.assertRegexpMatches(
2722 git_cl.sys.stdout.getvalue(),
2723 'Tried jobs on:\nBucket: master.tryserver.chromium')
2724
borenet6c0efe62016-10-19 08:13:29 -07002725 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002726 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2727 lambda _: {
2728 'owner_email': 'owner@e.mail',
2729 'private': False,
2730 'closed': False,
2731 'project': 'depot_tools',
2732 'patchsets': [20001],
2733 })
borenet6c0efe62016-10-19 08:13:29 -07002734 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2735 self.calls = [
2736 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2737 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2738 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2739 ((['git', 'config', 'rietveld.server'],),
2740 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002741 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002742 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002743 ]
2744
2745 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002746 body = json.loads(kw['body'])
2747 self.assertEqual(len(body['builds']), 1)
2748 build = body['builds'][0]
2749 params = json.loads(build.pop('parameters_json'))
2750 self.assertEqual(params, {
2751 u'builder_name': u'win',
2752 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2753 u'revision': None}],
2754 u'properties': {
2755 u'category': u'git_cl_try',
2756 u'issue': 123,
2757 u'patch_project': u'depot_tools',
2758 u'patch_storage': u'rietveld',
2759 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002760 u'rietveld': u'https://codereview.chromium.org',
2761 }
2762 })
2763 self.assertEqual(build, {
2764 u'bucket': u'test.bucket',
2765 u'client_operation_id': u'uuid4',
2766 u'tags': [u'builder:win',
2767 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2768 u'user_agent:git_cl_try'],
2769 })
2770
2771 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2772
2773 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2774 self.assertEqual(0, git_cl.main([
2775 'try', '-B', 'test.bucket', '-b', 'win']))
2776 self.assertRegexpMatches(
2777 git_cl.sys.stdout.getvalue(),
2778 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002779
qyearsley123a4682016-10-26 09:12:17 -07002780 def test_git_cl_try_bots_on_multiple_masters(self):
2781 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2782 self.calls = [
2783 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2784 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2785 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2786 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002787 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002788 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2789 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2790 ]
2791
2792 def _buildbucket_retry(*_, **kw):
2793 body = json.loads(kw['body'])
2794 self.assertEqual(len(body['builds']), 2)
2795
Nodir Turakulovb422e682018-02-20 22:51:30 -08002796 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2797 params = json.loads(body['builds'][0]['parameters_json'])
2798 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002799
Nodir Turakulovb422e682018-02-20 22:51:30 -08002800 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2801 params = json.loads(body['builds'][1]['parameters_json'])
2802 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002803
2804 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2805
2806 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002807 json.dumps({
2808 'builder1': {'bucket': 'bucket1'},
2809 'builder2': {'bucket': 'bucket2'},
2810 })))
qyearsley123a4682016-10-26 09:12:17 -07002811
2812 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2813 self.assertEqual(
2814 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2815 self.assertEqual(
2816 git_cl.sys.stdout.getvalue(),
2817 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002818 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002819 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002820 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002821 ' builder2: []\n'
2822 'To see results here, run: git cl try-results\n'
2823 'To see results in browser, run: git cl web\n')
2824
tandrii16e0b4e2016-06-07 10:34:28 -07002825 def _common_GerritCommitMsgHookCheck(self):
2826 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2827 self.mock(git_cl.os.path, 'abspath',
2828 lambda path: self._mocked_call(['abspath', path]))
2829 self.mock(git_cl.os.path, 'exists',
2830 lambda path: self._mocked_call(['exists', path]))
2831 self.mock(git_cl.gclient_utils, 'FileRead',
2832 lambda path: self._mocked_call(['FileRead', path]))
2833 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2834 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2835 self.calls = [
2836 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2837 ((['abspath', '../'],), '/abs/git_repo_root'),
2838 ]
2839 return git_cl.Changelist(codereview='gerrit', issue=123)
2840
2841 def test_GerritCommitMsgHookCheck_custom_hook(self):
2842 cl = self._common_GerritCommitMsgHookCheck()
2843 self.calls += [
2844 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2845 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2846 '#!/bin/sh\necho "custom hook"')
2847 ]
2848 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2849
2850 def test_GerritCommitMsgHookCheck_not_exists(self):
2851 cl = self._common_GerritCommitMsgHookCheck()
2852 self.calls += [
2853 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2854 ]
2855 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2856
2857 def test_GerritCommitMsgHookCheck(self):
2858 cl = self._common_GerritCommitMsgHookCheck()
2859 self.calls += [
2860 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2861 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2862 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002863 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002864 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2865 ''),
2866 ]
2867 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2868
tandriic4344b52016-08-29 06:04:54 -07002869 def test_GerritCmdLand(self):
2870 self.calls += [
2871 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2872 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2873 'deadbeaf'),
2874 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2875 ((['git', 'config', 'branch.feature.gerritserver'],),
2876 'chromium-review.googlesource.com'),
2877 ]
2878 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2879 cl._codereview_impl._GetChangeDetail = lambda _: {
2880 'labels': {},
2881 'current_revision': 'deadbeaf',
2882 }
agable32978d92016-11-01 12:55:02 -07002883 cl._codereview_impl._GetChangeCommit = lambda: {
2884 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002885 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002886 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2887 }
tandriic4344b52016-08-29 06:04:54 -07002888 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002889 out = StringIO.StringIO()
2890 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002891 self.assertEqual(0, cl.CMDLand(force=True,
2892 bypass_hooks=True,
2893 verbose=True,
2894 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002895 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002896 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002897
tandrii221ab252016-10-06 08:12:04 -07002898 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002899 '9000': {
2900 'id': '9000',
2901 'bucket': 'master.x.y',
2902 'created_by': 'user:someone@chromium.org',
2903 'created_ts': '147200002222000',
2904 'experimental': False,
2905 'parameters_json': json.dumps({
2906 'builder_name': 'my-bot',
2907 'properties': {'category': 'cq'},
2908 }),
2909 'status': 'STARTED',
2910 'tags': [
2911 'build_address:x.y/my-bot/2',
2912 'builder:my-bot',
2913 'experimental:false',
2914 'user_agent:cq',
2915 ],
2916 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2917 },
2918 '8000': {
2919 'id': '8000',
2920 'bucket': 'master.x.y',
2921 'created_by': 'user:someone@chromium.org',
2922 'created_ts': '147200001111000',
2923 'experimental': False,
2924 'failure_reason': 'BUILD_FAILURE',
2925 'parameters_json': json.dumps({
2926 'builder_name': 'my-bot',
2927 'properties': {'category': 'cq'},
2928 }),
2929 'result_details_json': json.dumps({
2930 'properties': {'buildnumber': 1},
2931 }),
2932 'result': 'FAILURE',
2933 'status': 'COMPLETED',
2934 'tags': [
2935 'build_address:x.y/my-bot/1',
2936 'builder:my-bot',
2937 'experimental:false',
2938 'user_agent:cq',
2939 ],
2940 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2941 },
2942 }
tandrii221ab252016-10-06 08:12:04 -07002943
2944 def test_write_try_results_json(self):
2945 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002946 {
2947 'bucket': 'master.x.y',
2948 'buildbucket_id': '8000',
2949 'builder_name': 'my-bot',
2950 'created_ts': '147200001111000',
2951 'experimental': False,
2952 'failure_reason': 'BUILD_FAILURE',
2953 'result': 'FAILURE',
2954 'status': 'COMPLETED',
2955 'tags': [
2956 'build_address:x.y/my-bot/1',
2957 'builder:my-bot',
2958 'experimental:false',
2959 'user_agent:cq',
2960 ],
2961 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2962 },
2963 {
2964 'bucket': 'master.x.y',
2965 'buildbucket_id': '9000',
2966 'builder_name': 'my-bot',
2967 'created_ts': '147200002222000',
2968 'experimental': False,
2969 'failure_reason': None,
2970 'result': None,
2971 'status': 'STARTED',
2972 'tags': [
2973 'build_address:x.y/my-bot/2',
2974 'builder:my-bot',
2975 'experimental:false',
2976 'user_agent:cq',
2977 ],
2978 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2979 },
tandrii221ab252016-10-06 08:12:04 -07002980 ]
2981 self.calls = [(('write_json', 'output.json', expected_output), '')]
2982 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2983
tandrii45b2a582016-10-11 03:14:16 -07002984 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002985 out = StringIO.StringIO()
2986 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002987 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2988 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002989 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2990 self._mocked_call(['get_authenticator_for_host', host]))
2991 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2992 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002993
2994 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2995 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002996 self.calls += [
2997 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2998 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2999 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3000 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3001 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3002 ((['git', 'config', 'branch.feature.rietveldserver'],),
3003 'codereview.example.com'),
3004 ((['get_authenticator_for_host', 'codereview.example.com'],),
3005 AuthenticatorMock()),
3006 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3007
3008 def test_fetch_try_jobs_none_rietveld(self):
3009 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003010 # Simulate that user isn't logged in.
3011 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003012 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003013 self.assertRegexpMatches(sys.stdout.getvalue(),
3014 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003015 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3016
3017 def test_fetch_try_jobs_some_rietveld(self):
3018 self._setup_fetch_try_jobs_rietveld({
3019 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3020 })
3021 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003022 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3023 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3024 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3025
3026 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3027 self._setup_fetch_try_jobs(most_recent_patchset=13)
3028 self.calls += [
3029 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3030 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3031 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003032 # TODO(tandrii): Uncomment the below if we decide to support checking
3033 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003034 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003035 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003036 ((['git', 'config', 'branch.feature.gerritserver'],),
3037 'https://x-review.googlesource.com'),
3038 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3039 AuthenticatorMock()),
3040 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3041
3042 def test_fetch_try_jobs_none_gerrit(self):
3043 self._setup_fetch_try_jobs_gerrit({})
3044 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003045 # TODO(tandrii): Uncomment the below if we decide to support checking
3046 # patchsets for Gerrit.
3047 # self.assertRegexpMatches(
3048 # sys.stdout.getvalue(),
3049 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003050 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3051
3052 def test_fetch_try_jobs_some_gerrit(self):
3053 self._setup_fetch_try_jobs_gerrit({
3054 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3055 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003056 # TODO(tandrii): Uncomment the below if we decide to support checking
3057 # patchsets for Gerrit.
3058 # self.calls.remove(
3059 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003060 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3061
3062 # ... and doesn't result in warning.
3063 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3064 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003065 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3066 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3067
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003068 def _mock_gerrit_changes_for_detail_cache(self):
3069 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003070
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003071 def test_gerrit_change_detail_cache_simple(self):
3072 self._mock_gerrit_changes_for_detail_cache()
3073 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003074 (('GetChangeDetail', 'host', 'my%2Frepo~1', []), 'a'),
3075 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b'),
3076 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003077 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003078 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003079 cl1._cached_remote_url = (
3080 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003081 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003082 cl2._cached_remote_url = (
3083 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003084 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
3085 self.assertEqual(cl1._GetChangeDetail(), 'a')
3086 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
3087 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
3088 self.assertEqual(cl1._GetChangeDetail(), 'a')
3089 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003090
3091 def test_gerrit_change_detail_cache_options(self):
3092 self._mock_gerrit_changes_for_detail_cache()
3093 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003094 (('GetChangeDetail', 'host', 'repo~1', ['C', 'A', 'B']), 'cab'),
3095 (('GetChangeDetail', 'host', 'repo~1', ['A', 'D']), 'ad'),
3096 (('GetChangeDetail', 'host', 'repo~1', ['A']), 'a'), # no_cache=True
3097 # no longer in cache.
3098 (('GetChangeDetail', 'host', 'repo~1', ['B']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003099 ]
3100 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003101 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003102 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3103 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3104 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3105 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3106 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3107 self.assertEqual(cl._GetChangeDetail(), 'cab')
3108
3109 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3110 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3111 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3112 self.assertEqual(cl._GetChangeDetail(), 'cab')
3113
3114 # Finally, no_cache should invalidate all caches for given change.
3115 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3116 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3117
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003118 def test_gerrit_description_caching(self):
3119 def gen_detail(rev, desc):
3120 return {
3121 'current_revision': rev,
3122 'revisions': {rev: {'commit': {'message': desc}}}
3123 }
3124 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003125 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003126 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3127 gen_detail('rev1', 'desc1')),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003128 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003129 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3130 gen_detail('rev2', 'desc2')),
3131 ]
3132
3133 self._mock_gerrit_changes_for_detail_cache()
3134 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003135 cl._cached_remote_url = (
3136 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003137 self.assertEqual(cl.GetDescription(), 'desc1')
3138 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3139 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003140
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003141 def test_print_current_creds(self):
3142 class CookiesAuthenticatorMock(object):
3143 def __init__(self):
3144 self.gitcookies = {
3145 'host.googlesource.com': ('user', 'pass'),
3146 'host-review.googlesource.com': ('user', 'pass'),
3147 }
3148 self.netrc = self
3149 self.netrc.hosts = {
3150 'github.com': ('user2', None, 'pass2'),
3151 'host2.googlesource.com': ('user3', None, 'pass'),
3152 }
3153 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3154 CookiesAuthenticatorMock)
3155 self.mock(sys, 'stdout', StringIO.StringIO())
3156 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3157 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3158 ' Host\t User\t Which file',
3159 '============================\t=====\t===========',
3160 'host-review.googlesource.com\t user\t.gitcookies',
3161 ' host.googlesource.com\t user\t.gitcookies',
3162 ' host2.googlesource.com\tuser3\t .netrc',
3163 ])
3164 sys.stdout.buf = ''
3165 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3166 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3167 ' Host\tUser\t Which file',
3168 '============================\t====\t===========',
3169 'host-review.googlesource.com\tuser\t.gitcookies',
3170 ' host.googlesource.com\tuser\t.gitcookies',
3171 ])
3172
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003173 def _common_creds_check_mocks(self):
3174 def exists_mock(path):
3175 dirname = os.path.dirname(path)
3176 if dirname == os.path.expanduser('~'):
3177 dirname = '~'
3178 base = os.path.basename(path)
3179 if base in ('.netrc', '.gitcookies'):
3180 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3181 # git cl also checks for existence other files not relevant to this test.
3182 return None
3183 self.mock(os.path, 'exists', exists_mock)
3184 self.mock(sys, 'stdout', StringIO.StringIO())
3185
3186 def test_creds_check_gitcookies_not_configured(self):
3187 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003188 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003189 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003190 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003191 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003192 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3193 (('os.path.exists', '~/.netrc'), True),
3194 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3195 'or Ctrl+C to abort'), ''),
3196 ((['git', 'config', '--global', 'http.cookiefile',
3197 os.path.expanduser('~/.gitcookies')], ), ''),
3198 ]
3199 self.assertEqual(0, git_cl.main(['creds-check']))
3200 self.assertRegexpMatches(
3201 sys.stdout.getvalue(),
3202 '^You seem to be using outdated .netrc for git credentials:')
3203 self.assertRegexpMatches(
3204 sys.stdout.getvalue(),
3205 '\nConfigured git to use .gitcookies from')
3206
3207 def test_creds_check_gitcookies_configured_custom_broken(self):
3208 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003209 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003210 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003211 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003212 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003213 ((['git', 'config', '--global', 'http.cookiefile'],),
3214 '/custom/.gitcookies'),
3215 (('os.path.exists', '/custom/.gitcookies'), False),
3216 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3217 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3218 ((['git', 'config', '--global', 'http.cookiefile',
3219 os.path.expanduser('~/.gitcookies')], ), ''),
3220 ]
3221 self.assertEqual(0, git_cl.main(['creds-check']))
3222 self.assertRegexpMatches(
3223 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003224 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003225 self.assertRegexpMatches(
3226 sys.stdout.getvalue(),
3227 'However, your configured .gitcookies file is missing.')
3228
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003229 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003230 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003231 lambda _, message, publish: self._mocked_call(
3232 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003233 self.calls = [
3234 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3235 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003236 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003237 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003238 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3239 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003240
3241 def test_git_cl_comment_add_gerrit(self):
3242 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003243 lambda host, change, msg, ready:
3244 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003245 self.calls = [
3246 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3247 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3248 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3249 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3250 'origin/master'),
3251 ((['git', 'config', 'remote.origin.url'],),
3252 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003253 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
3254 'msg', None),
Aaron Gable636b13f2017-07-14 10:42:48 -07003255 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003256 ]
3257 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3258 '-a', 'msg']))
3259
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003260 def test_git_cl_comments_fetch_rietveld(self):
3261 self.mock(sys, 'stdout', StringIO.StringIO())
3262 self.calls = [
3263 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3264 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Leszek Swirski45b20c42018-09-17 17:05:26 +00003265 ] * 2 + [
3266 (('write_json', 'output.json', [
3267 {
3268 'date': '2000-03-13 20:49:34.515270',
3269 'message': 'PTAL',
3270 'approval': False,
3271 'disapproval': False,
3272 'sender': 'owner@example.com'
3273 }, {
3274 'date': '2017-03-13 20:49:34.515270',
3275 'message': 'lgtm',
3276 'approval': True,
3277 'disapproval': False,
3278 'sender': 'r@example.com'
3279 }, {
3280 'date': '2017-03-13 21:50:34.515270',
3281 'message': 'not lgtm',
3282 'approval': False,
3283 'disapproval': True,
3284 'sender': 'r2@example.com'
3285 }
3286 ]),'')
3287 ]
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003288 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3289 'messages': [
3290 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3291 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3292 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3293 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3294 # Intentionally wrong order here.
3295 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3296 'disapproval': False, 'approval': False,
3297 'sender': 'owner@example.com'},
3298 ],
3299 'owner_email': 'owner@example.com',
3300 })
3301 expected_comments_summary = [
3302 git_cl._CommentSummary(
3303 message='lgtm',
3304 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3305 disapproval=False, approval=True, sender='r@example.com'),
3306 git_cl._CommentSummary(
3307 message='not lgtm',
3308 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3309 disapproval=True, approval=False, sender='r2@example.com'),
3310 # Note: same order as in whatever Rietveld returns.
3311 git_cl._CommentSummary(
3312 message='PTAL',
3313 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3314 disapproval=False, approval=False, sender='owner@example.com'),
3315 ]
3316 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3317 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00003318 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3319 '-j', 'output.json']))
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003320
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003321 def test_git_cl_comments_fetch_gerrit(self):
3322 self.mock(sys, 'stdout', StringIO.StringIO())
3323 self.calls = [
3324 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3325 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3326 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3327 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3328 'origin/master'),
3329 ((['git', 'config', 'remote.origin.url'],),
3330 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003331 (('GetChangeDetail', 'chromium-review.googlesource.com',
3332 'infra%2Finfra~1',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003333 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003334 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003335 'messages': [
3336 {
3337 u'_revision_number': 1,
3338 u'author': {
3339 u'_account_id': 1111084,
3340 u'email': u'commit-bot@chromium.org',
3341 u'name': u'Commit Bot'
3342 },
3343 u'date': u'2017-03-15 20:08:45.000000000',
3344 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003345 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003346 u'tag': u'autogenerated:cq:dry-run'
3347 },
3348 {
3349 u'_revision_number': 2,
3350 u'author': {
3351 u'_account_id': 11151243,
3352 u'email': u'owner@example.com',
3353 u'name': u'owner'
3354 },
3355 u'date': u'2017-03-16 20:00:41.000000000',
3356 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3357 u'message': u'PTAL',
3358 },
3359 {
3360 u'_revision_number': 2,
3361 u'author': {
3362 u'_account_id': 148512 ,
3363 u'email': u'reviewer@example.com',
3364 u'name': u'reviewer'
3365 },
3366 u'date': u'2017-03-17 05:19:37.500000000',
3367 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3368 u'message': u'Patch Set 2: Code-Review+1',
3369 },
3370 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003371 }),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003372 (('GetChangeComments', 'chromium-review.googlesource.com',
3373 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003374 '/COMMIT_MSG': [
3375 {
3376 'author': {'email': u'reviewer@example.com'},
3377 'updated': u'2017-03-17 05:19:37.500000000',
3378 'patch_set': 2,
3379 'side': 'REVISION',
3380 'message': 'Please include a bug link',
3381 },
3382 ],
3383 'codereview.settings': [
3384 {
3385 'author': {'email': u'owner@example.com'},
3386 'updated': u'2017-03-16 20:00:41.000000000',
3387 'patch_set': 2,
3388 'side': 'PARENT',
3389 'line': 42,
3390 'message': 'I removed this because it is bad',
3391 },
3392 ]
Leszek Swirski45b20c42018-09-17 17:05:26 +00003393 })
3394 ] * 2 + [
3395 (('write_json', 'output.json', [
3396 {
3397 u'date': u'2017-03-16 20:00:41.000000',
3398 u'message': (
3399 u'PTAL\n' +
3400 u'\n' +
3401 u'codereview.settings\n' +
3402 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3403 u'c/1/2/codereview.settings#b42\n' +
3404 u' I removed this because it is bad\n'),
3405 u'approval': False,
3406 u'disapproval': False,
3407 u'sender': u'owner@example.com'
3408 }, {
3409 u'date': u'2017-03-17 05:19:37.500000',
3410 u'message': (
3411 u'Patch Set 2: Code-Review+1\n' +
3412 u'\n' +
3413 u'/COMMIT_MSG\n' +
3414 u' PS2, File comment: https://chromium-review.googlesource' +
3415 u'.com/c/1/2//COMMIT_MSG#\n' +
3416 u' Please include a bug link\n'),
3417 u'approval': False,
3418 u'disapproval': False,
3419 u'sender': u'reviewer@example.com'
3420 }
3421 ]),'')
3422 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003423 expected_comments_summary = [
3424 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003425 message=(
3426 u'PTAL\n' +
3427 u'\n' +
3428 u'codereview.settings\n' +
3429 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3430 u'c/1/2/codereview.settings#b42\n' +
3431 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003432 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3433 disapproval=False, approval=False, sender=u'owner@example.com'),
3434 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003435 message=(
3436 u'Patch Set 2: Code-Review+1\n' +
3437 u'\n' +
3438 u'/COMMIT_MSG\n' +
3439 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3440 u'c/1/2//COMMIT_MSG#\n' +
3441 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003442 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3443 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3444 ]
3445 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3446 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00003447 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3448 '-j', 'output.json']))
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003449
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003450 def test_get_remote_url_with_mirror(self):
3451 original_os_path_isdir = os.path.isdir
3452 def selective_os_path_isdir_mock(path):
3453 if path == '/cache/this-dir-exists':
3454 return self._mocked_call('os.path.isdir', path)
3455 return original_os_path_isdir(path)
3456 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
3457
3458 url = 'https://chromium.googlesource.com/my/repo'
3459 self.calls = [
3460 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3461 ((['git', 'config', 'branch.master.merge'],), 'master'),
3462 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3463 ((['git', 'config', 'remote.origin.url'],),
3464 '/cache/this-dir-exists'),
3465 (('os.path.isdir', '/cache/this-dir-exists'),
3466 True),
3467 # Runs in /cache/this-dir-exists.
3468 ((['git', 'config', 'remote.origin.url'],),
3469 url),
3470 ]
3471 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3472 self.assertEqual(cl.GetRemoteUrl(), url)
3473 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
3474
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003475 def test_gerrit_change_identifier_with_project(self):
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003476 self.calls = [
3477 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3478 ((['git', 'config', 'branch.master.merge'],), 'master'),
3479 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3480 ((['git', 'config', 'remote.origin.url'],),
3481 'https://chromium.googlesource.com/a/my/repo.git/'),
3482 ]
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003483 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3484 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
3485
3486 def test_gerrit_change_identifier_without_project(self):
3487 self.calls = [
3488 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3489 ((['git', 'config', 'branch.master.merge'],), 'master'),
3490 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3491 ((['git', 'config', 'remote.origin.url'],), CERR1),
3492 ]
3493 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3494 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003495
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003496
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003497if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003498 logging.basicConfig(
3499 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003500 unittest.main()