blob: 25beba318ae3eab0a1718656a6be50d9b740a021 [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
maruel@chromium.orgddd59412011-11-30 14:20:38 +000027import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000028import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000029import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000030import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000031
tandrii5d48c322016-08-18 16:19:37 -070032def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
33 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
34
35
36CERR1 = callError(1)
37
38
Aaron Gable9a03ae02017-11-03 11:31:07 -070039def MakeNamedTemporaryFileMock(expected_content):
40 class NamedTemporaryFileMock(object):
41 def __init__(self, *args, **kwargs):
42 self.name = '/tmp/named'
43 self.expected_content = expected_content
44
45 def __enter__(self):
46 return self
47
48 def __exit__(self, _type, _value, _tb):
49 pass
50
51 def write(self, content):
52 if self.expected_content:
53 assert content == self.expected_content
54
55 def close(self):
56 pass
57
58 return NamedTemporaryFileMock
59
60
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000061class ChangelistMock(object):
62 # A class variable so we can access it when we don't have access to the
63 # instance that's being set.
64 desc = ""
65 def __init__(self, **kwargs):
66 pass
67 def GetIssue(self):
68 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080069 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000070 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070071 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000072 ChangelistMock.desc = desc
73
tandrii5d48c322016-08-18 16:19:37 -070074
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000075class PresubmitMock(object):
76 def __init__(self, *args, **kwargs):
77 self.reviewers = []
Daniel Cheng7227d212017-11-17 08:12:37 -080078 self.more_cc = ['chromium-reviews+test-more-cc@chromium.org']
79
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000080 @staticmethod
81 def should_continue():
82 return True
83
84
85class RietveldMock(object):
86 def __init__(self, *args, **kwargs):
87 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000088
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000089 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080090 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000091 return 'Issue: %d' % issue
92
maruel@chromium.org78936cb2013-04-11 00:17:52 +000093 @staticmethod
94 def get_issue_properties(_issue, _messages):
95 return {
96 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
97 'messages': [
98 {
99 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -0700100 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000101 'sender': 'john@chromium.org',
102 },
103 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100104 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000105 }
106
iannuccie53c9352016-08-17 14:40:40 -0700107 @staticmethod
108 def close_issue(_issue):
109 return 'Closed'
110
skobes6468b902016-10-24 08:45:10 -0700111 @staticmethod
112 def get_patch(issue, patchset):
113 return 'patch set from issue %s patchset %s' % (issue, patchset)
114
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100115 @staticmethod
116 def update_description(_issue, _description):
117 return 'Updated'
118
119 @staticmethod
120 def add_comment(_issue, _comment):
121 return 'Commented'
122
123
skobes6468b902016-10-24 08:45:10 -0700124class GitCheckoutMock(object):
125 def __init__(self, *args, **kwargs):
126 pass
127
128 @staticmethod
129 def reset():
130 GitCheckoutMock.conflict = False
131
132 def apply_patch(self, p):
133 if GitCheckoutMock.conflict:
134 raise Exception('failed')
135
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000136
137class WatchlistsMock(object):
138 def __init__(self, _):
139 pass
140 @staticmethod
141 def GetWatchersForPaths(_):
142 return ['joe@example.com']
143
144
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000145class CodereviewSettingsFileMock(object):
146 def __init__(self):
147 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800148 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000149 def read(self):
150 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000151 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000152
153
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000154class AuthenticatorMock(object):
155 def __init__(self, *_args):
156 pass
157 def has_cached_credentials(self):
158 return True
tandrii221ab252016-10-06 08:12:04 -0700159 def authorize(self, http):
160 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000161
162
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100163def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000164 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
165
166 Usage:
167 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100168 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000169
170 OR
171 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100172 CookiesAuthenticatorMockFactory(
173 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000174 """
175 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800176 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000177 # Intentionally not calling super() because it reads actual cookie files.
178 pass
179 @classmethod
180 def get_gitcookies_path(cls):
181 return '~/.gitcookies'
182 @classmethod
183 def get_netrc_path(cls):
184 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100185 def _get_auth_for_host(self, host):
186 if same_auth:
187 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000188 return (hosts_with_creds or {}).get(host)
189 return CookiesAuthenticatorMock
190
Aaron Gable9a03ae02017-11-03 11:31:07 -0700191
kmarshall9249e012016-08-23 12:02:16 -0700192class MockChangelistWithBranchAndIssue():
193 def __init__(self, branch, issue):
194 self.branch = branch
195 self.issue = issue
196 def GetBranch(self):
197 return self.branch
198 def GetIssue(self):
199 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000200
tandriic2405f52016-10-10 08:13:15 -0700201
202class SystemExitMock(Exception):
203 pass
204
205
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000206class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100207 def test_get_description(self):
208 cl = git_cl.Changelist(issue=1, codereview='rietveld',
209 codereview_host='host')
210 cl.description = 'x'
211 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800212 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100213 self.assertEquals(cl.GetDescription(), 'x')
214 self.assertEquals(cl.GetDescription(force=True), 'y')
215 self.assertEquals(cl.GetDescription(), 'y')
216
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700217 def test_description_footers(self):
218 cl = git_cl.Changelist(issue=1, codereview='gerrit',
219 codereview_host='host')
220 cl.description = '\n'.join([
221 'This is some message',
222 '',
223 'It has some lines',
224 'and, also',
225 '',
226 'Some: Really',
227 'Awesome: Footers',
228 ])
229 cl.has_description = True
230 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
231 msg, footers = cl.GetDescriptionFooters()
232 self.assertEquals(
233 msg, ['This is some message', '', 'It has some lines', 'and, also'])
234 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
235
236 msg.append('wut')
237 footers.append(('gnarly-dude', 'beans'))
238 cl.UpdateDescriptionFooters(msg, footers)
239 self.assertEquals(cl.GetDescription().splitlines(), [
240 'This is some message',
241 '',
242 'It has some lines',
243 'and, also',
244 'wut'
245 '',
246 'Some: Really',
247 'Awesome: Footers',
248 'Gnarly-Dude: beans',
249 ])
250
tandriif9aefb72016-07-01 09:06:51 -0700251 def test_get_bug_line_values(self):
252 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
253 self.assertEqual(f('', ''), [])
254 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
255 self.assertEqual(f('v8', '456'), ['v8:456'])
256 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
257 # Not nice, but not worth carying.
258 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
259 ['v8:456', 'chromium:123', 'v8:123'])
260
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100261 def _test_git_number(self, parent_msg, dest_ref, child_msg,
262 parent_hash='parenthash'):
263 desc = git_cl.ChangeDescription(child_msg)
264 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
265 return desc.description
266
267 def assertEqualByLine(self, actual, expected):
268 self.assertEqual(actual.splitlines(), expected.splitlines())
269
270 def test_git_number_bad_parent(self):
271 with self.assertRaises(ValueError):
272 self._test_git_number('Parent', 'refs/heads/master', 'Child')
273
274 def test_git_number_bad_parent_footer(self):
275 with self.assertRaises(AssertionError):
276 self._test_git_number(
277 'Parent\n'
278 '\n'
279 'Cr-Commit-Position: wrong',
280 'refs/heads/master', 'Child')
281
282 def test_git_number_bad_lineage_ignored(self):
283 actual = self._test_git_number(
284 'Parent\n'
285 '\n'
286 'Cr-Commit-Position: refs/heads/master@{#1}\n'
287 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
288 'refs/heads/master', 'Child')
289 self.assertEqualByLine(
290 actual,
291 'Child\n'
292 '\n'
293 'Cr-Commit-Position: refs/heads/master@{#2}\n'
294 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
295
296 def test_git_number_same_branch(self):
297 actual = self._test_git_number(
298 'Parent\n'
299 '\n'
300 'Cr-Commit-Position: refs/heads/master@{#12}',
301 dest_ref='refs/heads/master',
302 child_msg='Child')
303 self.assertEqualByLine(
304 actual,
305 'Child\n'
306 '\n'
307 'Cr-Commit-Position: refs/heads/master@{#13}')
308
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200309 def test_git_number_same_branch_mixed_footers(self):
310 actual = self._test_git_number(
311 'Parent\n'
312 '\n'
313 'Cr-Commit-Position: refs/heads/master@{#12}',
314 dest_ref='refs/heads/master',
315 child_msg='Child\n'
316 '\n'
317 'Broken-by: design\n'
318 'BUG=123')
319 self.assertEqualByLine(
320 actual,
321 'Child\n'
322 '\n'
323 'Broken-by: design\n'
324 'BUG=123\n'
325 'Cr-Commit-Position: refs/heads/master@{#13}')
326
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100327 def test_git_number_same_branch_with_originals(self):
328 actual = self._test_git_number(
329 'Parent\n'
330 '\n'
331 'Cr-Commit-Position: refs/heads/master@{#12}',
332 dest_ref='refs/heads/master',
333 child_msg='Child\n'
334 '\n'
335 'Some users are smart and insert their own footers\n'
336 '\n'
337 'Cr-Whatever: value\n'
338 'Cr-Commit-Position: refs/copy/paste@{#22}')
339 self.assertEqualByLine(
340 actual,
341 'Child\n'
342 '\n'
343 'Some users are smart and insert their own footers\n'
344 '\n'
345 'Cr-Original-Whatever: value\n'
346 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
347 'Cr-Commit-Position: refs/heads/master@{#13}')
348
349 def test_git_number_new_branch(self):
350 actual = self._test_git_number(
351 'Parent\n'
352 '\n'
353 'Cr-Commit-Position: refs/heads/master@{#12}',
354 dest_ref='refs/heads/branch',
355 child_msg='Child')
356 self.assertEqualByLine(
357 actual,
358 'Child\n'
359 '\n'
360 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
361 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
362
363 def test_git_number_lineage(self):
364 actual = self._test_git_number(
365 'Parent\n'
366 '\n'
367 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
368 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
369 dest_ref='refs/heads/branch',
370 child_msg='Child')
371 self.assertEqualByLine(
372 actual,
373 'Child\n'
374 '\n'
375 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
376 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
377
378 def test_git_number_moooooooore_lineage(self):
379 actual = self._test_git_number(
380 'Parent\n'
381 '\n'
382 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
383 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
384 dest_ref='refs/heads/mooore',
385 child_msg='Child')
386 self.assertEqualByLine(
387 actual,
388 'Child\n'
389 '\n'
390 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
391 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
392 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
393
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100394 def test_git_number_ever_moooooooore_lineage(self):
Robert Iannucci456b0d62018-03-13 19:15:50 -0700395 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100396 actual = self._test_git_number(
397 'CQ commit on fresh new branch + numbering.\n'
398 '\n'
399 'NOTRY=True\n'
400 'NOPRESUBMIT=True\n'
401 'BUG=\n'
402 '\n'
403 'Review-Url: https://codereview.chromium.org/2577703003\n'
404 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
405 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
406 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
407 dest_ref='refs/heads/gnumb-test/cl',
408 child_msg='git cl on fresh new branch + numbering.\n'
409 '\n'
410 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
411 self.assertEqualByLine(
412 actual,
413 'git cl on fresh new branch + numbering.\n'
414 '\n'
415 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
416 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
417 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
418 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
419 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100420
421 def test_git_number_cherry_pick(self):
422 actual = self._test_git_number(
423 'Parent\n'
424 '\n'
425 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
426 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
427 dest_ref='refs/heads/branch',
428 child_msg='Child, which is cherry-pick from master\n'
429 '\n'
430 'Cr-Commit-Position: refs/heads/master@{#100}\n'
431 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
432 self.assertEqualByLine(
433 actual,
434 'Child, which is cherry-pick from master\n'
435 '\n'
436 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
437 '\n'
438 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
439 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
440 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
441
Andrii Shyshkalovd4c86732018-09-25 04:29:31 +0000442 def test_gerrit_mirror_hack(self):
443 cr = 'chromium-review.googlesource.com'
444 url0 = 'https://%s/a/changes/x?a=b' % cr
445 origMirrors = git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES
446 try:
447 git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES = ['us1', 'us2']
448 url1 = git_cl.gerrit_util._UseGerritMirror(url0, cr)
449 url2 = git_cl.gerrit_util._UseGerritMirror(url1, cr)
450 url3 = git_cl.gerrit_util._UseGerritMirror(url2, cr)
451
452 self.assertNotEqual(url1, url2)
453 self.assertEqual(sorted((url1, url2)), [
454 'https://us1-mirror-chromium-review.googlesource.com/a/changes/x?a=b',
455 'https://us2-mirror-chromium-review.googlesource.com/a/changes/x?a=b'])
456 self.assertEqual(url1, url3)
457 finally:
458 git_cl.gerrit_util._GERRIT_MIRROR_PREFIXES = origMirrors
459
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000460
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200461class TestParseIssueURL(unittest.TestCase):
462 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
463 codereview=None, fail=False):
464 self.assertIsNotNone(parsed)
465 if fail:
466 self.assertFalse(parsed.valid)
467 return
468 self.assertTrue(parsed.valid)
469 self.assertEqual(parsed.issue, issue)
470 self.assertEqual(parsed.patchset, patchset)
471 self.assertEqual(parsed.hostname, hostname)
472 self.assertEqual(parsed.codereview, codereview)
473
474 def _run_and_validate(self, func, url, *args, **kwargs):
475 result = func(urlparse.urlparse(url))
476 if kwargs.pop('fail', False):
477 self.assertIsNone(result)
478 return None
479 self._validate(result, *args, fail=False, **kwargs)
480
481 def test_rietveld(self):
482 def test(url, *args, **kwargs):
483 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
484 *args, codereview='rietveld', **kwargs)
485
486 test('http://codereview.chromium.org/123',
487 123, None, 'codereview.chromium.org')
488 test('https://codereview.chromium.org/123',
489 123, None, 'codereview.chromium.org')
490 test('https://codereview.chromium.org/123/',
491 123, None, 'codereview.chromium.org')
492 test('https://codereview.chromium.org/123/whatever',
493 123, None, 'codereview.chromium.org')
494 test('https://codereview.chromium.org/123/#ps20001',
495 123, 20001, 'codereview.chromium.org')
496 test('http://codereview.chromium.org/download/issue123_4.diff',
497 123, 4, 'codereview.chromium.org')
498 # This looks like bad Gerrit, but is actually valid Rietveld, too.
499 test('https://chrome-review.source.com/123/4/',
500 123, None, 'chrome-review.source.com')
501
502 test('https://codereview.chromium.org/deadbeaf', fail=True)
503 test('https://codereview.chromium.org/api/123', fail=True)
504 test('bad://codereview.chromium.org/123', fail=True)
505 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
506
507 def test_gerrit(self):
508 def test(url, issue=None, patchset=None, hostname=None, fail=None):
509 self._test_ParseIssueUrl(
510 git_cl._GerritChangelistImpl.ParseIssueURL,
511 url, issue, patchset, hostname, fail)
512 def test(url, *args, **kwargs):
513 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
514 *args, codereview='gerrit', **kwargs)
515
516 test('http://chrome-review.source.com/c/123',
517 123, None, 'chrome-review.source.com')
518 test('https://chrome-review.source.com/c/123/',
519 123, None, 'chrome-review.source.com')
520 test('https://chrome-review.source.com/c/123/4',
521 123, 4, 'chrome-review.source.com')
522 test('https://chrome-review.source.com/#/c/123/4',
523 123, 4, 'chrome-review.source.com')
524 test('https://chrome-review.source.com/c/123/4',
525 123, 4, 'chrome-review.source.com')
526 test('https://chrome-review.source.com/123',
527 123, None, 'chrome-review.source.com')
528 test('https://chrome-review.source.com/123/4',
529 123, 4, 'chrome-review.source.com')
530
531 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
532 test('https://chrome-review.source.com/c/abc/', fail=True)
533 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
534
535 def test_ParseIssueNumberArgument(self):
536 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200537 codereview_hint = kwargs.pop('hint', None)
538 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
539 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200540
541 test('123', 123)
542 test('', fail=True)
543 test('abc', fail=True)
544 test('123/1', fail=True)
545 test('123a', fail=True)
546 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
547 # Rietveld.
548 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200549 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200550 test('https://codereview.source.com/123',
551 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200552 # Matches both, but we take Gerrit if specifically requested.
553 test('https://codereview.source.com/123',
554 123, None, 'codereview.source.com', 'gerrit',
555 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200556 # Gerrrit.
557 test('https://chrome-review.source.com/c/123/4',
558 123, 4, 'chrome-review.source.com', 'gerrit')
559 test('https://chrome-review.source.com/bad/123/4', fail=True)
560
561
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100562class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100563 def setUp(self):
564 super(GitCookiesCheckerTest, self).setUp()
565 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100566 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100567
568 def mock_hosts_creds(self, subhost_identity_pairs):
569 def ensure_googlesource(h):
570 if not h.endswith(self.c._GOOGLESOURCE):
571 assert not h.endswith('.')
572 return h + '.' + self.c._GOOGLESOURCE
573 return h
574 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
575 for h, i in subhost_identity_pairs]
576
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200577 def test_identity_parsing(self):
578 self.assertEqual(self.c._parse_identity('ldap.google.com'),
579 ('ldap', 'google.com'))
580 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
581 ('ldap', 'example.com'))
582 # Specical case because we know there are no subdomains in chromium.org.
583 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
584 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800585 # Pathological: ".period." can be either username OR domain, more likely
586 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200587 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
588 ('note', 'period.example.com'))
589
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100590 def test_analysis_nothing(self):
591 self.c._all_hosts = []
592 self.assertFalse(self.c.has_generic_host())
593 self.assertEqual(set(), self.c.get_conflicting_hosts())
594 self.assertEqual(set(), self.c.get_duplicated_hosts())
595 self.assertEqual(set(), self.c.get_partially_configured_hosts())
596 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
597
598 def test_analysis(self):
599 self.mock_hosts_creds([
600 ('.googlesource.com', 'git-example.chromium.org'),
601
602 ('chromium', 'git-example.google.com'),
603 ('chromium-review', 'git-example.google.com'),
604 ('chrome-internal', 'git-example.chromium.org'),
605 ('chrome-internal-review', 'git-example.chromium.org'),
606 ('conflict', 'git-example.google.com'),
607 ('conflict-review', 'git-example.chromium.org'),
608 ('dup', 'git-example.google.com'),
609 ('dup', 'git-example.google.com'),
610 ('dup-review', 'git-example.google.com'),
611 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200612 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100613 ])
614 self.assertTrue(self.c.has_generic_host())
615 self.assertEqual(set(['conflict.googlesource.com']),
616 self.c.get_conflicting_hosts())
617 self.assertEqual(set(['dup.googlesource.com']),
618 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200619 self.assertEqual(set(['partial.googlesource.com',
620 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100621 self.c.get_partially_configured_hosts())
622 self.assertEqual(set(['chromium.googlesource.com',
623 'chrome-internal.googlesource.com']),
624 self.c.get_hosts_with_wrong_identities())
625
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100626 def test_report_no_problems(self):
627 self.test_analysis_nothing()
628 self.mock(sys, 'stdout', StringIO.StringIO())
629 self.assertFalse(self.c.find_and_report_problems())
630 self.assertEqual(sys.stdout.getvalue(), '')
631
632 def test_report(self):
633 self.test_analysis()
634 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200635 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
636 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100637 self.assertTrue(self.c.find_and_report_problems())
638 with open(os.path.join(os.path.dirname(__file__),
639 'git_cl_creds_check_report.txt')) as f:
640 expected = f.read()
641 def by_line(text):
642 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700643 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200644 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100645
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800646
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000647class TestGitCl(TestCase):
648 def setUp(self):
649 super(TestGitCl, self).setUp()
650 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700651 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000652 self.mock(subprocess2, 'call', self._mocked_call)
653 self.mock(subprocess2, 'check_call', self._mocked_call)
654 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700655 self.mock(subprocess2, 'communicate',
656 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000657 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000658 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000659 self.mock(git_common, 'get_or_create_merge_base',
660 lambda *a: (
661 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000662 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000663 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100664 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
665 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700666 self.mock(git_cl, 'write_json', lambda path, contents:
667 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000668 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000669 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000670 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700671 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
672 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000673 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000674 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000675 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100676 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
677 lambda *args, **kwargs: self._mocked_call(
678 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700679 self.mock(git_cl.gerrit_util, 'GetChangeComments',
680 lambda *args, **kwargs: self._mocked_call(
681 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100682 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700683 lambda h, i, reviewers, ccs, notify: self._mocked_call(
684 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700685 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700686 lambda h, i, msg=None, labels=None, notify=None:
687 self._mocked_call('SetReview', h, i, msg, labels, notify))
Andrii Shyshkalov733d4ec2018-04-19 11:48:58 -0700688 self.mock(git_cl.gerrit_util.LuciContextAuthenticator, 'is_luci',
689 staticmethod(lambda: False))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000690 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
691 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700692 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100693 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694 # It's important to reset settings to not have inter-tests interference.
695 git_cl.settings = None
696
697 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000698 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100699 self.assertEquals([], self.calls)
700 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000701 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100702 raise
703 # Sadly, has_failed() returns True if this OR any other tests before this
704 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200705 git_cl.logging.error(
706 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100707 'There are un-consumed self.calls after this test has finished.\n'
708 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700709 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200710 'If you are already running only this test, then **first** fix the '
711 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100712 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700713 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100714 'and follow instructions above.\n' +
715 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000716 finally:
717 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000718
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000719 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000720 self.assertTrue(
721 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700722 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000723 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000724 expected_args, result = top
725
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000726 # Also logs otherwise it could get caught in a try/finally and be hard to
727 # diagnose.
728 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700729 N = 5
730 prior_calls = '\n '.join(
731 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
732 for i, c in enumerate(self._calls_done[-N:]))
733 following_calls = '\n '.join(
734 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
735 for i, c in enumerate(self.calls[:N]))
736 extended_msg = (
737 'A few prior calls:\n %s\n\n'
738 'This (expected):\n @%d: %r\n'
739 'This (actual):\n @%d: %r\n\n'
740 'A few following expected calls:\n %s' %
741 (prior_calls, len(self._calls_done), expected_args,
742 len(self._calls_done), args, following_calls))
743 git_cl.logging.error(extended_msg)
744
tandrii99a72f22016-08-17 14:33:24 -0700745 self.fail('@%d\n'
746 ' Expected: %r\n'
747 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700748 len(self._calls_done), expected_args, args))
749
750 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700751 if isinstance(result, Exception):
752 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000753 return result
754
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100755 def test_ask_for_explicit_yes_true(self):
756 self.calls = [
757 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
758 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
759 ]
760 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
761
tandrii48df5812016-10-17 03:55:37 -0700762 def test_LoadCodereviewSettingsFromFile_gerrit(self):
763 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
764 self.calls = [
765 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
766 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
767 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
768 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
769 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
770 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700771 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
772 CERR1),
773 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700774 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
775 CERR1),
776 ((['git', 'config', 'gerrit.host', 'true'],), ''),
777 ]
778 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
779
maruel@chromium.orga3353652011-11-30 14:26:57 +0000780 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000781 def _is_gerrit_calls(cls, gerrit=False):
782 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
783 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
784
785 @classmethod
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000786 def _upload_calls(cls, private, no_autocc):
Aaron Gable13101a62018-02-09 13:20:41 -0800787 return (cls._rietveld_git_base_calls() +
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000788 cls._git_upload_calls(private, no_autocc))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000789
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000790 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800791 def _rietveld_upload_no_rev_calls(cls):
792 return (cls._rietveld_git_base_calls() + [
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200793 ((['git', 'config', 'core.editor'],), ''),
794 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000795
796 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800797 def _rietveld_git_base_calls(cls):
798 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
799 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000800
Aaron Gable13101a62018-02-09 13:20:41 -0800801 return cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000802 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700803 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
804 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000805 ((['git', 'config', 'rietveld.server'],),
806 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000807 ((['git', 'config', 'branch.master.merge'],), 'master'),
808 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000809 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000810 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000811 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000812 ((['git', 'rev-parse', '--show-cdup'],), ''),
813 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Aaron Gable7817f022017-12-12 09:43:17 -0800814 ((['git', '-c', 'core.quotePath=false', 'diff',
815 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000816 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700817 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000819 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000820 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000821 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000822 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000823 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000824 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000825 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700826 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000827 ]
828
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000829 @classmethod
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000830 def _git_upload_calls(cls, private, no_autocc):
831 if private or no_autocc:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000832 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000833 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000834 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000835
836 if private:
837 private_call = []
838 else:
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000839 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000840 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000841
maruel@chromium.orga3353652011-11-30 14:26:57 +0000842 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000844 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800846 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000847 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700848 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000849 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000850 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000851 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700852 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000853 ] + cls._git_post_upload_calls()
854
855 @classmethod
856 def _git_post_upload_calls(cls):
857 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000858 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
859 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
860 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000861 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000862 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000863 ]
864
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000865 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000866 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000867 fake_ancestor = 'fake_ancestor'
868 fake_cl = 'fake_cl_for_patch'
869 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000870 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000871 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000872 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000873 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000874 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000875 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000876 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000877 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700878 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000879 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000880 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000881 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000882 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000883 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000884 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000885 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000886 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000887 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000888 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000889 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000890
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000891 @staticmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800892 def _cmd_line(description, args, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000893 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000894 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800895 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000896 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800898 '--cc',
899 ','.join(
900 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
901 cc),
Aaron Gable13101a62018-02-09 13:20:41 -0800902 ] + (['--private'] if private else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000903
904 def _run_reviewer_test(
905 self,
906 upload_args,
907 expected_description,
908 returned_description,
909 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000910 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700911 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000912 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000913 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org79540052012-10-19 23:15:26 +0000914
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000915 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700916 cc = cc or []
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000917 no_autocc = '--no-autocc' in upload_args
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000918
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000919 self.calls = self._upload_calls(private, no_autocc)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000920
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000921 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000922 self.assertEquals(
923 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000924 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000925 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000926 '#--------------------This line is 72 characters long'
927 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000928 expected_description,
929 desc)
930 return returned_description
931 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000932
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000933 def check_upload(args):
Aaron Gable13101a62018-02-09 13:20:41 -0800934 cmd_line = self._cmd_line(final_description, reviewers, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000935 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000936 return 1, 2
937 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000938
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000939 git_cl.main(['upload'] + upload_args)
940
941 def test_no_reviewer(self):
942 self._run_reviewer_test(
943 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000944 'desc\n\nBUG=',
945 '# Blah blah comment.\ndesc\n\nBUG=',
946 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 [])
948
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000949 def test_private(self):
950 self._run_reviewer_test(
951 ['--private'],
952 'desc\n\nBUG=',
953 '# Blah blah comment.\ndesc\n\nBUG=\n',
954 'desc\n\nBUG=',
955 [])
956
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000957 def test_no_autocc(self):
958 self._run_reviewer_test(
959 ['--no-autocc'],
960 'desc\n\nBUG=',
961 '# Blah blah comment.\ndesc\n\nBUG=\n',
962 'desc\n\nBUG=',
963 [])
964
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000965 def test_reviewers_cmd_line(self):
966 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000967 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000968 self._run_reviewer_test(
969 ['-r' 'foo@example.com'],
970 description,
971 '\n%s\n' % description,
972 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000973 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000974
975 def test_reviewer_tbr_overriden(self):
976 # Reviewer is overriden with TBR
977 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000978 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000979 self._run_reviewer_test(
980 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000981 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000982 description.strip('\n'),
983 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000984 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000985
986 def test_reviewer_multiple(self):
987 # Handles multiple R= or TBR= lines.
988 description = (
bradnelsond975b302016-10-23 12:20:23 -0700989 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
990 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000991 self._run_reviewer_test(
992 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000993 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000994 description,
995 description,
bradnelsond975b302016-10-23 12:20:23 -0700996 ['--reviewers=another@example.com,reviewer@example.com'],
997 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000998
maruel@chromium.orga3353652011-11-30 14:26:57 +0000999 def test_reviewer_send_mail(self):
1000 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001001 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +00001002 self._run_reviewer_test(
1003 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001004 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +00001005 description.strip('\n'),
1006 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001007 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +00001008
1009 def test_reviewer_send_mail_no_rev(self):
1010 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001011 stdout = StringIO.StringIO()
Aaron Gable13101a62018-02-09 13:20:41 -08001012 self.calls = self._rietveld_upload_no_rev_calls() + [
tandriic2405f52016-10-10 08:13:15 -07001013 ((['DieWithError', 'Must specify reviewers to send email.'],),
1014 SystemExitMock())
1015 ]
1016
1017 def RunEditor(desc, _, **kwargs):
1018 return desc
1019 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1020 self.mock(sys, 'stdout', stdout)
1021 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001022 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001023 self.assertEqual(
1024 '=====================================\n'
1025 'NOTICE: Rietveld is being deprecated. '
1026 'You can upload changes to Gerrit with\n'
1027 ' git cl upload --gerrit\n'
1028 'or set Gerrit to be your default code review tool with\n'
1029 ' git config gerrit.host true\n'
1030 '=====================================\n',
1031 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001032
tandriif9aefb72016-07-01 09:06:51 -07001033 def test_bug_on_cmd(self):
1034 self._run_reviewer_test(
1035 ['--bug=500658,proj:123'],
1036 'desc\n\nBUG=500658\nBUG=proj:123',
1037 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1038 'desc\n\nBUG=500658\nBUG=proj:1234',
1039 [])
1040
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001041 def test_git_numberer_not_whitelisted_repo(self):
1042 self.calls = []
1043 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001044 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1045 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001046 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001047
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001048 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001049 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1050 self.calls = [
1051 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001052 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001053 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001054 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001055 remote_url='https://chromium.googlesource.com/chromium/src',
1056 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001057 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001058
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001059 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001060 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001061 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001062 def fake_temporary_directory(**kwargs):
1063 yield tempdir
1064 self.mock(git_cl.gclient_utils, 'temporary_directory',
1065 fake_temporary_directory)
1066 self._test_GitNumbererState_valid_configs_inner(tempdir)
1067
1068 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001069 self.calls = [
1070 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001071 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001072 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1073 '''
1074 [plugin "git-numberer"]
1075 validate-enabled-refglob = refs/else/*
1076 validate-enabled-refglob = refs/heads/*
1077 validate-disabled-refglob = refs/heads/disabled
1078 validate-disabled-refglob = refs/branch-heads/*
1079 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001080 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1081 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001082 'refs/else/*\n'
1083 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001084 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1085 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001086 'refs/heads/disabled\n'
1087 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001088 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001089
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001090 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001091 remote_url='https://chromium.googlesource.com/chromium/src',
1092 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001093 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001094
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001095 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001096 remote_url='https://chromium.googlesource.com/chromium/src',
1097 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001098 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001099
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001100 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001101 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001102 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001103 remote_url='https://chromium.googlesource.com/chromium/src',
1104 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001105 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001106
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001107 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001108 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001109 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001110 if skip_auth_check:
1111 return [((cmd, ), 'true')]
1112
tandrii5d48c322016-08-18 16:19:37 -07001113 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001114 if issue:
1115 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001116 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001117 ])
1118 calls.extend([
1119 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1120 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1121 ((['git', 'config', 'remote.origin.url'],),
1122 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001123 ])
1124 return calls
1125
1126 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001127 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001128 fetched_status=None, other_cl_owner=None,
1129 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001130 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001131 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001132 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1133 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1134 ((['git', 'config', 'branch.master.gerritissue'],),
1135 CERR1 if issue is None else str(issue)),
1136 ]
1137
1138 if custom_cl_base:
1139 ancestor_revision = custom_cl_base
1140 else:
1141 # Determine ancestor_revision to be merge base.
1142 ancestor_revision = 'fake_ancestor_sha'
1143 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001144 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001145 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001146 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001147 'refs/remotes/origin/master'],), ancestor_revision),
1148 ]
1149
1150 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001151 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1152
1153 if issue:
1154 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001155 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001156 'my%2Frepo~123456',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001157 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001158 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001159 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001160 'change_id': '123456789',
1161 'current_revision': 'sha1_of_current_revision',
1162 'revisions': { 'sha1_of_current_revision': {
1163 'commit': {'message': fetched_description},
1164 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001165 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001166 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001167 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001168 if fetched_status == 'ABANDONED':
1169 calls += [
1170 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1171 '123456 has been abandoned, new uploads are not '
1172 'allowed'), SystemExitMock()),
1173 ]
1174 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001175 if other_cl_owner:
1176 calls += [
1177 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1178 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001179
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001180 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1181 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001182 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001183 ((['git', 'rev-parse', '--show-cdup'],), ''),
1184 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001185
Aaron Gable7817f022017-12-12 09:43:17 -08001186 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1187 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001188 'M\t.gitignore\n'),
1189 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001190 ]
1191
1192 if not issue:
1193 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001194 ((['git', 'log', '--pretty=format:%s%n%n%b',
1195 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001196 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001197 ]
1198
1199 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001200 ((['git', 'config', 'user.email'],), 'me@example.com'),
1201 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1202 ([custom_cl_base] if custom_cl_base else
1203 [ancestor_revision, 'HEAD']),),
1204 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001205 ]
1206 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001207
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001208 @classmethod
1209 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001210 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001211 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001212 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001213 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001214 custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001215 if post_amend_description is None:
1216 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001217 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001218 # Determined in `_gerrit_base_calls`.
1219 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1220
1221 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001222
tandriia60502f2016-06-20 02:01:53 -07001223 if squash_mode == 'default':
1224 calls.extend([
1225 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1226 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1227 ])
1228 elif squash_mode in ('override_squash', 'override_nosquash'):
1229 calls.extend([
1230 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1231 'true' if squash_mode == 'override_squash' else 'false'),
1232 ])
1233 else:
1234 assert squash_mode in ('squash', 'nosquash')
1235
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001236 # If issue is given, then description is fetched from Gerrit instead.
1237 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001238 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001239 ((['git', 'log', '--pretty=format:%s\n\n%b',
1240 ((custom_cl_base + '..') if custom_cl_base else
1241 'fake_ancestor_sha..HEAD')],),
1242 description),
1243 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001244 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001245 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001246 else:
1247 if not title:
1248 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001249 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1250 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001251 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001252 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001253 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001254 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001255 (('DownloadGerritHook', False), ''),
1256 # Amending of commit message to get the Change-Id.
1257 ((['git', 'log', '--pretty=format:%s\n\n%b',
1258 determined_ancestor_revision + '..HEAD'],),
1259 description),
1260 ((['git', 'commit', '--amend', '-m', description],), ''),
1261 ((['git', 'log', '--pretty=format:%s\n\n%b',
1262 determined_ancestor_revision + '..HEAD'],),
1263 post_amend_description)
1264 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001265 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001266 if not issue:
1267 # Prompting to edit description on first upload.
1268 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001269 ((['git', 'config', 'core.editor'],), ''),
1270 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001271 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001272 ref_to_push = 'abcdef0123456789'
1273 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001274 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1275 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1276 ]
1277
1278 if custom_cl_base is None:
1279 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001280 ((['get_or_create_merge_base', 'master',
1281 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001282 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001283 ]
1284 parent = 'origin/master'
1285 else:
1286 calls += [
1287 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1288 'refs/remotes/origin/master'],),
1289 callError(1)), # Means not ancenstor.
1290 (('ask_for_data',
1291 'Do you take responsibility for cleaning up potential mess '
1292 'resulting from proceeding with upload? Press Enter to upload, '
1293 'or Ctrl+C to abort'), ''),
1294 ]
1295 parent = custom_cl_base
1296
1297 calls += [
1298 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1299 '0123456789abcdef'),
1300 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001301 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001302 ref_to_push),
1303 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001304 else:
1305 ref_to_push = 'HEAD'
1306
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001307 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001308 ((['git', 'rev-list',
1309 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1310 ref_to_push],),
1311 '1hashPerLine\n'),
1312 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001313
Aaron Gableafd52772017-06-27 16:40:10 -07001314 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001315 ref_suffix = '%ready,notify=ALL'
1316 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001317 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001318 ref_suffix = '%wip'
1319 else:
1320 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001321
Aaron Gable70f4e242017-06-26 10:45:59 -07001322 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001323 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001324
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001325 calls.append((
1326 (['git', 'push',
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001327 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001328 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1329 ('remote:\n'
1330 'remote: Processing changes: (\)\n'
1331 'remote: Processing changes: (|)\n'
1332 'remote: Processing changes: (/)\n'
1333 'remote: Processing changes: (-)\n'
1334 'remote: Processing changes: new: 1 (/)\n'
1335 'remote: Processing changes: new: 1, done\n'
1336 'remote:\n'
1337 'remote: New Changes:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001338 'remote: https://chromium-review.googlesource.com/#/c/my/repo/+/123456'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001339 ' XXX\n'
1340 'remote:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001341 'To https://chromium.googlesource.com/my/repo\n'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001342 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')
1343 ))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001344 if squash:
1345 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001346 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001347 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001348 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001349 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001350 ((['git', 'config', 'branch.master.gerritsquashhash',
1351 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001352 ]
tandrii88189772016-09-29 04:29:57 -07001353 calls += [
1354 ((['git', 'config', 'rietveld.cc'],), ''),
tandrii88189772016-09-29 04:29:57 -07001355 ]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001356 if squash:
1357 calls += [
1358 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001359 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001360 sorted(reviewers),
1361 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1362 cc, notify), ''),
1363 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001364 if tbr:
1365 calls += [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001366 (('GetChangeDetail', 'chromium-review.googlesource.com',
1367 'my%2Frepo~123456', ['LABELS']), {
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001368 'labels': {
1369 'Code-Review': {
1370 'default_value': 0,
1371 'all': [],
1372 'values': {
1373 '+2': 'lgtm, approved',
1374 '+1': 'lgtm, but someone else must approve',
1375 ' 0': 'No score',
1376 '-1': 'Don\'t submit as-is',
1377 }
1378 }
1379 }
1380 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001381 (('SetReview',
1382 'chromium-review.googlesource.com',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001383 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001384 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001385 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001386 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001387 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001388 return calls
1389
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001390 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001391 self,
1392 upload_args,
1393 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001394 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001395 squash=True,
1396 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001397 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001398 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001399 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001400 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001401 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001402 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001403 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001404 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001405 custom_cl_base=None,
1406 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001407 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001408 if squash_mode is None:
1409 if '--no-squash' in upload_args:
1410 squash_mode = 'nosquash'
1411 elif '--squash' in upload_args:
1412 squash_mode = 'squash'
1413 else:
1414 squash_mode = 'default'
1415
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001416 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001417 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001418 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001419 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001420 CookiesAuthenticatorMockFactory(
1421 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001422 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1423 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001424 self.mock(git_cl.gclient_utils, 'RunEditor',
1425 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001426 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1427 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001428
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001429 self.calls = self._gerrit_base_calls(
1430 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001431 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001432 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001433 other_cl_owner=other_cl_owner,
1434 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001435 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001436 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1437 expected_content=description))
1438 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001439 self.calls += self._gerrit_upload_calls(
1440 description, reviewers, squash,
1441 squash_mode=squash_mode,
1442 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001443 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001444 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001445 issue=issue, cc=cc,
Aaron Gablefd238082017-06-07 13:42:34 -07001446 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001447 # Uncomment when debugging.
1448 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001449 git_cl.main(['upload'] + upload_args)
1450
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001451 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001452 self._run_gerrit_upload_test(
1453 ['--no-squash'],
1454 'desc\n\nBUG=\n',
1455 [],
1456 squash=False,
1457 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1458
1459 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001460 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001461 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001462 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001463 [],
tandriia60502f2016-06-20 02:01:53 -07001464 squash=False,
1465 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001466 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001467
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001468 def test_gerrit_no_reviewer(self):
1469 self._run_gerrit_upload_test(
1470 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001471 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001472 [],
1473 squash=False,
1474 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001475
Nick Carter8692b182017-11-06 16:30:38 -08001476 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001477 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1478 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001479 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001480 'desc\n\nBUG=\n\nChange-Id: I123456789',
1481 squash=False,
1482 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001483 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001484
ukai@chromium.orge8077812012-02-03 03:41:46 +00001485 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001486 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001487 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001488 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001489 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001490 squash=False,
1491 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001492 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001493
1494 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001495 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001496 [],
bradnelsond975b302016-10-23 12:20:23 -07001497 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1498 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001499 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001500 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001501 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001502 cc=['more@example.com', 'people@example.com'],
1503 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001504
1505 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001506 self._run_gerrit_upload_test(
1507 [],
1508 'desc\nBUG=\n\nChange-Id: 123456789',
1509 [],
1510 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001511
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001512 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001513 self._run_gerrit_upload_test(
1514 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001515 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001516 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001517 squash=True,
1518 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001519
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001520 def test_gerrit_upload_squash_first_against_rev(self):
1521 custom_cl_base = 'custom_cl_base_rev_or_branch'
1522 self._run_gerrit_upload_test(
1523 ['--squash', custom_cl_base],
1524 'desc\nBUG=\n\nChange-Id: 123456789',
1525 [],
1526 squash=True,
1527 expected_upstream_ref='origin/master',
1528 custom_cl_base=custom_cl_base)
1529 self.assertIn(
1530 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1531 sys.stdout.getvalue())
1532
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001533 def test_gerrit_upload_squash_reupload(self):
1534 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001535 self._run_gerrit_upload_test(
1536 ['--squash'],
1537 description,
1538 [],
1539 squash=True,
1540 expected_upstream_ref='origin/master',
1541 issue=123456)
1542
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001543 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1544 self.mock(git_cl, 'DieWithError',
1545 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1546 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1547 with self.assertRaises(SystemExitMock):
1548 self._run_gerrit_upload_test(
1549 ['--squash'],
1550 description,
1551 [],
1552 squash=True,
1553 expected_upstream_ref='origin/master',
1554 issue=123456,
1555 fetched_status='ABANDONED')
1556
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001557 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1558 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1559 lambda *_, **__: {'email': 'yet-another@example.com'})
1560 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1561 self._run_gerrit_upload_test(
1562 ['--squash'],
1563 description,
1564 [],
1565 squash=True,
1566 expected_upstream_ref='origin/master',
1567 issue=123456,
1568 other_cl_owner='other@example.com')
1569 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001570 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001571 'authenticate to Gerrit as yet-another@example.com.\n'
1572 'Uploading may fail due to lack of permissions',
1573 git_cl.sys.stdout.getvalue())
1574
rmistry@google.com2dd99862015-06-22 12:22:18 +00001575 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001576 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001577 def mock_run_git(*args, **_kwargs):
1578 if args[0] == ['for-each-ref',
1579 '--format=%(refname:short) %(upstream:short)',
1580 'refs/heads']:
1581 # Create a local branch dependency tree that looks like this:
1582 # test1 -> test2 -> test3 -> test4 -> test5
1583 # -> test3.1
1584 # test6 -> test0
1585 branch_deps = [
1586 'test2 test1', # test1 -> test2
1587 'test3 test2', # test2 -> test3
1588 'test3.1 test2', # test2 -> test3.1
1589 'test4 test3', # test3 -> test4
1590 'test5 test4', # test4 -> test5
1591 'test6 test0', # test0 -> test6
1592 'test7', # test7
1593 ]
1594 return '\n'.join(branch_deps)
1595 self.mock(git_cl, 'RunGit', mock_run_git)
1596
1597 class RecordCalls:
1598 times_called = 0
1599 record_calls = RecordCalls()
1600 def mock_CMDupload(*args, **_kwargs):
1601 record_calls.times_called += 1
1602 return 0
1603 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1604
1605 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001606 (('ask_for_data', 'This command will checkout all dependent branches '
1607 'and run "git cl upload". Press Enter to continue, '
1608 'or Ctrl+C to abort'), ''),
1609 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001610
1611 class MockChangelist():
1612 def __init__(self):
1613 pass
1614 def GetBranch(self):
1615 return 'test1'
1616 def GetIssue(self):
1617 return '123'
1618 def GetPatchset(self):
1619 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001620 def IsGerrit(self):
1621 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001622
1623 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1624 # CMDupload should have been called 5 times because of 5 dependent branches.
1625 self.assertEquals(5, record_calls.times_called)
1626 self.assertEquals(0, ret)
1627
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001628 def test_gerrit_change_id(self):
1629 self.calls = [
1630 ((['git', 'write-tree'], ),
1631 'hashtree'),
1632 ((['git', 'rev-parse', 'HEAD~0'], ),
1633 'branch-parent'),
1634 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1635 'A B <a@b.org> 1456848326 +0100'),
1636 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1637 'C D <c@d.org> 1456858326 +0100'),
1638 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1639 'hashchange'),
1640 ]
1641 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1642 self.assertEqual(change_id, 'Ihashchange')
1643
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001644 def test_desecription_append_footer(self):
1645 for init_desc, footer_line, expected_desc in [
1646 # Use unique desc first lines for easy test failure identification.
1647 ('foo', 'R=one', 'foo\n\nR=one'),
1648 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1649 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1650 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1651 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1652 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1653 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1654 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1655 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1656 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1657 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1658 ]:
1659 desc = git_cl.ChangeDescription(init_desc)
1660 desc.append_footer(footer_line)
1661 self.assertEqual(desc.description, expected_desc)
1662
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001663 def test_update_reviewers(self):
1664 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001665 ('foo', [], [],
1666 'foo'),
1667 ('foo\nR=xx', [], [],
1668 'foo\nR=xx'),
1669 ('foo\nTBR=xx', [], [],
1670 'foo\nTBR=xx'),
1671 ('foo', ['a@c'], [],
1672 'foo\n\nR=a@c'),
1673 ('foo\nR=xx', ['a@c'], [],
1674 'foo\n\nR=a@c, xx'),
1675 ('foo\nTBR=xx', ['a@c'], [],
1676 'foo\n\nR=a@c\nTBR=xx'),
1677 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1678 'foo\n\nR=a@c, yy\nTBR=xx'),
1679 ('foo\nBUG=', ['a@c'], [],
1680 'foo\nBUG=\nR=a@c'),
1681 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1682 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1683 ('foo', ['a@c', 'b@c'], [],
1684 'foo\n\nR=a@c, b@c'),
1685 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1686 'foo\nBar\n\nR=c@c\nBUG='),
1687 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1688 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001689 # Same as the line before, but full of whitespaces.
1690 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001691 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001692 'foo\nBar\n\nR=c@c\n BUG =',
1693 ),
1694 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001695 ('foo BUG=allo R=joe ', ['c@c'], [],
1696 'foo BUG=allo R=joe\n\nR=c@c'),
1697 # Redundant TBRs get promoted to Rs
1698 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1699 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001700 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001701 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001702 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001703 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001704 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001705 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001706 actual.append(obj.description)
1707 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001708
Nodir Turakulov23b82142017-11-16 11:04:25 -08001709 def test_get_hash_tags(self):
1710 cases = [
1711 ('', []),
1712 ('a', []),
1713 ('[a]', ['a']),
1714 ('[aa]', ['aa']),
1715 ('[a ]', ['a']),
1716 ('[a- ]', ['a']),
1717 ('[a- b]', ['a-b']),
1718 ('[a--b]', ['a-b']),
1719 ('[a', []),
1720 ('[a]x', ['a']),
1721 ('[aa]x', ['aa']),
1722 ('[a b]', ['a-b']),
1723 ('[a b]', ['a-b']),
1724 ('[a__b]', ['a-b']),
1725 ('[a] x', ['a']),
1726 ('[a][b]', ['a', 'b']),
1727 ('[a] [b]', ['a', 'b']),
1728 ('[a][b]x', ['a', 'b']),
1729 ('[a][b] x', ['a', 'b']),
1730 ('[a]\n[b]', ['a']),
1731 ('[a\nb]', []),
1732 ('[a][', ['a']),
1733 ('Revert "[a] feature"', ['a']),
1734 ('Reland "[a] feature"', ['a']),
1735 ('Revert: [a] feature', ['a']),
1736 ('Reland: [a] feature', ['a']),
1737 ('Revert "Reland: [a] feature"', ['a']),
1738 ('Foo: feature', ['foo']),
1739 ('Foo Bar: feature', ['foo-bar']),
1740 ('Revert "Foo bar: feature"', ['foo-bar']),
1741 ('Reland "Foo bar: feature"', ['foo-bar']),
1742 ]
1743 for desc, expected in cases:
1744 change_desc = git_cl.ChangeDescription(desc)
1745 actual = change_desc.get_hash_tags()
1746 self.assertEqual(
1747 actual,
1748 expected,
1749 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1750
wittman@chromium.org455dc922015-01-26 20:15:50 +00001751 def test_get_target_ref(self):
1752 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001753 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001754 self.assertEqual(None, git_cl.GetTargetRef(None,
1755 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001756 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001757
wittman@chromium.org455dc922015-01-26 20:15:50 +00001758 # Check default target refs for branches.
1759 self.assertEqual('refs/heads/master',
1760 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001761 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001762 self.assertEqual('refs/heads/master',
1763 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001764 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001765 self.assertEqual('refs/heads/master',
1766 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001767 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001768 self.assertEqual('refs/branch-heads/123',
1769 git_cl.GetTargetRef('origin',
1770 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001771 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001772 self.assertEqual('refs/diff/test',
1773 git_cl.GetTargetRef('origin',
1774 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001775 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001776 self.assertEqual('refs/heads/chrome/m42',
1777 git_cl.GetTargetRef('origin',
1778 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001779 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001780
1781 # Check target refs for user-specified target branch.
1782 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1783 'refs/remotes/branch-heads/123'):
1784 self.assertEqual('refs/branch-heads/123',
1785 git_cl.GetTargetRef('origin',
1786 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001787 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001788 for branch in ('origin/master', 'remotes/origin/master',
1789 'refs/remotes/origin/master'):
1790 self.assertEqual('refs/heads/master',
1791 git_cl.GetTargetRef('origin',
1792 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001793 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001794 for branch in ('master', 'heads/master', 'refs/heads/master'):
1795 self.assertEqual('refs/heads/master',
1796 git_cl.GetTargetRef('origin',
1797 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001798 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001799
wychen@chromium.orga872e752015-04-28 23:42:18 +00001800 def test_patch_when_dirty(self):
1801 # Patch when local tree is dirty
1802 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1803 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1804
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001805 @staticmethod
1806 def _get_gerrit_codereview_server_calls(branch, value=None,
1807 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001808 detect_branch=True,
1809 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001810 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1811
1812 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1813 """
1814 calls = []
1815 if detect_branch:
1816 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001817 if detect_server:
1818 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1819 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001820 if value is None:
1821 calls += [
1822 ((['git', 'config', 'branch.' + branch + '.merge'],),
1823 'refs/heads' + branch),
1824 ((['git', 'config', 'branch.' + branch + '.remote'],),
1825 'origin'),
1826 ((['git', 'config', 'remote.origin.url'],),
1827 'https://%s.googlesource.com/my/repo' % git_short_host),
1828 ]
1829 return calls
1830
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001831 def _patch_common(self, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001832 new_branch=False, git_short_host='host',
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001833 detect_gerrit_server=False,
1834 actual_codereview=None,
1835 codereview_in_url=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001836 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001837 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1838 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001839 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001840 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001841 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1842
tandriidf09a462016-08-18 16:23:55 -07001843 if new_branch:
1844 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001845
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001846 if codereview_in_url and actual_codereview == 'rietveld':
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001847 self.calls += [
1848 ((['git', 'rev-parse', '--show-cdup'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001849 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001850 ]
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001851
1852 if not force_codereview and not codereview_in_url:
1853 # These calls detect codereview to use.
1854 self.calls += [
1855 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1856 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1857 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1858 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1859 ((['git', 'config', 'gerrit.host'],), 'true'),
1860 ]
1861 if detect_gerrit_server:
1862 self.calls += self._get_gerrit_codereview_server_calls(
1863 'master', git_short_host=git_short_host,
1864 detect_branch=not new_branch and force_codereview)
1865 actual_codereview = 'gerrit'
1866
1867 if actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001868 self.calls += [
1869 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001870 'my%2Frepo~123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001871 {
1872 'current_revision': '7777777777',
1873 'revisions': {
1874 '1111111111': {
1875 '_number': 1,
1876 'fetch': {'http': {
1877 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1878 'ref': 'refs/changes/56/123456/1',
1879 }},
1880 },
1881 '7777777777': {
1882 '_number': 7,
1883 'fetch': {'http': {
1884 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1885 'ref': 'refs/changes/56/123456/7',
1886 }},
1887 },
1888 },
1889 }),
1890 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001891
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001892 def test_patch_rietveld_guess_by_url(self):
1893 self._patch_common(actual_codereview='rietveld', codereview_in_url=True)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001894 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001895 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001896 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001897 ((['git', 'config', 'branch.master.rietveldserver',
1898 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001899 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001900 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001901 ((['git', 'commit', '-m',
1902 'Description\n\n' +
1903 'patch from issue 123456 at patchset 60001 ' +
1904 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001905 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001906 self.assertEqual(git_cl.main(
1907 ['patch', 'https://codereview.example.com/123456']), 0)
1908
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001909 def test_patch_gerrit_default(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001910 self._patch_common(git_short_host='chromium', detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001911 self.calls += [
1912 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1913 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001914 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001915 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001916 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001917 ((['git', 'config', 'branch.master.gerritserver',
1918 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001919 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001920 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1921 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1922 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001923 ]
1924 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1925
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001926 def test_patch_gerrit_new_branch(self):
1927 self._patch_common(
1928 git_short_host='chromium', detect_gerrit_server=True, new_branch=True)
1929 self.calls += [
1930 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1931 'refs/changes/56/123456/7'],), ''),
1932 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1933 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1934 ''),
1935 ((['git', 'config', 'branch.master.gerritserver',
1936 'https://chromium-review.googlesource.com'],), ''),
1937 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1938 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1939 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1940 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1941 ]
1942 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1943
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001944 def test_patch_gerrit_force(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001945 self._patch_common(
1946 force_codereview=True, git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001947 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001948 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001949 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001950 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001951 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001952 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001953 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001954 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001955 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001956 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1957 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1958 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001959 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001960 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001961
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001962 def test_patch_gerrit_guess_by_url(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001963 self.calls += self._get_gerrit_codereview_server_calls(
1964 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001965 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001966 actual_codereview='gerrit', git_short_host='else',
1967 codereview_in_url=True, detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001968 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001969 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001970 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001971 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001972 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001973 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001974 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001975 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001976 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001977 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1978 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1979 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001980 ]
1981 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001982 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001983
Aaron Gable697a91b2018-01-19 15:20:15 -08001984 def test_patch_gerrit_guess_by_url_with_repo(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001985 self.calls += self._get_gerrit_codereview_server_calls(
1986 'master', git_short_host='else', detect_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001987 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001988 actual_codereview='gerrit', git_short_host='else',
1989 codereview_in_url=True, detect_gerrit_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001990 self.calls += [
1991 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1992 'refs/changes/56/123456/1'],), ''),
1993 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1994 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1995 ''),
1996 ((['git', 'config', 'branch.master.gerritserver',
1997 'https://else-review.googlesource.com'],), ''),
1998 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1999 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2000 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2001 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
2002 ]
2003 self.assertEqual(git_cl.main(
2004 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
2005 0)
2006
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002007 def test_patch_gerrit_conflict(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00002008 self._patch_common(detect_gerrit_server=True, git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002009 self.calls += [
2010 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002011 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002012 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2013 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2014 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002015 ]
2016 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002017 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002018
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002019 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002020 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002021 raise git_cl.gerrit_util.GerritError(404, '')
2022 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2023
tandriic2405f52016-10-10 08:13:15 -07002024 self.calls = [
2025 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002026 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2027 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2028 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2029 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002030 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2031 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2032 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2033 ((['git', 'config', 'remote.origin.url'],),
2034 'https://chromium.googlesource.com/my/repo'),
2035 ((['DieWithError',
2036 'change 123456 at https://chromium-review.googlesource.com does not '
2037 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002038 ]
2039 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002040 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002041
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002042 def _checkout_calls(self):
2043 return [
2044 ((['git', 'config', '--local', '--get-regexp',
2045 'branch\\..*\\.rietveldissue'], ),
2046 ('branch.retrying.rietveldissue 1111111111\n'
2047 'branch.some-fix.rietveldissue 2222222222\n')),
2048 ((['git', 'config', '--local', '--get-regexp',
2049 'branch\\..*\\.gerritissue'], ),
2050 ('branch.ger-branch.gerritissue 123456\n'
2051 'branch.gbranch654.gerritissue 654321\n')),
2052 ]
2053
2054 def test_checkout_gerrit(self):
2055 """Tests git cl checkout <issue>."""
2056 self.calls = self._checkout_calls()
2057 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2058 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2059
2060 def test_checkout_rietveld(self):
2061 """Tests git cl checkout <issue>."""
2062 self.calls = self._checkout_calls()
2063 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2064 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2065
2066 def test_checkout_not_found(self):
2067 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002068 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002069 self.calls = self._checkout_calls()
2070 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2071
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002072 def test_checkout_no_branch_issues(self):
2073 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002074 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002075 self.calls = [
2076 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002077 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002078 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002079 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002080 ]
2081 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2082
tandrii@chromium.org28253532016-04-14 13:46:56 +00002083 def _test_gerrit_ensure_authenticated_common(self, auth,
2084 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002085 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2086 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2087 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002088 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002089 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002090 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002091 cl.branch = 'master'
2092 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002093 cl.lookedup_issue = True
2094 return cl
2095
2096 def test_gerrit_ensure_authenticated_missing(self):
2097 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002098 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002099 })
2100 self.calls.append(
2101 ((['DieWithError',
2102 'Credentials for the following hosts are required:\n'
2103 ' chromium-review.googlesource.com\n'
2104 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002105 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002106 'https://chromium-review.googlesource.com/new-password'],), ''),)
2107 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2108
2109 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002110 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002111 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002112 'chromium.googlesource.com':
2113 ('git-one.example.com', None, 'secret1'),
2114 'chromium-review.googlesource.com':
2115 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002116 })
2117 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002118 (('ask_for_data', 'If you know what you are doing '
2119 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002120 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2121
2122 def test_gerrit_ensure_authenticated_ok(self):
2123 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002124 'chromium.googlesource.com':
2125 ('git-same.example.com', None, 'secret'),
2126 'chromium-review.googlesource.com':
2127 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002128 })
2129 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2130
tandrii@chromium.org28253532016-04-14 13:46:56 +00002131 def test_gerrit_ensure_authenticated_skipped(self):
2132 cl = self._test_gerrit_ensure_authenticated_common(
2133 auth={}, skip_auth_check=True)
2134 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2135
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002136 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002137 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2138 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002139 self.calls = [
2140 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002141 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002142 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2143 ((['git', 'config', 'rietveld.server'],), ''),
2144 ((['git', 'config', 'rietveld.server'],), ''),
2145 ((['git', 'config', 'branch.feature.rietveldserver'],),
2146 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002147 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002148 ]
2149 self.assertEqual(0, git_cl.main(['set-commit']))
2150
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002151 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002152 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002153 lambda h, i, labels, notify=None:
2154 self._mocked_call(['SetReview', h, i, labels, notify]))
2155
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002156 self.calls = [
2157 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002158 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2159 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002160 ((['git', 'config', 'branch.feature.gerritserver'],),
2161 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002162 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
2163 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2164 ((['git', 'config', 'remote.origin.url'],),
2165 'https://chromium.googlesource.com/infra/infra.git'),
2166 ((['SetReview', 'chromium-review.googlesource.com',
2167 'infra%2Finfra~123',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002168 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002169 ]
tandriid9e5ce52016-07-13 02:32:59 -07002170
2171 def test_cmd_set_commit_gerrit_clear(self):
2172 self._cmd_set_commit_gerrit_common(0)
2173 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2174
2175 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002176 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002177 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2178
tandriid9e5ce52016-07-13 02:32:59 -07002179 def test_cmd_set_commit_gerrit(self):
2180 self._cmd_set_commit_gerrit_common(2)
2181 self.assertEqual(0, git_cl.main(['set-commit']))
2182
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002183 def test_description_display(self):
2184 out = StringIO.StringIO()
2185 self.mock(git_cl.sys, 'stdout', out)
2186
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002187 self.mock(git_cl, 'Changelist', ChangelistMock)
2188 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002189
2190 self.assertEqual(0, git_cl.main(['description', '-d']))
2191 self.assertEqual('foo\n', out.getvalue())
2192
2193 def test_description_rietveld(self):
2194 out = StringIO.StringIO()
2195 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002196 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002197
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002198 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002199 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002200 self.assertEqual('foobar\n', out.getvalue())
2201
iannucci3c972b92016-08-17 13:24:10 -07002202 def test_StatusFieldOverrideIssueMissingArgs(self):
2203 out = StringIO.StringIO()
2204 self.mock(git_cl.sys, 'stderr', out)
2205
2206 try:
2207 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2208 except SystemExit as ex:
2209 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002210 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002211
2212 out = StringIO.StringIO()
2213 self.mock(git_cl.sys, 'stderr', out)
2214
2215 try:
2216 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2217 except SystemExit as ex:
2218 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002219 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002220
2221 def test_StatusFieldOverrideIssue(self):
2222 out = StringIO.StringIO()
2223 self.mock(git_cl.sys, 'stdout', out)
2224
2225 def assertIssue(cl_self, *_args):
2226 self.assertEquals(cl_self.issue, 1)
2227 return 'foobar'
2228
2229 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2230 self.calls = [
2231 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2232 ((['git', 'config', 'rietveld.server'],), ''),
2233 ((['git', 'config', 'rietveld.server'],), ''),
2234 ]
iannuccie53c9352016-08-17 14:40:40 -07002235 self.assertEqual(
2236 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2237 0)
iannucci3c972b92016-08-17 13:24:10 -07002238 self.assertEqual(out.getvalue(), 'foobar\n')
2239
iannuccie53c9352016-08-17 14:40:40 -07002240 def test_SetCloseOverrideIssue(self):
2241 def assertIssue(cl_self, *_args):
2242 self.assertEquals(cl_self.issue, 1)
2243 return 'foobar'
2244
2245 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2246 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2247 self.calls = [
2248 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2249 ((['git', 'config', 'rietveld.server'],), ''),
2250 ((['git', 'config', 'rietveld.server'],), ''),
2251 ]
2252 self.assertEqual(
2253 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2254
2255 def test_SetCommitOverrideIssue(self):
2256 def assertIssue(cl_self, *_args):
2257 self.assertEquals(cl_self.issue, 1)
2258 return 'foobar'
2259
2260 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2261 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2262 self.calls = [
2263 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2264 ((['git', 'config', 'rietveld.server'],), ''),
2265 ((['git', 'config', 'rietveld.server'],), ''),
2266 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2267 ((['git', 'config', 'rietveld.server'],), ''),
2268 ((['git', 'config', 'rietveld.server'],), ''),
2269 ]
2270 self.assertEqual(
2271 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2272
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002273 def test_description_gerrit(self):
2274 out = StringIO.StringIO()
2275 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002276 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002277 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2278 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2279 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2280 ((['git', 'config', 'remote.origin.url'],),
2281 'https://chromium.googlesource.com/my/repo'),
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002282 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002283 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002284 {
2285 'current_revision': 'sha1',
2286 'revisions': {'sha1': {
2287 'commit': {'message': 'foobar'},
2288 }},
2289 }),
2290 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002291 self.assertEqual(0, git_cl.main([
2292 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2293 self.assertEqual('foobar\n', out.getvalue())
2294
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002295 def test_description_set_raw(self):
2296 out = StringIO.StringIO()
2297 self.mock(git_cl.sys, 'stdout', out)
2298
2299 self.mock(git_cl, 'Changelist', ChangelistMock)
2300 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2301
2302 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2303 self.assertEqual('hihi', ChangelistMock.desc)
2304
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002305 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002306 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002307
2308 def RunEditor(desc, _, **kwargs):
2309 self.assertEquals(
2310 '# Enter a description of the change.\n'
2311 '# This will be displayed on the codereview site.\n'
2312 '# The first line will also be used as the subject of the review.\n'
2313 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002314 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002315 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002316 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002317 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002318 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002319
dsansomee2d6fd92016-09-08 00:10:47 -07002320 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002321 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002322
2323 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2324 self.mock(git_cl.Changelist, 'GetDescription',
2325 lambda *args: current_desc)
2326 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2327 UpdateDescriptionRemote)
2328 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2329
2330 self.calls = [
2331 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002332 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002333 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2334 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002335 ((['git', 'config', 'core.editor'],), 'vi'),
2336 ]
2337 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2338
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002339 def test_description_set_stdin(self):
2340 out = StringIO.StringIO()
2341 self.mock(git_cl.sys, 'stdout', out)
2342
2343 self.mock(git_cl, 'Changelist', ChangelistMock)
2344 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2345
2346 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2347 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2348
kmarshall3bff56b2016-06-06 18:31:47 -07002349 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002350 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2351
kmarshall3bff56b2016-06-06 18:31:47 -07002352 self.calls = \
2353 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2354 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002355 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002356 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2357 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002358 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2359 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2360 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002361 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2362 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2363 ((['git', 'branch', '-D', 'foo'],), '')]
2364
kmarshall3bff56b2016-06-06 18:31:47 -07002365 self.mock(git_cl, 'get_cl_statuses',
2366 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002367 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2368 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2369 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002370
2371 self.assertEqual(0, git_cl.main(['archive', '-f']))
2372
2373 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002374 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002375 self.calls = \
2376 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2377 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002378 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002379 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2380 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002381 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2382
kmarshall9249e012016-08-23 12:02:16 -07002383 self.mock(git_cl, 'get_cl_statuses',
2384 lambda branches, fine_grained, max_processes:
2385 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2386
2387 self.assertEqual(1, git_cl.main(['archive', '-f']))
2388
2389 def test_archive_dry_run(self):
2390 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2391
2392 self.calls = \
2393 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2394 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2395 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2396 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2397 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2398 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2399 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2400 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2401 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002402
2403 self.mock(git_cl, 'get_cl_statuses',
2404 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002405 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2406 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2407 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002408
kmarshall9249e012016-08-23 12:02:16 -07002409 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2410
2411 def test_archive_no_tags(self):
2412 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2413
2414 self.calls = \
2415 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2416 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2417 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2418 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2419 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2420 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2421 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2422 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2423 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2424 ((['git', 'branch', '-D', 'foo'],), '')]
2425
2426 self.mock(git_cl, 'get_cl_statuses',
2427 lambda branches, fine_grained, max_processes:
2428 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2429 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2430 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2431
2432 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002433
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002434 def test_cmd_issue_erase_existing(self):
2435 out = StringIO.StringIO()
2436 self.mock(git_cl.sys, 'stdout', out)
2437 self.calls = [
2438 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002439 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2440 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002441 # Let this command raise exception (retcode=1) - it should be ignored.
2442 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002443 CERR1),
2444 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2445 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002446 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2447 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2448 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002449 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002450 ]
2451 self.assertEqual(0, git_cl.main(['issue', '0']))
2452
Aaron Gable400e9892017-07-12 15:31:21 -07002453 def test_cmd_issue_erase_existing_with_change_id(self):
2454 out = StringIO.StringIO()
2455 self.mock(git_cl.sys, 'stdout', out)
2456 self.mock(git_cl.Changelist, 'GetDescription',
2457 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2458 self.calls = [
2459 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2460 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2461 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002462 # Let this command raise exception (retcode=1) - it should be ignored.
2463 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2464 CERR1),
2465 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2466 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2467 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2468 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2469 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002470 ((['git', 'log', '-1', '--format=%B'],),
2471 'This is a description\n\nChange-Id: Ideadbeef'),
2472 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002473 ]
2474 self.assertEqual(0, git_cl.main(['issue', '0']))
2475
phajdan.jre328cf92016-08-22 04:12:17 -07002476 def test_cmd_issue_json(self):
2477 out = StringIO.StringIO()
2478 self.mock(git_cl.sys, 'stdout', out)
2479 self.calls = [
2480 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002481 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002482 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2483 ((['git', 'config', 'rietveld.server'],),
2484 'https://codereview.chromium.org'),
2485 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2486 (('write_json', 'output.json',
2487 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2488 ''),
2489 ]
2490 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2491
tandriide281ae2016-10-12 06:02:30 -07002492 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002493 self.mock(git_cl.Changelist, 'GetChange',
2494 lambda _, *a: (
2495 self._mocked_call(['GetChange']+list(a))))
2496 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2497 lambda *_, **__: (
2498 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002499 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2500 lambda _, s: self._mocked_call(['SetCQState', s]))
2501 self.calls = [
2502 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002503 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002504 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2505 ((['git', 'config', 'rietveld.server'],),
2506 'https://codereview.chromium.org'),
2507 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2508 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2509 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2510 ((['get_or_create_merge_base', 'feature', 'feature'],),
2511 'fake_ancestor_sha'),
2512 ((['GetChange', 'fake_ancestor_sha', None], ),
2513 git_cl.presubmit_support.GitChange(
2514 '', '', '', '', '', '', '', '')),
2515 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2516 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002517 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2518 ]
2519 out = StringIO.StringIO()
2520 self.mock(git_cl.sys, 'stdout', out)
2521 self.assertEqual(0, git_cl.main(['try']))
2522 self.assertEqual(
2523 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002524 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002525
tandrii8c5a3532016-11-04 07:52:02 -07002526 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2527 self.mock(git_cl.Changelist, 'GetChange',
2528 lambda _, *a: (
2529 self._mocked_call(['GetChange']+list(a))))
2530 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2531 lambda *_, **__: (
2532 self._mocked_call(['DoGetTryMasters'])))
2533 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2534 lambda _, s: self._mocked_call(['SetCQState', s]))
2535
tandrii8c5a3532016-11-04 07:52:02 -07002536 self.calls = [
2537 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2538 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2539 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2540 ((['git', 'config', 'branch.feature.gerritserver'],),
2541 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002542 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2543 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2544 ((['git', 'config', 'remote.origin.url'],),
2545 'https://chromium.googlesource.com/depot_tools'),
2546 (('GetChangeDetail', 'chromium-review.googlesource.com',
2547 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002548 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2549 'project': 'depot_tools',
2550 'status': 'OPEN',
2551 'owner': {'email': 'owner@e.mail'},
2552 'revisions': {
2553 'deadbeaf': {
2554 '_number': 6,
2555 },
2556 'beeeeeef': {
2557 '_number': 7,
2558 'fetch': {'http': {
2559 'url': 'https://chromium.googlesource.com/depot_tools',
2560 'ref': 'refs/changes/56/123456/7'
2561 }},
2562 },
2563 },
2564 }),
tandrii8c5a3532016-11-04 07:52:02 -07002565 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2566 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2567 ((['get_or_create_merge_base', 'feature', 'feature'],),
2568 'fake_ancestor_sha'),
2569 ((['GetChange', 'fake_ancestor_sha', None], ),
2570 git_cl.presubmit_support.GitChange(
2571 '', '', '', '', '', '', '', '')),
2572 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2573 ((['DoGetTryMasters'], ), None),
2574 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2575 ]
2576 out = StringIO.StringIO()
2577 self.mock(git_cl.sys, 'stdout', out)
2578 self.assertEqual(0, git_cl.main(['try']))
2579 self.assertEqual(
2580 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002581 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002582 'https://chromium-review.googlesource.com/123456\n')
2583
2584 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2585 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2586 lambda _: {
2587 'owner_email': 'owner@e.mail',
2588 'private': False,
2589 'closed': False,
2590 'project': 'depot_tools',
2591 'patchsets': [20001],
2592 })
tandriide281ae2016-10-12 06:02:30 -07002593 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2594 self.calls = [
2595 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2596 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2597 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2598 ((['git', 'config', 'rietveld.server'],),
2599 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002600 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002601 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002602 ]
2603
2604 def _buildbucket_retry(*_, **kw):
2605 # self.maxDiff = 10000
2606 body = json.loads(kw['body'])
2607 self.assertEqual(len(body['builds']), 1)
2608 build = body['builds'][0]
2609 params = json.loads(build.pop('parameters_json'))
2610 self.assertEqual(params, {
2611 u'builder_name': u'win',
2612 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2613 u'revision': None}],
2614 u'properties': {
2615 u'category': u'git_cl_try',
2616 u'issue': 123,
2617 u'key': u'val',
2618 u'json': [{u'a': 1}, None],
2619 u'master': u'tryserver.chromium',
2620 u'patch_project': u'depot_tools',
2621 u'patch_storage': u'rietveld',
2622 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002623 u'rietveld': u'https://codereview.chromium.org',
2624 }
2625 })
2626 self.assertEqual(build, {
2627 u'bucket': u'master.tryserver.chromium',
2628 u'client_operation_id': u'uuid4',
2629 u'tags': [u'builder:win',
2630 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002631 u'user_agent:git_cl_try',
2632 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002633 })
2634
2635 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2636
2637 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2638 self.assertEqual(0, git_cl.main([
2639 'try', '-m', 'tryserver.chromium', '-b', 'win',
2640 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2641 self.assertRegexpMatches(
2642 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002643 'Tried jobs on:\nBucket: master.tryserver.chromium')
2644
tandrii8c5a3532016-11-04 07:52:02 -07002645 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2646 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2647 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2648
tandrii8c5a3532016-11-04 07:52:02 -07002649 self.calls = [
2650 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2651 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2652 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2653 ((['git', 'config', 'branch.feature.gerritserver'],),
2654 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002655 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2656 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2657 ((['git', 'config', 'remote.origin.url'],),
2658 'https://chromium.googlesource.com/depot_tools'),
2659 (('GetChangeDetail', 'chromium-review.googlesource.com',
2660 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002661 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002662 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002663 'status': 'OPEN',
2664 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002665 'revisions': {
2666 'deadbeaf': {
2667 '_number': 6,
2668 },
2669 'beeeeeef': {
2670 '_number': 7,
2671 'fetch': {'http': {
2672 'url': 'https://chromium.googlesource.com/depot_tools',
2673 'ref': 'refs/changes/56/123456/7'
2674 }},
2675 },
2676 },
2677 }),
2678 ]
2679
2680 def _buildbucket_retry(*_, **kw):
2681 # self.maxDiff = 10000
2682 body = json.loads(kw['body'])
2683 self.assertEqual(len(body['builds']), 1)
2684 build = body['builds'][0]
2685 params = json.loads(build.pop('parameters_json'))
2686 self.assertEqual(params, {
2687 u'builder_name': u'win',
2688 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2689 u'revision': None}],
2690 u'properties': {
2691 u'category': u'git_cl_try',
2692 u'key': u'val',
2693 u'json': [{u'a': 1}, None],
2694 u'master': u'tryserver.chromium',
2695
2696 u'patch_gerrit_url':
2697 u'https://chromium-review.googlesource.com',
2698 u'patch_issue': 123456,
2699 u'patch_project': u'depot_tools',
2700 u'patch_ref': u'refs/changes/56/123456/7',
2701 u'patch_repository_url':
2702 u'https://chromium.googlesource.com/depot_tools',
2703 u'patch_set': 7,
2704 u'patch_storage': u'gerrit',
2705 }
2706 })
2707 self.assertEqual(build, {
2708 u'bucket': u'master.tryserver.chromium',
2709 u'client_operation_id': u'uuid4',
2710 u'tags': [
2711 u'builder:win',
2712 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2713 u'user_agent:git_cl_try',
2714 u'master:tryserver.chromium'],
2715 })
2716
2717 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2718
2719 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2720 self.assertEqual(0, git_cl.main([
2721 'try', '-m', 'tryserver.chromium', '-b', 'win',
2722 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2723 self.assertRegexpMatches(
2724 git_cl.sys.stdout.getvalue(),
2725 'Tried jobs on:\nBucket: master.tryserver.chromium')
2726
borenet6c0efe62016-10-19 08:13:29 -07002727 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002728 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2729 lambda _: {
2730 'owner_email': 'owner@e.mail',
2731 'private': False,
2732 'closed': False,
2733 'project': 'depot_tools',
2734 'patchsets': [20001],
2735 })
borenet6c0efe62016-10-19 08:13:29 -07002736 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2737 self.calls = [
2738 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2739 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2740 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2741 ((['git', 'config', 'rietveld.server'],),
2742 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002743 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002744 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002745 ]
2746
2747 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002748 body = json.loads(kw['body'])
2749 self.assertEqual(len(body['builds']), 1)
2750 build = body['builds'][0]
2751 params = json.loads(build.pop('parameters_json'))
2752 self.assertEqual(params, {
2753 u'builder_name': u'win',
2754 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2755 u'revision': None}],
2756 u'properties': {
2757 u'category': u'git_cl_try',
2758 u'issue': 123,
2759 u'patch_project': u'depot_tools',
2760 u'patch_storage': u'rietveld',
2761 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002762 u'rietveld': u'https://codereview.chromium.org',
2763 }
2764 })
2765 self.assertEqual(build, {
2766 u'bucket': u'test.bucket',
2767 u'client_operation_id': u'uuid4',
2768 u'tags': [u'builder:win',
2769 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2770 u'user_agent:git_cl_try'],
2771 })
2772
2773 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2774
2775 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2776 self.assertEqual(0, git_cl.main([
2777 'try', '-B', 'test.bucket', '-b', 'win']))
2778 self.assertRegexpMatches(
2779 git_cl.sys.stdout.getvalue(),
2780 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002781
qyearsley123a4682016-10-26 09:12:17 -07002782 def test_git_cl_try_bots_on_multiple_masters(self):
2783 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2784 self.calls = [
2785 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2786 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2787 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2788 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002789 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002790 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2791 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2792 ]
2793
2794 def _buildbucket_retry(*_, **kw):
2795 body = json.loads(kw['body'])
2796 self.assertEqual(len(body['builds']), 2)
2797
Nodir Turakulovb422e682018-02-20 22:51:30 -08002798 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2799 params = json.loads(body['builds'][0]['parameters_json'])
2800 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002801
Nodir Turakulovb422e682018-02-20 22:51:30 -08002802 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2803 params = json.loads(body['builds'][1]['parameters_json'])
2804 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002805
2806 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2807
2808 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002809 json.dumps({
2810 'builder1': {'bucket': 'bucket1'},
2811 'builder2': {'bucket': 'bucket2'},
2812 })))
qyearsley123a4682016-10-26 09:12:17 -07002813
2814 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2815 self.assertEqual(
2816 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2817 self.assertEqual(
2818 git_cl.sys.stdout.getvalue(),
2819 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002820 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002821 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002822 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002823 ' builder2: []\n'
2824 'To see results here, run: git cl try-results\n'
2825 'To see results in browser, run: git cl web\n')
2826
tandrii16e0b4e2016-06-07 10:34:28 -07002827 def _common_GerritCommitMsgHookCheck(self):
2828 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2829 self.mock(git_cl.os.path, 'abspath',
2830 lambda path: self._mocked_call(['abspath', path]))
2831 self.mock(git_cl.os.path, 'exists',
2832 lambda path: self._mocked_call(['exists', path]))
2833 self.mock(git_cl.gclient_utils, 'FileRead',
2834 lambda path: self._mocked_call(['FileRead', path]))
2835 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2836 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2837 self.calls = [
2838 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2839 ((['abspath', '../'],), '/abs/git_repo_root'),
2840 ]
2841 return git_cl.Changelist(codereview='gerrit', issue=123)
2842
2843 def test_GerritCommitMsgHookCheck_custom_hook(self):
2844 cl = self._common_GerritCommitMsgHookCheck()
2845 self.calls += [
2846 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2847 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2848 '#!/bin/sh\necho "custom hook"')
2849 ]
2850 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2851
2852 def test_GerritCommitMsgHookCheck_not_exists(self):
2853 cl = self._common_GerritCommitMsgHookCheck()
2854 self.calls += [
2855 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2856 ]
2857 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2858
2859 def test_GerritCommitMsgHookCheck(self):
2860 cl = self._common_GerritCommitMsgHookCheck()
2861 self.calls += [
2862 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2863 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2864 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002865 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002866 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2867 ''),
2868 ]
2869 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2870
tandriic4344b52016-08-29 06:04:54 -07002871 def test_GerritCmdLand(self):
2872 self.calls += [
2873 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2874 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2875 'deadbeaf'),
2876 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2877 ((['git', 'config', 'branch.feature.gerritserver'],),
2878 'chromium-review.googlesource.com'),
2879 ]
2880 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2881 cl._codereview_impl._GetChangeDetail = lambda _: {
2882 'labels': {},
2883 'current_revision': 'deadbeaf',
2884 }
agable32978d92016-11-01 12:55:02 -07002885 cl._codereview_impl._GetChangeCommit = lambda: {
2886 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002887 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002888 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2889 }
tandriic4344b52016-08-29 06:04:54 -07002890 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002891 out = StringIO.StringIO()
2892 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002893 self.assertEqual(0, cl.CMDLand(force=True,
2894 bypass_hooks=True,
2895 verbose=True,
2896 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002897 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002898 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002899
tandrii221ab252016-10-06 08:12:04 -07002900 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002901 '9000': {
2902 'id': '9000',
2903 'bucket': 'master.x.y',
2904 'created_by': 'user:someone@chromium.org',
2905 'created_ts': '147200002222000',
2906 'experimental': False,
2907 'parameters_json': json.dumps({
2908 'builder_name': 'my-bot',
2909 'properties': {'category': 'cq'},
2910 }),
2911 'status': 'STARTED',
2912 'tags': [
2913 'build_address:x.y/my-bot/2',
2914 'builder:my-bot',
2915 'experimental:false',
2916 'user_agent:cq',
2917 ],
2918 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2919 },
2920 '8000': {
2921 'id': '8000',
2922 'bucket': 'master.x.y',
2923 'created_by': 'user:someone@chromium.org',
2924 'created_ts': '147200001111000',
2925 'experimental': False,
2926 'failure_reason': 'BUILD_FAILURE',
2927 'parameters_json': json.dumps({
2928 'builder_name': 'my-bot',
2929 'properties': {'category': 'cq'},
2930 }),
2931 'result_details_json': json.dumps({
2932 'properties': {'buildnumber': 1},
2933 }),
2934 'result': 'FAILURE',
2935 'status': 'COMPLETED',
2936 'tags': [
2937 'build_address:x.y/my-bot/1',
2938 'builder:my-bot',
2939 'experimental:false',
2940 'user_agent:cq',
2941 ],
2942 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2943 },
2944 }
tandrii221ab252016-10-06 08:12:04 -07002945
2946 def test_write_try_results_json(self):
2947 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002948 {
2949 'bucket': 'master.x.y',
2950 'buildbucket_id': '8000',
2951 'builder_name': 'my-bot',
2952 'created_ts': '147200001111000',
2953 'experimental': False,
2954 'failure_reason': 'BUILD_FAILURE',
2955 'result': 'FAILURE',
2956 'status': 'COMPLETED',
2957 'tags': [
2958 'build_address:x.y/my-bot/1',
2959 'builder:my-bot',
2960 'experimental:false',
2961 'user_agent:cq',
2962 ],
2963 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2964 },
2965 {
2966 'bucket': 'master.x.y',
2967 'buildbucket_id': '9000',
2968 'builder_name': 'my-bot',
2969 'created_ts': '147200002222000',
2970 'experimental': False,
2971 'failure_reason': None,
2972 'result': None,
2973 'status': 'STARTED',
2974 'tags': [
2975 'build_address:x.y/my-bot/2',
2976 'builder:my-bot',
2977 'experimental:false',
2978 'user_agent:cq',
2979 ],
2980 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2981 },
tandrii221ab252016-10-06 08:12:04 -07002982 ]
2983 self.calls = [(('write_json', 'output.json', expected_output), '')]
2984 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2985
tandrii45b2a582016-10-11 03:14:16 -07002986 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002987 out = StringIO.StringIO()
2988 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002989 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2990 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002991 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2992 self._mocked_call(['get_authenticator_for_host', host]))
2993 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2994 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002995
2996 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2997 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002998 self.calls += [
2999 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3000 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3001 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3002 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3003 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3004 ((['git', 'config', 'branch.feature.rietveldserver'],),
3005 'codereview.example.com'),
3006 ((['get_authenticator_for_host', 'codereview.example.com'],),
3007 AuthenticatorMock()),
3008 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3009
3010 def test_fetch_try_jobs_none_rietveld(self):
3011 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003012 # Simulate that user isn't logged in.
3013 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003014 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003015 self.assertRegexpMatches(sys.stdout.getvalue(),
3016 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003017 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3018
3019 def test_fetch_try_jobs_some_rietveld(self):
3020 self._setup_fetch_try_jobs_rietveld({
3021 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3022 })
3023 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003024 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3025 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3026 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3027
3028 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3029 self._setup_fetch_try_jobs(most_recent_patchset=13)
3030 self.calls += [
3031 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3032 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3033 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003034 # TODO(tandrii): Uncomment the below if we decide to support checking
3035 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003036 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003037 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003038 ((['git', 'config', 'branch.feature.gerritserver'],),
3039 'https://x-review.googlesource.com'),
3040 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3041 AuthenticatorMock()),
3042 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3043
3044 def test_fetch_try_jobs_none_gerrit(self):
3045 self._setup_fetch_try_jobs_gerrit({})
3046 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003047 # TODO(tandrii): Uncomment the below if we decide to support checking
3048 # patchsets for Gerrit.
3049 # self.assertRegexpMatches(
3050 # sys.stdout.getvalue(),
3051 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003052 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3053
3054 def test_fetch_try_jobs_some_gerrit(self):
3055 self._setup_fetch_try_jobs_gerrit({
3056 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3057 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003058 # TODO(tandrii): Uncomment the below if we decide to support checking
3059 # patchsets for Gerrit.
3060 # self.calls.remove(
3061 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003062 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3063
3064 # ... and doesn't result in warning.
3065 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3066 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003067 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3068 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3069
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003070 def _mock_gerrit_changes_for_detail_cache(self):
3071 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003072
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003073 def test_gerrit_change_detail_cache_simple(self):
3074 self._mock_gerrit_changes_for_detail_cache()
3075 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003076 (('GetChangeDetail', 'host', 'my%2Frepo~1', []), 'a'),
3077 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b'),
3078 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003079 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003080 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003081 cl1._cached_remote_url = (
3082 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003083 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003084 cl2._cached_remote_url = (
3085 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003086 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
3087 self.assertEqual(cl1._GetChangeDetail(), 'a')
3088 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
3089 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
3090 self.assertEqual(cl1._GetChangeDetail(), 'a')
3091 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003092
3093 def test_gerrit_change_detail_cache_options(self):
3094 self._mock_gerrit_changes_for_detail_cache()
3095 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003096 (('GetChangeDetail', 'host', 'repo~1', ['C', 'A', 'B']), 'cab'),
3097 (('GetChangeDetail', 'host', 'repo~1', ['A', 'D']), 'ad'),
3098 (('GetChangeDetail', 'host', 'repo~1', ['A']), 'a'), # no_cache=True
3099 # no longer in cache.
3100 (('GetChangeDetail', 'host', 'repo~1', ['B']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003101 ]
3102 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003103 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003104 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3105 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3106 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3107 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3108 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3109 self.assertEqual(cl._GetChangeDetail(), 'cab')
3110
3111 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3112 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3113 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3114 self.assertEqual(cl._GetChangeDetail(), 'cab')
3115
3116 # Finally, no_cache should invalidate all caches for given change.
3117 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3118 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3119
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003120 def test_gerrit_description_caching(self):
3121 def gen_detail(rev, desc):
3122 return {
3123 'current_revision': rev,
3124 'revisions': {rev: {'commit': {'message': desc}}}
3125 }
3126 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003127 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003128 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3129 gen_detail('rev1', 'desc1')),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003130 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003131 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3132 gen_detail('rev2', 'desc2')),
3133 ]
3134
3135 self._mock_gerrit_changes_for_detail_cache()
3136 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003137 cl._cached_remote_url = (
3138 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003139 self.assertEqual(cl.GetDescription(), 'desc1')
3140 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3141 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003142
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003143 def test_print_current_creds(self):
3144 class CookiesAuthenticatorMock(object):
3145 def __init__(self):
3146 self.gitcookies = {
3147 'host.googlesource.com': ('user', 'pass'),
3148 'host-review.googlesource.com': ('user', 'pass'),
3149 }
3150 self.netrc = self
3151 self.netrc.hosts = {
3152 'github.com': ('user2', None, 'pass2'),
3153 'host2.googlesource.com': ('user3', None, 'pass'),
3154 }
3155 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3156 CookiesAuthenticatorMock)
3157 self.mock(sys, 'stdout', StringIO.StringIO())
3158 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3159 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3160 ' Host\t User\t Which file',
3161 '============================\t=====\t===========',
3162 'host-review.googlesource.com\t user\t.gitcookies',
3163 ' host.googlesource.com\t user\t.gitcookies',
3164 ' host2.googlesource.com\tuser3\t .netrc',
3165 ])
3166 sys.stdout.buf = ''
3167 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3168 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3169 ' Host\tUser\t Which file',
3170 '============================\t====\t===========',
3171 'host-review.googlesource.com\tuser\t.gitcookies',
3172 ' host.googlesource.com\tuser\t.gitcookies',
3173 ])
3174
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003175 def _common_creds_check_mocks(self):
3176 def exists_mock(path):
3177 dirname = os.path.dirname(path)
3178 if dirname == os.path.expanduser('~'):
3179 dirname = '~'
3180 base = os.path.basename(path)
3181 if base in ('.netrc', '.gitcookies'):
3182 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3183 # git cl also checks for existence other files not relevant to this test.
3184 return None
3185 self.mock(os.path, 'exists', exists_mock)
3186 self.mock(sys, 'stdout', StringIO.StringIO())
3187
3188 def test_creds_check_gitcookies_not_configured(self):
3189 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003190 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003191 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003192 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003193 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003194 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3195 (('os.path.exists', '~/.netrc'), True),
3196 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3197 'or Ctrl+C to abort'), ''),
3198 ((['git', 'config', '--global', 'http.cookiefile',
3199 os.path.expanduser('~/.gitcookies')], ), ''),
3200 ]
3201 self.assertEqual(0, git_cl.main(['creds-check']))
3202 self.assertRegexpMatches(
3203 sys.stdout.getvalue(),
3204 '^You seem to be using outdated .netrc for git credentials:')
3205 self.assertRegexpMatches(
3206 sys.stdout.getvalue(),
3207 '\nConfigured git to use .gitcookies from')
3208
3209 def test_creds_check_gitcookies_configured_custom_broken(self):
3210 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003211 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003212 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003213 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003214 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003215 ((['git', 'config', '--global', 'http.cookiefile'],),
3216 '/custom/.gitcookies'),
3217 (('os.path.exists', '/custom/.gitcookies'), False),
3218 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3219 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3220 ((['git', 'config', '--global', 'http.cookiefile',
3221 os.path.expanduser('~/.gitcookies')], ), ''),
3222 ]
3223 self.assertEqual(0, git_cl.main(['creds-check']))
3224 self.assertRegexpMatches(
3225 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003226 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003227 self.assertRegexpMatches(
3228 sys.stdout.getvalue(),
3229 'However, your configured .gitcookies file is missing.')
3230
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003231 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003232 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003233 lambda _, message, publish: self._mocked_call(
3234 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003235 self.calls = [
3236 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3237 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003238 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003239 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003240 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3241 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003242
3243 def test_git_cl_comment_add_gerrit(self):
3244 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003245 lambda host, change, msg, ready:
3246 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003247 self.calls = [
3248 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3249 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3250 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3251 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3252 'origin/master'),
3253 ((['git', 'config', 'remote.origin.url'],),
3254 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003255 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
3256 'msg', None),
Aaron Gable636b13f2017-07-14 10:42:48 -07003257 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003258 ]
3259 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3260 '-a', 'msg']))
3261
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003262 def test_git_cl_comments_fetch_rietveld(self):
3263 self.mock(sys, 'stdout', StringIO.StringIO())
3264 self.calls = [
3265 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3266 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Leszek Swirski45b20c42018-09-17 17:05:26 +00003267 ] * 2 + [
3268 (('write_json', 'output.json', [
3269 {
3270 'date': '2000-03-13 20:49:34.515270',
3271 'message': 'PTAL',
3272 'approval': False,
3273 'disapproval': False,
3274 'sender': 'owner@example.com'
3275 }, {
3276 'date': '2017-03-13 20:49:34.515270',
3277 'message': 'lgtm',
3278 'approval': True,
3279 'disapproval': False,
3280 'sender': 'r@example.com'
3281 }, {
3282 'date': '2017-03-13 21:50:34.515270',
3283 'message': 'not lgtm',
3284 'approval': False,
3285 'disapproval': True,
3286 'sender': 'r2@example.com'
3287 }
3288 ]),'')
3289 ]
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003290 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3291 'messages': [
3292 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3293 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3294 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3295 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3296 # Intentionally wrong order here.
3297 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3298 'disapproval': False, 'approval': False,
3299 'sender': 'owner@example.com'},
3300 ],
3301 'owner_email': 'owner@example.com',
3302 })
3303 expected_comments_summary = [
3304 git_cl._CommentSummary(
3305 message='lgtm',
3306 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3307 disapproval=False, approval=True, sender='r@example.com'),
3308 git_cl._CommentSummary(
3309 message='not lgtm',
3310 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3311 disapproval=True, approval=False, sender='r2@example.com'),
3312 # Note: same order as in whatever Rietveld returns.
3313 git_cl._CommentSummary(
3314 message='PTAL',
3315 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3316 disapproval=False, approval=False, sender='owner@example.com'),
3317 ]
3318 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3319 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00003320 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3321 '-j', 'output.json']))
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003322
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003323 def test_git_cl_comments_fetch_gerrit(self):
3324 self.mock(sys, 'stdout', StringIO.StringIO())
3325 self.calls = [
3326 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3327 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3328 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3329 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3330 'origin/master'),
3331 ((['git', 'config', 'remote.origin.url'],),
3332 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003333 (('GetChangeDetail', 'chromium-review.googlesource.com',
3334 'infra%2Finfra~1',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003335 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003336 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003337 'messages': [
3338 {
3339 u'_revision_number': 1,
3340 u'author': {
3341 u'_account_id': 1111084,
3342 u'email': u'commit-bot@chromium.org',
3343 u'name': u'Commit Bot'
3344 },
3345 u'date': u'2017-03-15 20:08:45.000000000',
3346 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003347 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003348 u'tag': u'autogenerated:cq:dry-run'
3349 },
3350 {
3351 u'_revision_number': 2,
3352 u'author': {
3353 u'_account_id': 11151243,
3354 u'email': u'owner@example.com',
3355 u'name': u'owner'
3356 },
3357 u'date': u'2017-03-16 20:00:41.000000000',
3358 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3359 u'message': u'PTAL',
3360 },
3361 {
3362 u'_revision_number': 2,
3363 u'author': {
3364 u'_account_id': 148512 ,
3365 u'email': u'reviewer@example.com',
3366 u'name': u'reviewer'
3367 },
3368 u'date': u'2017-03-17 05:19:37.500000000',
3369 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3370 u'message': u'Patch Set 2: Code-Review+1',
3371 },
3372 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003373 }),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003374 (('GetChangeComments', 'chromium-review.googlesource.com',
3375 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003376 '/COMMIT_MSG': [
3377 {
3378 'author': {'email': u'reviewer@example.com'},
3379 'updated': u'2017-03-17 05:19:37.500000000',
3380 'patch_set': 2,
3381 'side': 'REVISION',
3382 'message': 'Please include a bug link',
3383 },
3384 ],
3385 'codereview.settings': [
3386 {
3387 'author': {'email': u'owner@example.com'},
3388 'updated': u'2017-03-16 20:00:41.000000000',
3389 'patch_set': 2,
3390 'side': 'PARENT',
3391 'line': 42,
3392 'message': 'I removed this because it is bad',
3393 },
3394 ]
Leszek Swirski45b20c42018-09-17 17:05:26 +00003395 })
3396 ] * 2 + [
3397 (('write_json', 'output.json', [
3398 {
3399 u'date': u'2017-03-16 20:00:41.000000',
3400 u'message': (
3401 u'PTAL\n' +
3402 u'\n' +
3403 u'codereview.settings\n' +
3404 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3405 u'c/1/2/codereview.settings#b42\n' +
3406 u' I removed this because it is bad\n'),
3407 u'approval': False,
3408 u'disapproval': False,
3409 u'sender': u'owner@example.com'
3410 }, {
3411 u'date': u'2017-03-17 05:19:37.500000',
3412 u'message': (
3413 u'Patch Set 2: Code-Review+1\n' +
3414 u'\n' +
3415 u'/COMMIT_MSG\n' +
3416 u' PS2, File comment: https://chromium-review.googlesource' +
3417 u'.com/c/1/2//COMMIT_MSG#\n' +
3418 u' Please include a bug link\n'),
3419 u'approval': False,
3420 u'disapproval': False,
3421 u'sender': u'reviewer@example.com'
3422 }
3423 ]),'')
3424 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003425 expected_comments_summary = [
3426 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003427 message=(
3428 u'PTAL\n' +
3429 u'\n' +
3430 u'codereview.settings\n' +
3431 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3432 u'c/1/2/codereview.settings#b42\n' +
3433 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003434 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3435 disapproval=False, approval=False, sender=u'owner@example.com'),
3436 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003437 message=(
3438 u'Patch Set 2: Code-Review+1\n' +
3439 u'\n' +
3440 u'/COMMIT_MSG\n' +
3441 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3442 u'c/1/2//COMMIT_MSG#\n' +
3443 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003444 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3445 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3446 ]
3447 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3448 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00003449 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3450 '-j', 'output.json']))
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003451
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003452 def test_get_remote_url_with_mirror(self):
3453 original_os_path_isdir = os.path.isdir
3454 def selective_os_path_isdir_mock(path):
3455 if path == '/cache/this-dir-exists':
3456 return self._mocked_call('os.path.isdir', path)
3457 return original_os_path_isdir(path)
3458 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
3459
3460 url = 'https://chromium.googlesource.com/my/repo'
3461 self.calls = [
3462 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3463 ((['git', 'config', 'branch.master.merge'],), 'master'),
3464 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3465 ((['git', 'config', 'remote.origin.url'],),
3466 '/cache/this-dir-exists'),
3467 (('os.path.isdir', '/cache/this-dir-exists'),
3468 True),
3469 # Runs in /cache/this-dir-exists.
3470 ((['git', 'config', 'remote.origin.url'],),
3471 url),
3472 ]
3473 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3474 self.assertEqual(cl.GetRemoteUrl(), url)
3475 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
3476
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003477 def test_gerrit_change_identifier_with_project(self):
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003478 self.calls = [
3479 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3480 ((['git', 'config', 'branch.master.merge'],), 'master'),
3481 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3482 ((['git', 'config', 'remote.origin.url'],),
3483 'https://chromium.googlesource.com/a/my/repo.git/'),
3484 ]
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003485 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3486 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
3487
3488 def test_gerrit_change_identifier_without_project(self):
3489 self.calls = [
3490 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3491 ((['git', 'config', 'branch.master.merge'],), 'master'),
3492 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3493 ((['git', 'config', 'remote.origin.url'],), CERR1),
3494 ]
3495 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3496 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003497
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003498
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003499if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003500 logging.basicConfig(
3501 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003502 unittest.main()