blob: 1e4b03c20d62a5799f3ee17a575413f7886a869c [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
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000442
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200443class TestParseIssueURL(unittest.TestCase):
444 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
445 codereview=None, fail=False):
446 self.assertIsNotNone(parsed)
447 if fail:
448 self.assertFalse(parsed.valid)
449 return
450 self.assertTrue(parsed.valid)
451 self.assertEqual(parsed.issue, issue)
452 self.assertEqual(parsed.patchset, patchset)
453 self.assertEqual(parsed.hostname, hostname)
454 self.assertEqual(parsed.codereview, codereview)
455
456 def _run_and_validate(self, func, url, *args, **kwargs):
457 result = func(urlparse.urlparse(url))
458 if kwargs.pop('fail', False):
459 self.assertIsNone(result)
460 return None
461 self._validate(result, *args, fail=False, **kwargs)
462
463 def test_rietveld(self):
464 def test(url, *args, **kwargs):
465 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
466 *args, codereview='rietveld', **kwargs)
467
468 test('http://codereview.chromium.org/123',
469 123, None, 'codereview.chromium.org')
470 test('https://codereview.chromium.org/123',
471 123, None, 'codereview.chromium.org')
472 test('https://codereview.chromium.org/123/',
473 123, None, 'codereview.chromium.org')
474 test('https://codereview.chromium.org/123/whatever',
475 123, None, 'codereview.chromium.org')
476 test('https://codereview.chromium.org/123/#ps20001',
477 123, 20001, 'codereview.chromium.org')
478 test('http://codereview.chromium.org/download/issue123_4.diff',
479 123, 4, 'codereview.chromium.org')
480 # This looks like bad Gerrit, but is actually valid Rietveld, too.
481 test('https://chrome-review.source.com/123/4/',
482 123, None, 'chrome-review.source.com')
483
484 test('https://codereview.chromium.org/deadbeaf', fail=True)
485 test('https://codereview.chromium.org/api/123', fail=True)
486 test('bad://codereview.chromium.org/123', fail=True)
487 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
488
489 def test_gerrit(self):
490 def test(url, issue=None, patchset=None, hostname=None, fail=None):
491 self._test_ParseIssueUrl(
492 git_cl._GerritChangelistImpl.ParseIssueURL,
493 url, issue, patchset, hostname, fail)
494 def test(url, *args, **kwargs):
495 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
496 *args, codereview='gerrit', **kwargs)
497
498 test('http://chrome-review.source.com/c/123',
499 123, None, 'chrome-review.source.com')
500 test('https://chrome-review.source.com/c/123/',
501 123, None, 'chrome-review.source.com')
502 test('https://chrome-review.source.com/c/123/4',
503 123, 4, 'chrome-review.source.com')
504 test('https://chrome-review.source.com/#/c/123/4',
505 123, 4, 'chrome-review.source.com')
506 test('https://chrome-review.source.com/c/123/4',
507 123, 4, 'chrome-review.source.com')
508 test('https://chrome-review.source.com/123',
509 123, None, 'chrome-review.source.com')
510 test('https://chrome-review.source.com/123/4',
511 123, 4, 'chrome-review.source.com')
512
513 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
514 test('https://chrome-review.source.com/c/abc/', fail=True)
515 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
516
517 def test_ParseIssueNumberArgument(self):
518 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200519 codereview_hint = kwargs.pop('hint', None)
520 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
521 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200522
523 test('123', 123)
524 test('', fail=True)
525 test('abc', fail=True)
526 test('123/1', fail=True)
527 test('123a', fail=True)
528 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
529 # Rietveld.
530 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200531 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200532 test('https://codereview.source.com/123',
533 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200534 # Matches both, but we take Gerrit if specifically requested.
535 test('https://codereview.source.com/123',
536 123, None, 'codereview.source.com', 'gerrit',
537 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200538 # Gerrrit.
539 test('https://chrome-review.source.com/c/123/4',
540 123, 4, 'chrome-review.source.com', 'gerrit')
541 test('https://chrome-review.source.com/bad/123/4', fail=True)
542
543
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100544class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100545 def setUp(self):
546 super(GitCookiesCheckerTest, self).setUp()
547 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100548 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100549
550 def mock_hosts_creds(self, subhost_identity_pairs):
551 def ensure_googlesource(h):
552 if not h.endswith(self.c._GOOGLESOURCE):
553 assert not h.endswith('.')
554 return h + '.' + self.c._GOOGLESOURCE
555 return h
556 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
557 for h, i in subhost_identity_pairs]
558
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200559 def test_identity_parsing(self):
560 self.assertEqual(self.c._parse_identity('ldap.google.com'),
561 ('ldap', 'google.com'))
562 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
563 ('ldap', 'example.com'))
564 # Specical case because we know there are no subdomains in chromium.org.
565 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
566 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800567 # Pathological: ".period." can be either username OR domain, more likely
568 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200569 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
570 ('note', 'period.example.com'))
571
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100572 def test_analysis_nothing(self):
573 self.c._all_hosts = []
574 self.assertFalse(self.c.has_generic_host())
575 self.assertEqual(set(), self.c.get_conflicting_hosts())
576 self.assertEqual(set(), self.c.get_duplicated_hosts())
577 self.assertEqual(set(), self.c.get_partially_configured_hosts())
578 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
579
580 def test_analysis(self):
581 self.mock_hosts_creds([
582 ('.googlesource.com', 'git-example.chromium.org'),
583
584 ('chromium', 'git-example.google.com'),
585 ('chromium-review', 'git-example.google.com'),
586 ('chrome-internal', 'git-example.chromium.org'),
587 ('chrome-internal-review', 'git-example.chromium.org'),
588 ('conflict', 'git-example.google.com'),
589 ('conflict-review', 'git-example.chromium.org'),
590 ('dup', 'git-example.google.com'),
591 ('dup', 'git-example.google.com'),
592 ('dup-review', 'git-example.google.com'),
593 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200594 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100595 ])
596 self.assertTrue(self.c.has_generic_host())
597 self.assertEqual(set(['conflict.googlesource.com']),
598 self.c.get_conflicting_hosts())
599 self.assertEqual(set(['dup.googlesource.com']),
600 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200601 self.assertEqual(set(['partial.googlesource.com',
602 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100603 self.c.get_partially_configured_hosts())
604 self.assertEqual(set(['chromium.googlesource.com',
605 'chrome-internal.googlesource.com']),
606 self.c.get_hosts_with_wrong_identities())
607
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100608 def test_report_no_problems(self):
609 self.test_analysis_nothing()
610 self.mock(sys, 'stdout', StringIO.StringIO())
611 self.assertFalse(self.c.find_and_report_problems())
612 self.assertEqual(sys.stdout.getvalue(), '')
613
614 def test_report(self):
615 self.test_analysis()
616 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200617 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
618 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100619 self.assertTrue(self.c.find_and_report_problems())
620 with open(os.path.join(os.path.dirname(__file__),
621 'git_cl_creds_check_report.txt')) as f:
622 expected = f.read()
623 def by_line(text):
624 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700625 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200626 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100627
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800628
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000629class TestGitCl(TestCase):
630 def setUp(self):
631 super(TestGitCl, self).setUp()
632 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700633 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000634 self.mock(subprocess2, 'call', self._mocked_call)
635 self.mock(subprocess2, 'check_call', self._mocked_call)
636 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700637 self.mock(subprocess2, 'communicate',
638 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000639 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000640 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000641 self.mock(git_common, 'get_or_create_merge_base',
642 lambda *a: (
643 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000644 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000645 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100646 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
647 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700648 self.mock(git_cl, 'write_json', lambda path, contents:
649 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000650 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000652 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700653 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
654 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000655 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000656 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000657 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100658 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
659 lambda *args, **kwargs: self._mocked_call(
660 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700661 self.mock(git_cl.gerrit_util, 'GetChangeComments',
662 lambda *args, **kwargs: self._mocked_call(
663 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100664 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700665 lambda h, i, reviewers, ccs, notify: self._mocked_call(
666 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700667 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700668 lambda h, i, msg=None, labels=None, notify=None:
669 self._mocked_call('SetReview', h, i, msg, labels, notify))
Andrii Shyshkalov733d4ec2018-04-19 11:48:58 -0700670 self.mock(git_cl.gerrit_util.LuciContextAuthenticator, 'is_luci',
671 staticmethod(lambda: False))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000672 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
673 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700674 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100675 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000676 # It's important to reset settings to not have inter-tests interference.
677 git_cl.settings = None
678
679 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000680 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100681 self.assertEquals([], self.calls)
682 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000683 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100684 raise
685 # Sadly, has_failed() returns True if this OR any other tests before this
686 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200687 git_cl.logging.error(
688 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100689 'There are un-consumed self.calls after this test has finished.\n'
690 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700691 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200692 'If you are already running only this test, then **first** fix the '
693 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100694 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700695 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100696 'and follow instructions above.\n' +
697 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000698 finally:
699 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000700
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000701 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000702 self.assertTrue(
703 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700704 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000705 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000706 expected_args, result = top
707
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000708 # Also logs otherwise it could get caught in a try/finally and be hard to
709 # diagnose.
710 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700711 N = 5
712 prior_calls = '\n '.join(
713 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
714 for i, c in enumerate(self._calls_done[-N:]))
715 following_calls = '\n '.join(
716 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
717 for i, c in enumerate(self.calls[:N]))
718 extended_msg = (
719 'A few prior calls:\n %s\n\n'
720 'This (expected):\n @%d: %r\n'
721 'This (actual):\n @%d: %r\n\n'
722 'A few following expected calls:\n %s' %
723 (prior_calls, len(self._calls_done), expected_args,
724 len(self._calls_done), args, following_calls))
725 git_cl.logging.error(extended_msg)
726
tandrii99a72f22016-08-17 14:33:24 -0700727 self.fail('@%d\n'
728 ' Expected: %r\n'
729 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700730 len(self._calls_done), expected_args, args))
731
732 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700733 if isinstance(result, Exception):
734 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000735 return result
736
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100737 def test_ask_for_explicit_yes_true(self):
738 self.calls = [
739 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
740 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
741 ]
742 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
743
tandrii48df5812016-10-17 03:55:37 -0700744 def test_LoadCodereviewSettingsFromFile_gerrit(self):
745 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
746 self.calls = [
747 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
748 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
750 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
751 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
752 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700753 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
754 CERR1),
755 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700756 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
757 CERR1),
758 ((['git', 'config', 'gerrit.host', 'true'],), ''),
759 ]
760 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
761
maruel@chromium.orga3353652011-11-30 14:26:57 +0000762 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000763 def _is_gerrit_calls(cls, gerrit=False):
764 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
765 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
766
767 @classmethod
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000768 def _upload_calls(cls, private, no_autocc):
Aaron Gable13101a62018-02-09 13:20:41 -0800769 return (cls._rietveld_git_base_calls() +
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000770 cls._git_upload_calls(private, no_autocc))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000771
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000772 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800773 def _rietveld_upload_no_rev_calls(cls):
774 return (cls._rietveld_git_base_calls() + [
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200775 ((['git', 'config', 'core.editor'],), ''),
776 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000777
778 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800779 def _rietveld_git_base_calls(cls):
780 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
781 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000782
Aaron Gable13101a62018-02-09 13:20:41 -0800783 return cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000784 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700785 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
786 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000787 ((['git', 'config', 'rietveld.server'],),
788 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000789 ((['git', 'config', 'branch.master.merge'],), 'master'),
790 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000791 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000792 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000793 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git', 'rev-parse', '--show-cdup'],), ''),
795 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Aaron Gable7817f022017-12-12 09:43:17 -0800796 ((['git', '-c', 'core.quotePath=false', 'diff',
797 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000798 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700799 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000800 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000801 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000802 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000803 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000804 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000805 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000806 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000807 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700808 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000809 ]
810
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000811 @classmethod
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000812 def _git_upload_calls(cls, private, no_autocc):
813 if private or no_autocc:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000814 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000815 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000816 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000817
818 if private:
819 private_call = []
820 else:
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000821 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000823
maruel@chromium.orga3353652011-11-30 14:26:57 +0000824 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000825 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000826 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800828 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000829 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700830 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000831 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000832 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000833 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700834 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000835 ] + cls._git_post_upload_calls()
836
837 @classmethod
838 def _git_post_upload_calls(cls):
839 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000840 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
841 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
842 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000843 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000844 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000845 ]
846
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000847 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000848 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000849 fake_ancestor = 'fake_ancestor'
850 fake_cl = 'fake_cl_for_patch'
851 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000852 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000853 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000854 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000855 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000856 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000857 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000858 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000859 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700860 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000861 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000862 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000863 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000864 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000865 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000866 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000867 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000868 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000869 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000870 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000871 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000872
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000873 @staticmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800874 def _cmd_line(description, args, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000875 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000876 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800877 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000878 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000879 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800880 '--cc',
881 ','.join(
882 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
883 cc),
Aaron Gable13101a62018-02-09 13:20:41 -0800884 ] + (['--private'] if private else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000885
886 def _run_reviewer_test(
887 self,
888 upload_args,
889 expected_description,
890 returned_description,
891 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000892 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700893 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000894 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000895 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org79540052012-10-19 23:15:26 +0000896
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000897 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700898 cc = cc or []
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000899 no_autocc = '--no-autocc' in upload_args
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000900
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000901 self.calls = self._upload_calls(private, no_autocc)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000902
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000903 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000904 self.assertEquals(
905 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000906 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000907 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000908 '#--------------------This line is 72 characters long'
909 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000910 expected_description,
911 desc)
912 return returned_description
913 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000914
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000915 def check_upload(args):
Aaron Gable13101a62018-02-09 13:20:41 -0800916 cmd_line = self._cmd_line(final_description, reviewers, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000917 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000918 return 1, 2
919 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000920
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000921 git_cl.main(['upload'] + upload_args)
922
923 def test_no_reviewer(self):
924 self._run_reviewer_test(
925 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000926 'desc\n\nBUG=',
927 '# Blah blah comment.\ndesc\n\nBUG=',
928 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000929 [])
930
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000931 def test_private(self):
932 self._run_reviewer_test(
933 ['--private'],
934 'desc\n\nBUG=',
935 '# Blah blah comment.\ndesc\n\nBUG=\n',
936 'desc\n\nBUG=',
937 [])
938
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +0000939 def test_no_autocc(self):
940 self._run_reviewer_test(
941 ['--no-autocc'],
942 'desc\n\nBUG=',
943 '# Blah blah comment.\ndesc\n\nBUG=\n',
944 'desc\n\nBUG=',
945 [])
946
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 def test_reviewers_cmd_line(self):
948 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000949 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950 self._run_reviewer_test(
951 ['-r' 'foo@example.com'],
952 description,
953 '\n%s\n' % description,
954 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000955 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956
957 def test_reviewer_tbr_overriden(self):
958 # Reviewer is overriden with TBR
959 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000960 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000961 self._run_reviewer_test(
962 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000963 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000964 description.strip('\n'),
965 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000966 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000967
968 def test_reviewer_multiple(self):
969 # Handles multiple R= or TBR= lines.
970 description = (
bradnelsond975b302016-10-23 12:20:23 -0700971 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
972 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000973 self._run_reviewer_test(
974 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000975 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000976 description,
977 description,
bradnelsond975b302016-10-23 12:20:23 -0700978 ['--reviewers=another@example.com,reviewer@example.com'],
979 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000980
maruel@chromium.orga3353652011-11-30 14:26:57 +0000981 def test_reviewer_send_mail(self):
982 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000983 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000984 self._run_reviewer_test(
985 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000986 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000987 description.strip('\n'),
988 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000989 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000990
991 def test_reviewer_send_mail_no_rev(self):
992 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000993 stdout = StringIO.StringIO()
Aaron Gable13101a62018-02-09 13:20:41 -0800994 self.calls = self._rietveld_upload_no_rev_calls() + [
tandriic2405f52016-10-10 08:13:15 -0700995 ((['DieWithError', 'Must specify reviewers to send email.'],),
996 SystemExitMock())
997 ]
998
999 def RunEditor(desc, _, **kwargs):
1000 return desc
1001 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1002 self.mock(sys, 'stdout', stdout)
1003 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001004 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001005 self.assertEqual(
1006 '=====================================\n'
1007 'NOTICE: Rietveld is being deprecated. '
1008 'You can upload changes to Gerrit with\n'
1009 ' git cl upload --gerrit\n'
1010 'or set Gerrit to be your default code review tool with\n'
1011 ' git config gerrit.host true\n'
1012 '=====================================\n',
1013 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001014
tandriif9aefb72016-07-01 09:06:51 -07001015 def test_bug_on_cmd(self):
1016 self._run_reviewer_test(
1017 ['--bug=500658,proj:123'],
1018 'desc\n\nBUG=500658\nBUG=proj:123',
1019 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1020 'desc\n\nBUG=500658\nBUG=proj:1234',
1021 [])
1022
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001023 def test_git_numberer_not_whitelisted_repo(self):
1024 self.calls = []
1025 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001026 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1027 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001028 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001029
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001030 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001031 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1032 self.calls = [
1033 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001034 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001035 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001036 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001037 remote_url='https://chromium.googlesource.com/chromium/src',
1038 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001039 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001040
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001041 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001042 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001043 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001044 def fake_temporary_directory(**kwargs):
1045 yield tempdir
1046 self.mock(git_cl.gclient_utils, 'temporary_directory',
1047 fake_temporary_directory)
1048 self._test_GitNumbererState_valid_configs_inner(tempdir)
1049
1050 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001051 self.calls = [
1052 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001053 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001054 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1055 '''
1056 [plugin "git-numberer"]
1057 validate-enabled-refglob = refs/else/*
1058 validate-enabled-refglob = refs/heads/*
1059 validate-disabled-refglob = refs/heads/disabled
1060 validate-disabled-refglob = refs/branch-heads/*
1061 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001062 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1063 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001064 'refs/else/*\n'
1065 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001066 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1067 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001068 'refs/heads/disabled\n'
1069 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001070 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001071
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001072 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001073 remote_url='https://chromium.googlesource.com/chromium/src',
1074 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001075 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001076
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001077 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001078 remote_url='https://chromium.googlesource.com/chromium/src',
1079 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001080 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001081
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001082 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001083 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001084 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001085 remote_url='https://chromium.googlesource.com/chromium/src',
1086 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001087 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001088
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001089 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001090 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001091 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001092 if skip_auth_check:
1093 return [((cmd, ), 'true')]
1094
tandrii5d48c322016-08-18 16:19:37 -07001095 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001096 if issue:
1097 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001098 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001099 ])
1100 calls.extend([
1101 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1102 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1103 ((['git', 'config', 'remote.origin.url'],),
1104 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001105 ])
1106 return calls
1107
1108 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001109 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001110 fetched_status=None, other_cl_owner=None,
1111 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001112 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001113 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001114 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1115 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1116 ((['git', 'config', 'branch.master.gerritissue'],),
1117 CERR1 if issue is None else str(issue)),
1118 ]
1119
1120 if custom_cl_base:
1121 ancestor_revision = custom_cl_base
1122 else:
1123 # Determine ancestor_revision to be merge base.
1124 ancestor_revision = 'fake_ancestor_sha'
1125 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001126 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001127 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001128 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001129 'refs/remotes/origin/master'],), ancestor_revision),
1130 ]
1131
1132 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001133 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1134
1135 if issue:
1136 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001137 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001138 'my%2Frepo~123456',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001139 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001140 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001141 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001142 'change_id': '123456789',
1143 'current_revision': 'sha1_of_current_revision',
1144 'revisions': { 'sha1_of_current_revision': {
1145 'commit': {'message': fetched_description},
1146 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001147 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001148 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001149 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001150 if fetched_status == 'ABANDONED':
1151 calls += [
1152 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1153 '123456 has been abandoned, new uploads are not '
1154 'allowed'), SystemExitMock()),
1155 ]
1156 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001157 if other_cl_owner:
1158 calls += [
1159 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1160 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001161
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001162 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1163 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001164 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001165 ((['git', 'rev-parse', '--show-cdup'],), ''),
1166 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001167
Aaron Gable7817f022017-12-12 09:43:17 -08001168 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1169 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001170 'M\t.gitignore\n'),
1171 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001172 ]
1173
1174 if not issue:
1175 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001176 ((['git', 'log', '--pretty=format:%s%n%n%b',
1177 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001179 ]
1180
1181 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001182 ((['git', 'config', 'user.email'],), 'me@example.com'),
1183 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1184 ([custom_cl_base] if custom_cl_base else
1185 [ancestor_revision, 'HEAD']),),
1186 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001187 ]
1188 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001189
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001190 @classmethod
1191 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001192 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001193 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001194 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001195 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001196 custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001197 if post_amend_description is None:
1198 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001199 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001200 # Determined in `_gerrit_base_calls`.
1201 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1202
1203 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001204
tandriia60502f2016-06-20 02:01:53 -07001205 if squash_mode == 'default':
1206 calls.extend([
1207 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1208 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1209 ])
1210 elif squash_mode in ('override_squash', 'override_nosquash'):
1211 calls.extend([
1212 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1213 'true' if squash_mode == 'override_squash' else 'false'),
1214 ])
1215 else:
1216 assert squash_mode in ('squash', 'nosquash')
1217
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001218 # If issue is given, then description is fetched from Gerrit instead.
1219 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001220 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001221 ((['git', 'log', '--pretty=format:%s\n\n%b',
1222 ((custom_cl_base + '..') if custom_cl_base else
1223 'fake_ancestor_sha..HEAD')],),
1224 description),
1225 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001226 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001227 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001228 else:
1229 if not title:
1230 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001231 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1232 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001233 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001234 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001235 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001236 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001237 (('DownloadGerritHook', False), ''),
1238 # Amending of commit message to get the Change-Id.
1239 ((['git', 'log', '--pretty=format:%s\n\n%b',
1240 determined_ancestor_revision + '..HEAD'],),
1241 description),
1242 ((['git', 'commit', '--amend', '-m', description],), ''),
1243 ((['git', 'log', '--pretty=format:%s\n\n%b',
1244 determined_ancestor_revision + '..HEAD'],),
1245 post_amend_description)
1246 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001247 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001248 if not issue:
1249 # Prompting to edit description on first upload.
1250 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001251 ((['git', 'config', 'core.editor'],), ''),
1252 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001253 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001254 ref_to_push = 'abcdef0123456789'
1255 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001256 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1257 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1258 ]
1259
1260 if custom_cl_base is None:
1261 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001262 ((['get_or_create_merge_base', 'master',
1263 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001264 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001265 ]
1266 parent = 'origin/master'
1267 else:
1268 calls += [
1269 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1270 'refs/remotes/origin/master'],),
1271 callError(1)), # Means not ancenstor.
1272 (('ask_for_data',
1273 'Do you take responsibility for cleaning up potential mess '
1274 'resulting from proceeding with upload? Press Enter to upload, '
1275 'or Ctrl+C to abort'), ''),
1276 ]
1277 parent = custom_cl_base
1278
1279 calls += [
1280 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1281 '0123456789abcdef'),
1282 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001283 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001284 ref_to_push),
1285 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001286 else:
1287 ref_to_push = 'HEAD'
1288
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001289 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001290 ((['git', 'rev-list',
1291 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1292 ref_to_push],),
1293 '1hashPerLine\n'),
1294 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001295
Aaron Gableafd52772017-06-27 16:40:10 -07001296 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001297 ref_suffix = '%ready,notify=ALL'
1298 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001299 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001300 ref_suffix = '%wip'
1301 else:
1302 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001303
Aaron Gable70f4e242017-06-26 10:45:59 -07001304 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001305 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001306
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001307 calls.append((
1308 (['git', 'push',
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001309 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001310 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1311 ('remote:\n'
1312 'remote: Processing changes: (\)\n'
1313 'remote: Processing changes: (|)\n'
1314 'remote: Processing changes: (/)\n'
1315 'remote: Processing changes: (-)\n'
1316 'remote: Processing changes: new: 1 (/)\n'
1317 'remote: Processing changes: new: 1, done\n'
1318 'remote:\n'
1319 'remote: New Changes:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001320 'remote: https://chromium-review.googlesource.com/#/c/my/repo/+/123456'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001321 ' XXX\n'
1322 'remote:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001323 'To https://chromium.googlesource.com/my/repo\n'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001324 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')
1325 ))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001326 if squash:
1327 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001328 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001329 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001330 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001331 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001332 ((['git', 'config', 'branch.master.gerritsquashhash',
1333 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001334 ]
tandrii88189772016-09-29 04:29:57 -07001335 calls += [
1336 ((['git', 'config', 'rietveld.cc'],), ''),
tandrii88189772016-09-29 04:29:57 -07001337 ]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001338 if squash:
1339 calls += [
1340 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001341 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001342 sorted(reviewers),
1343 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1344 cc, notify), ''),
1345 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001346 if tbr:
1347 calls += [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001348 (('GetChangeDetail', 'chromium-review.googlesource.com',
1349 'my%2Frepo~123456', ['LABELS']), {
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001350 'labels': {
1351 'Code-Review': {
1352 'default_value': 0,
1353 'all': [],
1354 'values': {
1355 '+2': 'lgtm, approved',
1356 '+1': 'lgtm, but someone else must approve',
1357 ' 0': 'No score',
1358 '-1': 'Don\'t submit as-is',
1359 }
1360 }
1361 }
1362 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001363 (('SetReview',
1364 'chromium-review.googlesource.com',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001365 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001366 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001367 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001368 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001369 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001370 return calls
1371
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001372 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001373 self,
1374 upload_args,
1375 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001376 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001377 squash=True,
1378 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001379 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001380 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001381 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001382 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001383 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001384 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001385 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001386 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001387 custom_cl_base=None,
1388 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001389 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001390 if squash_mode is None:
1391 if '--no-squash' in upload_args:
1392 squash_mode = 'nosquash'
1393 elif '--squash' in upload_args:
1394 squash_mode = 'squash'
1395 else:
1396 squash_mode = 'default'
1397
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001398 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001399 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001400 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001401 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001402 CookiesAuthenticatorMockFactory(
1403 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001404 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1405 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001406 self.mock(git_cl.gclient_utils, 'RunEditor',
1407 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001408 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1409 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001410
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001411 self.calls = self._gerrit_base_calls(
1412 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001413 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001414 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001415 other_cl_owner=other_cl_owner,
1416 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001417 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001418 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1419 expected_content=description))
1420 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001421 self.calls += self._gerrit_upload_calls(
1422 description, reviewers, squash,
1423 squash_mode=squash_mode,
1424 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001425 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001426 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001427 issue=issue, cc=cc,
Aaron Gablefd238082017-06-07 13:42:34 -07001428 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001429 # Uncomment when debugging.
1430 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001431 git_cl.main(['upload'] + upload_args)
1432
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001433 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001434 self._run_gerrit_upload_test(
1435 ['--no-squash'],
1436 'desc\n\nBUG=\n',
1437 [],
1438 squash=False,
1439 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1440
1441 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001442 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001443 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001444 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001445 [],
tandriia60502f2016-06-20 02:01:53 -07001446 squash=False,
1447 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001448 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001449
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001450 def test_gerrit_no_reviewer(self):
1451 self._run_gerrit_upload_test(
1452 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001453 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001454 [],
1455 squash=False,
1456 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001457
Nick Carter8692b182017-11-06 16:30:38 -08001458 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001459 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1460 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001461 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001462 'desc\n\nBUG=\n\nChange-Id: I123456789',
1463 squash=False,
1464 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001465 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001466
ukai@chromium.orge8077812012-02-03 03:41:46 +00001467 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001468 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001469 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001470 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001471 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001472 squash=False,
1473 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001474 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001475
1476 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001477 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001478 [],
bradnelsond975b302016-10-23 12:20:23 -07001479 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1480 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001481 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001482 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001483 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001484 cc=['more@example.com', 'people@example.com'],
1485 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001486
1487 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001488 self._run_gerrit_upload_test(
1489 [],
1490 'desc\nBUG=\n\nChange-Id: 123456789',
1491 [],
1492 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001493
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001494 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001495 self._run_gerrit_upload_test(
1496 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001497 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001498 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001499 squash=True,
1500 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001501
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001502 def test_gerrit_upload_squash_first_against_rev(self):
1503 custom_cl_base = 'custom_cl_base_rev_or_branch'
1504 self._run_gerrit_upload_test(
1505 ['--squash', custom_cl_base],
1506 'desc\nBUG=\n\nChange-Id: 123456789',
1507 [],
1508 squash=True,
1509 expected_upstream_ref='origin/master',
1510 custom_cl_base=custom_cl_base)
1511 self.assertIn(
1512 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1513 sys.stdout.getvalue())
1514
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001515 def test_gerrit_upload_squash_reupload(self):
1516 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001517 self._run_gerrit_upload_test(
1518 ['--squash'],
1519 description,
1520 [],
1521 squash=True,
1522 expected_upstream_ref='origin/master',
1523 issue=123456)
1524
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001525 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1526 self.mock(git_cl, 'DieWithError',
1527 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1528 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1529 with self.assertRaises(SystemExitMock):
1530 self._run_gerrit_upload_test(
1531 ['--squash'],
1532 description,
1533 [],
1534 squash=True,
1535 expected_upstream_ref='origin/master',
1536 issue=123456,
1537 fetched_status='ABANDONED')
1538
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001539 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1540 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1541 lambda *_, **__: {'email': 'yet-another@example.com'})
1542 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1543 self._run_gerrit_upload_test(
1544 ['--squash'],
1545 description,
1546 [],
1547 squash=True,
1548 expected_upstream_ref='origin/master',
1549 issue=123456,
1550 other_cl_owner='other@example.com')
1551 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001552 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001553 'authenticate to Gerrit as yet-another@example.com.\n'
1554 'Uploading may fail due to lack of permissions',
1555 git_cl.sys.stdout.getvalue())
1556
rmistry@google.com2dd99862015-06-22 12:22:18 +00001557 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001558 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001559 def mock_run_git(*args, **_kwargs):
1560 if args[0] == ['for-each-ref',
1561 '--format=%(refname:short) %(upstream:short)',
1562 'refs/heads']:
1563 # Create a local branch dependency tree that looks like this:
1564 # test1 -> test2 -> test3 -> test4 -> test5
1565 # -> test3.1
1566 # test6 -> test0
1567 branch_deps = [
1568 'test2 test1', # test1 -> test2
1569 'test3 test2', # test2 -> test3
1570 'test3.1 test2', # test2 -> test3.1
1571 'test4 test3', # test3 -> test4
1572 'test5 test4', # test4 -> test5
1573 'test6 test0', # test0 -> test6
1574 'test7', # test7
1575 ]
1576 return '\n'.join(branch_deps)
1577 self.mock(git_cl, 'RunGit', mock_run_git)
1578
1579 class RecordCalls:
1580 times_called = 0
1581 record_calls = RecordCalls()
1582 def mock_CMDupload(*args, **_kwargs):
1583 record_calls.times_called += 1
1584 return 0
1585 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1586
1587 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001588 (('ask_for_data', 'This command will checkout all dependent branches '
1589 'and run "git cl upload". Press Enter to continue, '
1590 'or Ctrl+C to abort'), ''),
1591 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001592
1593 class MockChangelist():
1594 def __init__(self):
1595 pass
1596 def GetBranch(self):
1597 return 'test1'
1598 def GetIssue(self):
1599 return '123'
1600 def GetPatchset(self):
1601 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001602 def IsGerrit(self):
1603 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001604
1605 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1606 # CMDupload should have been called 5 times because of 5 dependent branches.
1607 self.assertEquals(5, record_calls.times_called)
1608 self.assertEquals(0, ret)
1609
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001610 def test_gerrit_change_id(self):
1611 self.calls = [
1612 ((['git', 'write-tree'], ),
1613 'hashtree'),
1614 ((['git', 'rev-parse', 'HEAD~0'], ),
1615 'branch-parent'),
1616 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1617 'A B <a@b.org> 1456848326 +0100'),
1618 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1619 'C D <c@d.org> 1456858326 +0100'),
1620 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1621 'hashchange'),
1622 ]
1623 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1624 self.assertEqual(change_id, 'Ihashchange')
1625
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001626 def test_desecription_append_footer(self):
1627 for init_desc, footer_line, expected_desc in [
1628 # Use unique desc first lines for easy test failure identification.
1629 ('foo', 'R=one', 'foo\n\nR=one'),
1630 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1631 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1632 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1633 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1634 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1635 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1636 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1637 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1638 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1639 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1640 ]:
1641 desc = git_cl.ChangeDescription(init_desc)
1642 desc.append_footer(footer_line)
1643 self.assertEqual(desc.description, expected_desc)
1644
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001645 def test_update_reviewers(self):
1646 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001647 ('foo', [], [],
1648 'foo'),
1649 ('foo\nR=xx', [], [],
1650 'foo\nR=xx'),
1651 ('foo\nTBR=xx', [], [],
1652 'foo\nTBR=xx'),
1653 ('foo', ['a@c'], [],
1654 'foo\n\nR=a@c'),
1655 ('foo\nR=xx', ['a@c'], [],
1656 'foo\n\nR=a@c, xx'),
1657 ('foo\nTBR=xx', ['a@c'], [],
1658 'foo\n\nR=a@c\nTBR=xx'),
1659 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1660 'foo\n\nR=a@c, yy\nTBR=xx'),
1661 ('foo\nBUG=', ['a@c'], [],
1662 'foo\nBUG=\nR=a@c'),
1663 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1664 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1665 ('foo', ['a@c', 'b@c'], [],
1666 'foo\n\nR=a@c, b@c'),
1667 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1668 'foo\nBar\n\nR=c@c\nBUG='),
1669 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1670 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001671 # Same as the line before, but full of whitespaces.
1672 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001673 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001674 'foo\nBar\n\nR=c@c\n BUG =',
1675 ),
1676 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001677 ('foo BUG=allo R=joe ', ['c@c'], [],
1678 'foo BUG=allo R=joe\n\nR=c@c'),
1679 # Redundant TBRs get promoted to Rs
1680 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1681 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001682 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001683 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001684 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001685 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001686 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001687 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001688 actual.append(obj.description)
1689 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001690
Nodir Turakulov23b82142017-11-16 11:04:25 -08001691 def test_get_hash_tags(self):
1692 cases = [
1693 ('', []),
1694 ('a', []),
1695 ('[a]', ['a']),
1696 ('[aa]', ['aa']),
1697 ('[a ]', ['a']),
1698 ('[a- ]', ['a']),
1699 ('[a- b]', ['a-b']),
1700 ('[a--b]', ['a-b']),
1701 ('[a', []),
1702 ('[a]x', ['a']),
1703 ('[aa]x', ['aa']),
1704 ('[a b]', ['a-b']),
1705 ('[a b]', ['a-b']),
1706 ('[a__b]', ['a-b']),
1707 ('[a] x', ['a']),
1708 ('[a][b]', ['a', 'b']),
1709 ('[a] [b]', ['a', 'b']),
1710 ('[a][b]x', ['a', 'b']),
1711 ('[a][b] x', ['a', 'b']),
1712 ('[a]\n[b]', ['a']),
1713 ('[a\nb]', []),
1714 ('[a][', ['a']),
1715 ('Revert "[a] feature"', ['a']),
1716 ('Reland "[a] feature"', ['a']),
1717 ('Revert: [a] feature', ['a']),
1718 ('Reland: [a] feature', ['a']),
1719 ('Revert "Reland: [a] feature"', ['a']),
1720 ('Foo: feature', ['foo']),
1721 ('Foo Bar: feature', ['foo-bar']),
1722 ('Revert "Foo bar: feature"', ['foo-bar']),
1723 ('Reland "Foo bar: feature"', ['foo-bar']),
1724 ]
1725 for desc, expected in cases:
1726 change_desc = git_cl.ChangeDescription(desc)
1727 actual = change_desc.get_hash_tags()
1728 self.assertEqual(
1729 actual,
1730 expected,
1731 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1732
wittman@chromium.org455dc922015-01-26 20:15:50 +00001733 def test_get_target_ref(self):
1734 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001735 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001736 self.assertEqual(None, git_cl.GetTargetRef(None,
1737 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001738 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001739
wittman@chromium.org455dc922015-01-26 20:15:50 +00001740 # Check default target refs for branches.
1741 self.assertEqual('refs/heads/master',
1742 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001743 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001744 self.assertEqual('refs/heads/master',
1745 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001746 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001747 self.assertEqual('refs/heads/master',
1748 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001749 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001750 self.assertEqual('refs/branch-heads/123',
1751 git_cl.GetTargetRef('origin',
1752 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001753 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001754 self.assertEqual('refs/diff/test',
1755 git_cl.GetTargetRef('origin',
1756 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001757 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001758 self.assertEqual('refs/heads/chrome/m42',
1759 git_cl.GetTargetRef('origin',
1760 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001761 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001762
1763 # Check target refs for user-specified target branch.
1764 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1765 'refs/remotes/branch-heads/123'):
1766 self.assertEqual('refs/branch-heads/123',
1767 git_cl.GetTargetRef('origin',
1768 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001769 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001770 for branch in ('origin/master', 'remotes/origin/master',
1771 'refs/remotes/origin/master'):
1772 self.assertEqual('refs/heads/master',
1773 git_cl.GetTargetRef('origin',
1774 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001775 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001776 for branch in ('master', 'heads/master', 'refs/heads/master'):
1777 self.assertEqual('refs/heads/master',
1778 git_cl.GetTargetRef('origin',
1779 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001780 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001781
wychen@chromium.orga872e752015-04-28 23:42:18 +00001782 def test_patch_when_dirty(self):
1783 # Patch when local tree is dirty
1784 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1785 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1786
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001787 @staticmethod
1788 def _get_gerrit_codereview_server_calls(branch, value=None,
1789 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001790 detect_branch=True,
1791 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001792 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1793
1794 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1795 """
1796 calls = []
1797 if detect_branch:
1798 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001799 if detect_server:
1800 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1801 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001802 if value is None:
1803 calls += [
1804 ((['git', 'config', 'branch.' + branch + '.merge'],),
1805 'refs/heads' + branch),
1806 ((['git', 'config', 'branch.' + branch + '.remote'],),
1807 'origin'),
1808 ((['git', 'config', 'remote.origin.url'],),
1809 'https://%s.googlesource.com/my/repo' % git_short_host),
1810 ]
1811 return calls
1812
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001813 def _patch_common(self, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001814 new_branch=False, git_short_host='host',
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001815 detect_gerrit_server=False,
1816 actual_codereview=None,
1817 codereview_in_url=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001818 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001819 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1820 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001821 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001822 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001823 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1824
tandriidf09a462016-08-18 16:23:55 -07001825 if new_branch:
1826 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001827
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001828 if codereview_in_url and actual_codereview == 'rietveld':
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001829 self.calls += [
1830 ((['git', 'rev-parse', '--show-cdup'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001831 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001832 ]
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001833
1834 if not force_codereview and not codereview_in_url:
1835 # These calls detect codereview to use.
1836 self.calls += [
1837 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1838 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1839 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1840 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1841 ((['git', 'config', 'gerrit.host'],), 'true'),
1842 ]
1843 if detect_gerrit_server:
1844 self.calls += self._get_gerrit_codereview_server_calls(
1845 'master', git_short_host=git_short_host,
1846 detect_branch=not new_branch and force_codereview)
1847 actual_codereview = 'gerrit'
1848
1849 if actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001850 self.calls += [
1851 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001852 'my%2Frepo~123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001853 {
1854 'current_revision': '7777777777',
1855 'revisions': {
1856 '1111111111': {
1857 '_number': 1,
1858 'fetch': {'http': {
1859 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1860 'ref': 'refs/changes/56/123456/1',
1861 }},
1862 },
1863 '7777777777': {
1864 '_number': 7,
1865 'fetch': {'http': {
1866 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1867 'ref': 'refs/changes/56/123456/7',
1868 }},
1869 },
1870 },
1871 }),
1872 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001873
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001874 def test_patch_rietveld_guess_by_url(self):
1875 self._patch_common(actual_codereview='rietveld', codereview_in_url=True)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001876 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001877 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001878 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001879 ((['git', 'config', 'branch.master.rietveldserver',
1880 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001881 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001882 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001883 ((['git', 'commit', '-m',
1884 'Description\n\n' +
1885 'patch from issue 123456 at patchset 60001 ' +
1886 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001887 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001888 self.assertEqual(git_cl.main(
1889 ['patch', 'https://codereview.example.com/123456']), 0)
1890
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001891 def test_patch_gerrit_default(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001892 self._patch_common(git_short_host='chromium', detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001893 self.calls += [
1894 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1895 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001896 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001897 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001898 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001899 ((['git', 'config', 'branch.master.gerritserver',
1900 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001901 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001902 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1903 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1904 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001905 ]
1906 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1907
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001908 def test_patch_gerrit_new_branch(self):
1909 self._patch_common(
1910 git_short_host='chromium', detect_gerrit_server=True, new_branch=True)
1911 self.calls += [
1912 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1913 'refs/changes/56/123456/7'],), ''),
1914 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1915 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1916 ''),
1917 ((['git', 'config', 'branch.master.gerritserver',
1918 'https://chromium-review.googlesource.com'],), ''),
1919 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1920 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1921 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1922 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1923 ]
1924 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1925
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001926 def test_patch_gerrit_force(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001927 self._patch_common(
1928 force_codereview=True, git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001929 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001930 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001931 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001932 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001933 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001934 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001935 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001936 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001937 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001938 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1939 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1940 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001941 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001942 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001943
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001944 def test_patch_gerrit_guess_by_url(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001945 self.calls += self._get_gerrit_codereview_server_calls(
1946 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001947 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001948 actual_codereview='gerrit', git_short_host='else',
1949 codereview_in_url=True, detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001950 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001951 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001952 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001953 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001954 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001955 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001956 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001957 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001958 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001959 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1960 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1961 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001962 ]
1963 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001964 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001965
Aaron Gable697a91b2018-01-19 15:20:15 -08001966 def test_patch_gerrit_guess_by_url_with_repo(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001967 self.calls += self._get_gerrit_codereview_server_calls(
1968 'master', git_short_host='else', detect_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001969 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001970 actual_codereview='gerrit', git_short_host='else',
1971 codereview_in_url=True, detect_gerrit_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001972 self.calls += [
1973 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1974 'refs/changes/56/123456/1'],), ''),
1975 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1976 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1977 ''),
1978 ((['git', 'config', 'branch.master.gerritserver',
1979 'https://else-review.googlesource.com'],), ''),
1980 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1981 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1982 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1983 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1984 ]
1985 self.assertEqual(git_cl.main(
1986 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1987 0)
1988
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001989 def test_patch_gerrit_conflict(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001990 self._patch_common(detect_gerrit_server=True, git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001991 self.calls += [
1992 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001993 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001994 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1995 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1996 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001997 ]
1998 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001999 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002000
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002001 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002002 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002003 raise git_cl.gerrit_util.GerritError(404, '')
2004 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2005
tandriic2405f52016-10-10 08:13:15 -07002006 self.calls = [
2007 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002008 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2009 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2010 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2011 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002012 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2013 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2014 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2015 ((['git', 'config', 'remote.origin.url'],),
2016 'https://chromium.googlesource.com/my/repo'),
2017 ((['DieWithError',
2018 'change 123456 at https://chromium-review.googlesource.com does not '
2019 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002020 ]
2021 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002022 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002023
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002024 def _checkout_calls(self):
2025 return [
2026 ((['git', 'config', '--local', '--get-regexp',
2027 'branch\\..*\\.rietveldissue'], ),
2028 ('branch.retrying.rietveldissue 1111111111\n'
2029 'branch.some-fix.rietveldissue 2222222222\n')),
2030 ((['git', 'config', '--local', '--get-regexp',
2031 'branch\\..*\\.gerritissue'], ),
2032 ('branch.ger-branch.gerritissue 123456\n'
2033 'branch.gbranch654.gerritissue 654321\n')),
2034 ]
2035
2036 def test_checkout_gerrit(self):
2037 """Tests git cl checkout <issue>."""
2038 self.calls = self._checkout_calls()
2039 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2040 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2041
2042 def test_checkout_rietveld(self):
2043 """Tests git cl checkout <issue>."""
2044 self.calls = self._checkout_calls()
2045 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2046 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2047
2048 def test_checkout_not_found(self):
2049 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002050 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002051 self.calls = self._checkout_calls()
2052 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2053
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002054 def test_checkout_no_branch_issues(self):
2055 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002056 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002057 self.calls = [
2058 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002059 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002060 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002061 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002062 ]
2063 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2064
tandrii@chromium.org28253532016-04-14 13:46:56 +00002065 def _test_gerrit_ensure_authenticated_common(self, auth,
2066 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002067 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2068 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2069 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002070 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002071 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002072 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002073 cl.branch = 'master'
2074 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002075 cl.lookedup_issue = True
2076 return cl
2077
2078 def test_gerrit_ensure_authenticated_missing(self):
2079 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002080 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002081 })
2082 self.calls.append(
2083 ((['DieWithError',
2084 'Credentials for the following hosts are required:\n'
2085 ' chromium-review.googlesource.com\n'
2086 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002087 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002088 'https://chromium-review.googlesource.com/new-password'],), ''),)
2089 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2090
2091 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002092 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002093 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002094 'chromium.googlesource.com':
2095 ('git-one.example.com', None, 'secret1'),
2096 'chromium-review.googlesource.com':
2097 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002098 })
2099 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002100 (('ask_for_data', 'If you know what you are doing '
2101 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002102 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2103
2104 def test_gerrit_ensure_authenticated_ok(self):
2105 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002106 'chromium.googlesource.com':
2107 ('git-same.example.com', None, 'secret'),
2108 'chromium-review.googlesource.com':
2109 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002110 })
2111 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2112
tandrii@chromium.org28253532016-04-14 13:46:56 +00002113 def test_gerrit_ensure_authenticated_skipped(self):
2114 cl = self._test_gerrit_ensure_authenticated_common(
2115 auth={}, skip_auth_check=True)
2116 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2117
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002118 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002119 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2120 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002121 self.calls = [
2122 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002123 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002124 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2125 ((['git', 'config', 'rietveld.server'],), ''),
2126 ((['git', 'config', 'rietveld.server'],), ''),
2127 ((['git', 'config', 'branch.feature.rietveldserver'],),
2128 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002129 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002130 ]
2131 self.assertEqual(0, git_cl.main(['set-commit']))
2132
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002133 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002134 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002135 lambda h, i, labels, notify=None:
2136 self._mocked_call(['SetReview', h, i, labels, notify]))
2137
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002138 self.calls = [
2139 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002140 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2141 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002142 ((['git', 'config', 'branch.feature.gerritserver'],),
2143 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002144 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
2145 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2146 ((['git', 'config', 'remote.origin.url'],),
2147 'https://chromium.googlesource.com/infra/infra.git'),
2148 ((['SetReview', 'chromium-review.googlesource.com',
2149 'infra%2Finfra~123',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002150 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002151 ]
tandriid9e5ce52016-07-13 02:32:59 -07002152
2153 def test_cmd_set_commit_gerrit_clear(self):
2154 self._cmd_set_commit_gerrit_common(0)
2155 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2156
2157 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002158 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002159 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2160
tandriid9e5ce52016-07-13 02:32:59 -07002161 def test_cmd_set_commit_gerrit(self):
2162 self._cmd_set_commit_gerrit_common(2)
2163 self.assertEqual(0, git_cl.main(['set-commit']))
2164
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002165 def test_description_display(self):
2166 out = StringIO.StringIO()
2167 self.mock(git_cl.sys, 'stdout', out)
2168
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002169 self.mock(git_cl, 'Changelist', ChangelistMock)
2170 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002171
2172 self.assertEqual(0, git_cl.main(['description', '-d']))
2173 self.assertEqual('foo\n', out.getvalue())
2174
2175 def test_description_rietveld(self):
2176 out = StringIO.StringIO()
2177 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002178 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002179
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002180 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002181 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002182 self.assertEqual('foobar\n', out.getvalue())
2183
iannucci3c972b92016-08-17 13:24:10 -07002184 def test_StatusFieldOverrideIssueMissingArgs(self):
2185 out = StringIO.StringIO()
2186 self.mock(git_cl.sys, 'stderr', out)
2187
2188 try:
2189 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2190 except SystemExit as ex:
2191 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002192 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002193
2194 out = StringIO.StringIO()
2195 self.mock(git_cl.sys, 'stderr', out)
2196
2197 try:
2198 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2199 except SystemExit as ex:
2200 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002201 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002202
2203 def test_StatusFieldOverrideIssue(self):
2204 out = StringIO.StringIO()
2205 self.mock(git_cl.sys, 'stdout', out)
2206
2207 def assertIssue(cl_self, *_args):
2208 self.assertEquals(cl_self.issue, 1)
2209 return 'foobar'
2210
2211 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2212 self.calls = [
2213 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2214 ((['git', 'config', 'rietveld.server'],), ''),
2215 ((['git', 'config', 'rietveld.server'],), ''),
2216 ]
iannuccie53c9352016-08-17 14:40:40 -07002217 self.assertEqual(
2218 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2219 0)
iannucci3c972b92016-08-17 13:24:10 -07002220 self.assertEqual(out.getvalue(), 'foobar\n')
2221
iannuccie53c9352016-08-17 14:40:40 -07002222 def test_SetCloseOverrideIssue(self):
2223 def assertIssue(cl_self, *_args):
2224 self.assertEquals(cl_self.issue, 1)
2225 return 'foobar'
2226
2227 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2228 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2229 self.calls = [
2230 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2231 ((['git', 'config', 'rietveld.server'],), ''),
2232 ((['git', 'config', 'rietveld.server'],), ''),
2233 ]
2234 self.assertEqual(
2235 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2236
2237 def test_SetCommitOverrideIssue(self):
2238 def assertIssue(cl_self, *_args):
2239 self.assertEquals(cl_self.issue, 1)
2240 return 'foobar'
2241
2242 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2243 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2244 self.calls = [
2245 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2246 ((['git', 'config', 'rietveld.server'],), ''),
2247 ((['git', 'config', 'rietveld.server'],), ''),
2248 ((['git', 'symbolic-ref', 'HEAD'],), ''),
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
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002255 def test_description_gerrit(self):
2256 out = StringIO.StringIO()
2257 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002258 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002259 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2260 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2261 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2262 ((['git', 'config', 'remote.origin.url'],),
2263 'https://chromium.googlesource.com/my/repo'),
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002264 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002265 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002266 {
2267 'current_revision': 'sha1',
2268 'revisions': {'sha1': {
2269 'commit': {'message': 'foobar'},
2270 }},
2271 }),
2272 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002273 self.assertEqual(0, git_cl.main([
2274 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2275 self.assertEqual('foobar\n', out.getvalue())
2276
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002277 def test_description_set_raw(self):
2278 out = StringIO.StringIO()
2279 self.mock(git_cl.sys, 'stdout', out)
2280
2281 self.mock(git_cl, 'Changelist', ChangelistMock)
2282 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2283
2284 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2285 self.assertEqual('hihi', ChangelistMock.desc)
2286
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002287 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002288 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002289
2290 def RunEditor(desc, _, **kwargs):
2291 self.assertEquals(
2292 '# Enter a description of the change.\n'
2293 '# This will be displayed on the codereview site.\n'
2294 '# The first line will also be used as the subject of the review.\n'
2295 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002296 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002297 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002298 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002299 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002300 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002301
dsansomee2d6fd92016-09-08 00:10:47 -07002302 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002303 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002304
2305 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2306 self.mock(git_cl.Changelist, 'GetDescription',
2307 lambda *args: current_desc)
2308 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2309 UpdateDescriptionRemote)
2310 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2311
2312 self.calls = [
2313 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002314 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002315 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2316 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002317 ((['git', 'config', 'core.editor'],), 'vi'),
2318 ]
2319 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2320
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002321 def test_description_set_stdin(self):
2322 out = StringIO.StringIO()
2323 self.mock(git_cl.sys, 'stdout', out)
2324
2325 self.mock(git_cl, 'Changelist', ChangelistMock)
2326 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2327
2328 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2329 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2330
kmarshall3bff56b2016-06-06 18:31:47 -07002331 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002332 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2333
kmarshall3bff56b2016-06-06 18:31:47 -07002334 self.calls = \
2335 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2336 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002337 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002338 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2339 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002340 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2341 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2342 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002343 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2344 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2345 ((['git', 'branch', '-D', 'foo'],), '')]
2346
kmarshall3bff56b2016-06-06 18:31:47 -07002347 self.mock(git_cl, 'get_cl_statuses',
2348 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002349 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2350 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2351 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002352
2353 self.assertEqual(0, git_cl.main(['archive', '-f']))
2354
2355 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002356 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002357 self.calls = \
2358 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2359 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002360 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002361 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2362 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002363 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2364
kmarshall9249e012016-08-23 12:02:16 -07002365 self.mock(git_cl, 'get_cl_statuses',
2366 lambda branches, fine_grained, max_processes:
2367 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2368
2369 self.assertEqual(1, git_cl.main(['archive', '-f']))
2370
2371 def test_archive_dry_run(self):
2372 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2373
2374 self.calls = \
2375 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2376 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2377 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2378 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2379 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2380 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2381 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2382 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2383 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002384
2385 self.mock(git_cl, 'get_cl_statuses',
2386 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002387 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2388 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2389 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002390
kmarshall9249e012016-08-23 12:02:16 -07002391 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2392
2393 def test_archive_no_tags(self):
2394 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2395
2396 self.calls = \
2397 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2398 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2399 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2400 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2401 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2402 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2403 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2404 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2405 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2406 ((['git', 'branch', '-D', 'foo'],), '')]
2407
2408 self.mock(git_cl, 'get_cl_statuses',
2409 lambda branches, fine_grained, max_processes:
2410 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2411 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2412 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2413
2414 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002415
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002416 def test_cmd_issue_erase_existing(self):
2417 out = StringIO.StringIO()
2418 self.mock(git_cl.sys, 'stdout', out)
2419 self.calls = [
2420 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002421 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2422 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002423 # Let this command raise exception (retcode=1) - it should be ignored.
2424 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002425 CERR1),
2426 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2427 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002428 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2429 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2430 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002431 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002432 ]
2433 self.assertEqual(0, git_cl.main(['issue', '0']))
2434
Aaron Gable400e9892017-07-12 15:31:21 -07002435 def test_cmd_issue_erase_existing_with_change_id(self):
2436 out = StringIO.StringIO()
2437 self.mock(git_cl.sys, 'stdout', out)
2438 self.mock(git_cl.Changelist, 'GetDescription',
2439 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2440 self.calls = [
2441 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2442 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2443 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002444 # Let this command raise exception (retcode=1) - it should be ignored.
2445 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2446 CERR1),
2447 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2448 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2449 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2450 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2451 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002452 ((['git', 'log', '-1', '--format=%B'],),
2453 'This is a description\n\nChange-Id: Ideadbeef'),
2454 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002455 ]
2456 self.assertEqual(0, git_cl.main(['issue', '0']))
2457
phajdan.jre328cf92016-08-22 04:12:17 -07002458 def test_cmd_issue_json(self):
2459 out = StringIO.StringIO()
2460 self.mock(git_cl.sys, 'stdout', out)
2461 self.calls = [
2462 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002463 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002464 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2465 ((['git', 'config', 'rietveld.server'],),
2466 'https://codereview.chromium.org'),
2467 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2468 (('write_json', 'output.json',
2469 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2470 ''),
2471 ]
2472 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2473
tandriide281ae2016-10-12 06:02:30 -07002474 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002475 self.mock(git_cl.Changelist, 'GetChange',
2476 lambda _, *a: (
2477 self._mocked_call(['GetChange']+list(a))))
2478 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2479 lambda *_, **__: (
2480 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002481 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2482 lambda _, s: self._mocked_call(['SetCQState', s]))
2483 self.calls = [
2484 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002485 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002486 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2487 ((['git', 'config', 'rietveld.server'],),
2488 'https://codereview.chromium.org'),
2489 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2490 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2491 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2492 ((['get_or_create_merge_base', 'feature', 'feature'],),
2493 'fake_ancestor_sha'),
2494 ((['GetChange', 'fake_ancestor_sha', None], ),
2495 git_cl.presubmit_support.GitChange(
2496 '', '', '', '', '', '', '', '')),
2497 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2498 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002499 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2500 ]
2501 out = StringIO.StringIO()
2502 self.mock(git_cl.sys, 'stdout', out)
2503 self.assertEqual(0, git_cl.main(['try']))
2504 self.assertEqual(
2505 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002506 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002507
tandrii8c5a3532016-11-04 07:52:02 -07002508 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2509 self.mock(git_cl.Changelist, 'GetChange',
2510 lambda _, *a: (
2511 self._mocked_call(['GetChange']+list(a))))
2512 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2513 lambda *_, **__: (
2514 self._mocked_call(['DoGetTryMasters'])))
2515 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2516 lambda _, s: self._mocked_call(['SetCQState', s]))
2517
tandrii8c5a3532016-11-04 07:52:02 -07002518 self.calls = [
2519 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2520 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2521 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2522 ((['git', 'config', 'branch.feature.gerritserver'],),
2523 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002524 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2525 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2526 ((['git', 'config', 'remote.origin.url'],),
2527 'https://chromium.googlesource.com/depot_tools'),
2528 (('GetChangeDetail', 'chromium-review.googlesource.com',
2529 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002530 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2531 'project': 'depot_tools',
2532 'status': 'OPEN',
2533 'owner': {'email': 'owner@e.mail'},
2534 'revisions': {
2535 'deadbeaf': {
2536 '_number': 6,
2537 },
2538 'beeeeeef': {
2539 '_number': 7,
2540 'fetch': {'http': {
2541 'url': 'https://chromium.googlesource.com/depot_tools',
2542 'ref': 'refs/changes/56/123456/7'
2543 }},
2544 },
2545 },
2546 }),
tandrii8c5a3532016-11-04 07:52:02 -07002547 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2548 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2549 ((['get_or_create_merge_base', 'feature', 'feature'],),
2550 'fake_ancestor_sha'),
2551 ((['GetChange', 'fake_ancestor_sha', None], ),
2552 git_cl.presubmit_support.GitChange(
2553 '', '', '', '', '', '', '', '')),
2554 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2555 ((['DoGetTryMasters'], ), None),
2556 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2557 ]
2558 out = StringIO.StringIO()
2559 self.mock(git_cl.sys, 'stdout', out)
2560 self.assertEqual(0, git_cl.main(['try']))
2561 self.assertEqual(
2562 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002563 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002564 'https://chromium-review.googlesource.com/123456\n')
2565
2566 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2567 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2568 lambda _: {
2569 'owner_email': 'owner@e.mail',
2570 'private': False,
2571 'closed': False,
2572 'project': 'depot_tools',
2573 'patchsets': [20001],
2574 })
tandriide281ae2016-10-12 06:02:30 -07002575 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2576 self.calls = [
2577 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2578 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2579 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2580 ((['git', 'config', 'rietveld.server'],),
2581 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002582 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002583 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002584 ]
2585
2586 def _buildbucket_retry(*_, **kw):
2587 # self.maxDiff = 10000
2588 body = json.loads(kw['body'])
2589 self.assertEqual(len(body['builds']), 1)
2590 build = body['builds'][0]
2591 params = json.loads(build.pop('parameters_json'))
2592 self.assertEqual(params, {
2593 u'builder_name': u'win',
2594 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2595 u'revision': None}],
2596 u'properties': {
2597 u'category': u'git_cl_try',
2598 u'issue': 123,
2599 u'key': u'val',
2600 u'json': [{u'a': 1}, None],
2601 u'master': u'tryserver.chromium',
2602 u'patch_project': u'depot_tools',
2603 u'patch_storage': u'rietveld',
2604 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002605 u'rietveld': u'https://codereview.chromium.org',
2606 }
2607 })
2608 self.assertEqual(build, {
2609 u'bucket': u'master.tryserver.chromium',
2610 u'client_operation_id': u'uuid4',
2611 u'tags': [u'builder:win',
2612 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002613 u'user_agent:git_cl_try',
2614 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002615 })
2616
2617 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2618
2619 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2620 self.assertEqual(0, git_cl.main([
2621 'try', '-m', 'tryserver.chromium', '-b', 'win',
2622 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2623 self.assertRegexpMatches(
2624 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002625 'Tried jobs on:\nBucket: master.tryserver.chromium')
2626
tandrii8c5a3532016-11-04 07:52:02 -07002627 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2628 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2629 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2630
tandrii8c5a3532016-11-04 07:52:02 -07002631 self.calls = [
2632 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2633 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2634 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2635 ((['git', 'config', 'branch.feature.gerritserver'],),
2636 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002637 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2638 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2639 ((['git', 'config', 'remote.origin.url'],),
2640 'https://chromium.googlesource.com/depot_tools'),
2641 (('GetChangeDetail', 'chromium-review.googlesource.com',
2642 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002643 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002644 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002645 'status': 'OPEN',
2646 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002647 'revisions': {
2648 'deadbeaf': {
2649 '_number': 6,
2650 },
2651 'beeeeeef': {
2652 '_number': 7,
2653 'fetch': {'http': {
2654 'url': 'https://chromium.googlesource.com/depot_tools',
2655 'ref': 'refs/changes/56/123456/7'
2656 }},
2657 },
2658 },
2659 }),
2660 ]
2661
2662 def _buildbucket_retry(*_, **kw):
2663 # self.maxDiff = 10000
2664 body = json.loads(kw['body'])
2665 self.assertEqual(len(body['builds']), 1)
2666 build = body['builds'][0]
2667 params = json.loads(build.pop('parameters_json'))
2668 self.assertEqual(params, {
2669 u'builder_name': u'win',
2670 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2671 u'revision': None}],
2672 u'properties': {
2673 u'category': u'git_cl_try',
2674 u'key': u'val',
2675 u'json': [{u'a': 1}, None],
2676 u'master': u'tryserver.chromium',
2677
2678 u'patch_gerrit_url':
2679 u'https://chromium-review.googlesource.com',
2680 u'patch_issue': 123456,
2681 u'patch_project': u'depot_tools',
2682 u'patch_ref': u'refs/changes/56/123456/7',
2683 u'patch_repository_url':
2684 u'https://chromium.googlesource.com/depot_tools',
2685 u'patch_set': 7,
2686 u'patch_storage': u'gerrit',
2687 }
2688 })
2689 self.assertEqual(build, {
2690 u'bucket': u'master.tryserver.chromium',
2691 u'client_operation_id': u'uuid4',
2692 u'tags': [
2693 u'builder:win',
2694 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2695 u'user_agent:git_cl_try',
2696 u'master:tryserver.chromium'],
2697 })
2698
2699 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2700
2701 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2702 self.assertEqual(0, git_cl.main([
2703 'try', '-m', 'tryserver.chromium', '-b', 'win',
2704 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2705 self.assertRegexpMatches(
2706 git_cl.sys.stdout.getvalue(),
2707 'Tried jobs on:\nBucket: master.tryserver.chromium')
2708
borenet6c0efe62016-10-19 08:13:29 -07002709 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002710 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2711 lambda _: {
2712 'owner_email': 'owner@e.mail',
2713 'private': False,
2714 'closed': False,
2715 'project': 'depot_tools',
2716 'patchsets': [20001],
2717 })
borenet6c0efe62016-10-19 08:13:29 -07002718 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2719 self.calls = [
2720 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2721 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2722 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2723 ((['git', 'config', 'rietveld.server'],),
2724 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002725 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002726 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002727 ]
2728
2729 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002730 body = json.loads(kw['body'])
2731 self.assertEqual(len(body['builds']), 1)
2732 build = body['builds'][0]
2733 params = json.loads(build.pop('parameters_json'))
2734 self.assertEqual(params, {
2735 u'builder_name': u'win',
2736 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2737 u'revision': None}],
2738 u'properties': {
2739 u'category': u'git_cl_try',
2740 u'issue': 123,
2741 u'patch_project': u'depot_tools',
2742 u'patch_storage': u'rietveld',
2743 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002744 u'rietveld': u'https://codereview.chromium.org',
2745 }
2746 })
2747 self.assertEqual(build, {
2748 u'bucket': u'test.bucket',
2749 u'client_operation_id': u'uuid4',
2750 u'tags': [u'builder:win',
2751 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2752 u'user_agent:git_cl_try'],
2753 })
2754
2755 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2756
2757 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2758 self.assertEqual(0, git_cl.main([
2759 'try', '-B', 'test.bucket', '-b', 'win']))
2760 self.assertRegexpMatches(
2761 git_cl.sys.stdout.getvalue(),
2762 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002763
qyearsley123a4682016-10-26 09:12:17 -07002764 def test_git_cl_try_bots_on_multiple_masters(self):
2765 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2766 self.calls = [
2767 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2768 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2769 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2770 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002771 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002772 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2773 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2774 ]
2775
2776 def _buildbucket_retry(*_, **kw):
2777 body = json.loads(kw['body'])
2778 self.assertEqual(len(body['builds']), 2)
2779
Nodir Turakulovb422e682018-02-20 22:51:30 -08002780 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2781 params = json.loads(body['builds'][0]['parameters_json'])
2782 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002783
Nodir Turakulovb422e682018-02-20 22:51:30 -08002784 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2785 params = json.loads(body['builds'][1]['parameters_json'])
2786 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002787
2788 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2789
2790 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002791 json.dumps({
2792 'builder1': {'bucket': 'bucket1'},
2793 'builder2': {'bucket': 'bucket2'},
2794 })))
qyearsley123a4682016-10-26 09:12:17 -07002795
2796 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2797 self.assertEqual(
2798 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2799 self.assertEqual(
2800 git_cl.sys.stdout.getvalue(),
2801 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002802 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002803 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002804 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002805 ' builder2: []\n'
2806 'To see results here, run: git cl try-results\n'
2807 'To see results in browser, run: git cl web\n')
2808
tandrii16e0b4e2016-06-07 10:34:28 -07002809 def _common_GerritCommitMsgHookCheck(self):
2810 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2811 self.mock(git_cl.os.path, 'abspath',
2812 lambda path: self._mocked_call(['abspath', path]))
2813 self.mock(git_cl.os.path, 'exists',
2814 lambda path: self._mocked_call(['exists', path]))
2815 self.mock(git_cl.gclient_utils, 'FileRead',
2816 lambda path: self._mocked_call(['FileRead', path]))
2817 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2818 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2819 self.calls = [
2820 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2821 ((['abspath', '../'],), '/abs/git_repo_root'),
2822 ]
2823 return git_cl.Changelist(codereview='gerrit', issue=123)
2824
2825 def test_GerritCommitMsgHookCheck_custom_hook(self):
2826 cl = self._common_GerritCommitMsgHookCheck()
2827 self.calls += [
2828 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2829 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2830 '#!/bin/sh\necho "custom hook"')
2831 ]
2832 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2833
2834 def test_GerritCommitMsgHookCheck_not_exists(self):
2835 cl = self._common_GerritCommitMsgHookCheck()
2836 self.calls += [
2837 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2838 ]
2839 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2840
2841 def test_GerritCommitMsgHookCheck(self):
2842 cl = self._common_GerritCommitMsgHookCheck()
2843 self.calls += [
2844 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2845 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2846 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002847 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002848 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2849 ''),
2850 ]
2851 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2852
tandriic4344b52016-08-29 06:04:54 -07002853 def test_GerritCmdLand(self):
2854 self.calls += [
2855 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2856 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2857 'deadbeaf'),
2858 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2859 ((['git', 'config', 'branch.feature.gerritserver'],),
2860 'chromium-review.googlesource.com'),
2861 ]
2862 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2863 cl._codereview_impl._GetChangeDetail = lambda _: {
2864 'labels': {},
2865 'current_revision': 'deadbeaf',
2866 }
agable32978d92016-11-01 12:55:02 -07002867 cl._codereview_impl._GetChangeCommit = lambda: {
2868 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002869 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002870 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2871 }
tandriic4344b52016-08-29 06:04:54 -07002872 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002873 out = StringIO.StringIO()
2874 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002875 self.assertEqual(0, cl.CMDLand(force=True,
2876 bypass_hooks=True,
2877 verbose=True,
2878 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002879 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002880 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002881
tandrii221ab252016-10-06 08:12:04 -07002882 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002883 '9000': {
2884 'id': '9000',
2885 'bucket': 'master.x.y',
2886 'created_by': 'user:someone@chromium.org',
2887 'created_ts': '147200002222000',
2888 'experimental': False,
2889 'parameters_json': json.dumps({
2890 'builder_name': 'my-bot',
2891 'properties': {'category': 'cq'},
2892 }),
2893 'status': 'STARTED',
2894 'tags': [
2895 'build_address:x.y/my-bot/2',
2896 'builder:my-bot',
2897 'experimental:false',
2898 'user_agent:cq',
2899 ],
2900 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2901 },
2902 '8000': {
2903 'id': '8000',
2904 'bucket': 'master.x.y',
2905 'created_by': 'user:someone@chromium.org',
2906 'created_ts': '147200001111000',
2907 'experimental': False,
2908 'failure_reason': 'BUILD_FAILURE',
2909 'parameters_json': json.dumps({
2910 'builder_name': 'my-bot',
2911 'properties': {'category': 'cq'},
2912 }),
2913 'result_details_json': json.dumps({
2914 'properties': {'buildnumber': 1},
2915 }),
2916 'result': 'FAILURE',
2917 'status': 'COMPLETED',
2918 'tags': [
2919 'build_address:x.y/my-bot/1',
2920 'builder:my-bot',
2921 'experimental:false',
2922 'user_agent:cq',
2923 ],
2924 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2925 },
2926 }
tandrii221ab252016-10-06 08:12:04 -07002927
2928 def test_write_try_results_json(self):
2929 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002930 {
2931 'bucket': 'master.x.y',
2932 'buildbucket_id': '8000',
2933 'builder_name': 'my-bot',
2934 'created_ts': '147200001111000',
2935 'experimental': False,
2936 'failure_reason': 'BUILD_FAILURE',
2937 'result': 'FAILURE',
2938 'status': 'COMPLETED',
2939 'tags': [
2940 'build_address:x.y/my-bot/1',
2941 'builder:my-bot',
2942 'experimental:false',
2943 'user_agent:cq',
2944 ],
2945 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2946 },
2947 {
2948 'bucket': 'master.x.y',
2949 'buildbucket_id': '9000',
2950 'builder_name': 'my-bot',
2951 'created_ts': '147200002222000',
2952 'experimental': False,
2953 'failure_reason': None,
2954 'result': None,
2955 'status': 'STARTED',
2956 'tags': [
2957 'build_address:x.y/my-bot/2',
2958 'builder:my-bot',
2959 'experimental:false',
2960 'user_agent:cq',
2961 ],
2962 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2963 },
tandrii221ab252016-10-06 08:12:04 -07002964 ]
2965 self.calls = [(('write_json', 'output.json', expected_output), '')]
2966 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2967
tandrii45b2a582016-10-11 03:14:16 -07002968 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002969 out = StringIO.StringIO()
2970 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002971 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2972 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002973 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2974 self._mocked_call(['get_authenticator_for_host', host]))
2975 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2976 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002977
2978 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2979 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002980 self.calls += [
2981 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2982 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2983 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2984 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2985 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2986 ((['git', 'config', 'branch.feature.rietveldserver'],),
2987 'codereview.example.com'),
2988 ((['get_authenticator_for_host', 'codereview.example.com'],),
2989 AuthenticatorMock()),
2990 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2991
2992 def test_fetch_try_jobs_none_rietveld(self):
2993 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002994 # Simulate that user isn't logged in.
2995 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002996 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002997 self.assertRegexpMatches(sys.stdout.getvalue(),
2998 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002999 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3000
3001 def test_fetch_try_jobs_some_rietveld(self):
3002 self._setup_fetch_try_jobs_rietveld({
3003 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3004 })
3005 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003006 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3007 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3008 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3009
3010 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3011 self._setup_fetch_try_jobs(most_recent_patchset=13)
3012 self.calls += [
3013 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3014 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3015 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003016 # TODO(tandrii): Uncomment the below if we decide to support checking
3017 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003018 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003019 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003020 ((['git', 'config', 'branch.feature.gerritserver'],),
3021 'https://x-review.googlesource.com'),
3022 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3023 AuthenticatorMock()),
3024 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3025
3026 def test_fetch_try_jobs_none_gerrit(self):
3027 self._setup_fetch_try_jobs_gerrit({})
3028 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003029 # TODO(tandrii): Uncomment the below if we decide to support checking
3030 # patchsets for Gerrit.
3031 # self.assertRegexpMatches(
3032 # sys.stdout.getvalue(),
3033 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003034 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3035
3036 def test_fetch_try_jobs_some_gerrit(self):
3037 self._setup_fetch_try_jobs_gerrit({
3038 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3039 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003040 # TODO(tandrii): Uncomment the below if we decide to support checking
3041 # patchsets for Gerrit.
3042 # self.calls.remove(
3043 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003044 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3045
3046 # ... and doesn't result in warning.
3047 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3048 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003049 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3050 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3051
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003052 def _mock_gerrit_changes_for_detail_cache(self):
3053 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003054
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003055 def test_gerrit_change_detail_cache_simple(self):
3056 self._mock_gerrit_changes_for_detail_cache()
3057 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003058 (('GetChangeDetail', 'host', 'my%2Frepo~1', []), 'a'),
3059 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b'),
3060 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003061 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003062 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003063 cl1._cached_remote_url = (
3064 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003065 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003066 cl2._cached_remote_url = (
3067 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003068 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
3069 self.assertEqual(cl1._GetChangeDetail(), 'a')
3070 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
3071 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
3072 self.assertEqual(cl1._GetChangeDetail(), 'a')
3073 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003074
3075 def test_gerrit_change_detail_cache_options(self):
3076 self._mock_gerrit_changes_for_detail_cache()
3077 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003078 (('GetChangeDetail', 'host', 'repo~1', ['C', 'A', 'B']), 'cab'),
3079 (('GetChangeDetail', 'host', 'repo~1', ['A', 'D']), 'ad'),
3080 (('GetChangeDetail', 'host', 'repo~1', ['A']), 'a'), # no_cache=True
3081 # no longer in cache.
3082 (('GetChangeDetail', 'host', 'repo~1', ['B']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003083 ]
3084 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003085 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003086 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3087 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3088 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3089 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3090 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3091 self.assertEqual(cl._GetChangeDetail(), 'cab')
3092
3093 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3094 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3095 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3096 self.assertEqual(cl._GetChangeDetail(), 'cab')
3097
3098 # Finally, no_cache should invalidate all caches for given change.
3099 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3100 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3101
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003102 def test_gerrit_description_caching(self):
3103 def gen_detail(rev, desc):
3104 return {
3105 'current_revision': rev,
3106 'revisions': {rev: {'commit': {'message': desc}}}
3107 }
3108 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003109 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003110 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3111 gen_detail('rev1', 'desc1')),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003112 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003113 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3114 gen_detail('rev2', 'desc2')),
3115 ]
3116
3117 self._mock_gerrit_changes_for_detail_cache()
3118 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003119 cl._cached_remote_url = (
3120 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003121 self.assertEqual(cl.GetDescription(), 'desc1')
3122 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3123 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003124
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003125 def test_print_current_creds(self):
3126 class CookiesAuthenticatorMock(object):
3127 def __init__(self):
3128 self.gitcookies = {
3129 'host.googlesource.com': ('user', 'pass'),
3130 'host-review.googlesource.com': ('user', 'pass'),
3131 }
3132 self.netrc = self
3133 self.netrc.hosts = {
3134 'github.com': ('user2', None, 'pass2'),
3135 'host2.googlesource.com': ('user3', None, 'pass'),
3136 }
3137 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3138 CookiesAuthenticatorMock)
3139 self.mock(sys, 'stdout', StringIO.StringIO())
3140 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3141 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3142 ' Host\t User\t Which file',
3143 '============================\t=====\t===========',
3144 'host-review.googlesource.com\t user\t.gitcookies',
3145 ' host.googlesource.com\t user\t.gitcookies',
3146 ' host2.googlesource.com\tuser3\t .netrc',
3147 ])
3148 sys.stdout.buf = ''
3149 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3150 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3151 ' Host\tUser\t Which file',
3152 '============================\t====\t===========',
3153 'host-review.googlesource.com\tuser\t.gitcookies',
3154 ' host.googlesource.com\tuser\t.gitcookies',
3155 ])
3156
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003157 def _common_creds_check_mocks(self):
3158 def exists_mock(path):
3159 dirname = os.path.dirname(path)
3160 if dirname == os.path.expanduser('~'):
3161 dirname = '~'
3162 base = os.path.basename(path)
3163 if base in ('.netrc', '.gitcookies'):
3164 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3165 # git cl also checks for existence other files not relevant to this test.
3166 return None
3167 self.mock(os.path, 'exists', exists_mock)
3168 self.mock(sys, 'stdout', StringIO.StringIO())
3169
3170 def test_creds_check_gitcookies_not_configured(self):
3171 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003172 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003173 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003174 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003175 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003176 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3177 (('os.path.exists', '~/.netrc'), True),
3178 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3179 'or Ctrl+C to abort'), ''),
3180 ((['git', 'config', '--global', 'http.cookiefile',
3181 os.path.expanduser('~/.gitcookies')], ), ''),
3182 ]
3183 self.assertEqual(0, git_cl.main(['creds-check']))
3184 self.assertRegexpMatches(
3185 sys.stdout.getvalue(),
3186 '^You seem to be using outdated .netrc for git credentials:')
3187 self.assertRegexpMatches(
3188 sys.stdout.getvalue(),
3189 '\nConfigured git to use .gitcookies from')
3190
3191 def test_creds_check_gitcookies_configured_custom_broken(self):
3192 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003193 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003194 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003195 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003196 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003197 ((['git', 'config', '--global', 'http.cookiefile'],),
3198 '/custom/.gitcookies'),
3199 (('os.path.exists', '/custom/.gitcookies'), False),
3200 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3201 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3202 ((['git', 'config', '--global', 'http.cookiefile',
3203 os.path.expanduser('~/.gitcookies')], ), ''),
3204 ]
3205 self.assertEqual(0, git_cl.main(['creds-check']))
3206 self.assertRegexpMatches(
3207 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003208 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003209 self.assertRegexpMatches(
3210 sys.stdout.getvalue(),
3211 'However, your configured .gitcookies file is missing.')
3212
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003213 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003214 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003215 lambda _, message, publish: self._mocked_call(
3216 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003217 self.calls = [
3218 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3219 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003220 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003221 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003222 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3223 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003224
3225 def test_git_cl_comment_add_gerrit(self):
3226 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003227 lambda host, change, msg, ready:
3228 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003229 self.calls = [
3230 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3231 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3232 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3233 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3234 'origin/master'),
3235 ((['git', 'config', 'remote.origin.url'],),
3236 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003237 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
3238 'msg', None),
Aaron Gable636b13f2017-07-14 10:42:48 -07003239 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003240 ]
3241 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3242 '-a', 'msg']))
3243
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003244 def test_git_cl_comments_fetch_rietveld(self):
3245 self.mock(sys, 'stdout', StringIO.StringIO())
3246 self.calls = [
3247 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3248 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Leszek Swirski45b20c42018-09-17 17:05:26 +00003249 ] * 2 + [
3250 (('write_json', 'output.json', [
3251 {
3252 'date': '2000-03-13 20:49:34.515270',
3253 'message': 'PTAL',
3254 'approval': False,
3255 'disapproval': False,
3256 'sender': 'owner@example.com'
3257 }, {
3258 'date': '2017-03-13 20:49:34.515270',
3259 'message': 'lgtm',
3260 'approval': True,
3261 'disapproval': False,
3262 'sender': 'r@example.com'
3263 }, {
3264 'date': '2017-03-13 21:50:34.515270',
3265 'message': 'not lgtm',
3266 'approval': False,
3267 'disapproval': True,
3268 'sender': 'r2@example.com'
3269 }
3270 ]),'')
3271 ]
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003272 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3273 'messages': [
3274 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3275 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3276 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3277 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3278 # Intentionally wrong order here.
3279 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3280 'disapproval': False, 'approval': False,
3281 'sender': 'owner@example.com'},
3282 ],
3283 'owner_email': 'owner@example.com',
3284 })
3285 expected_comments_summary = [
3286 git_cl._CommentSummary(
3287 message='lgtm',
3288 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3289 disapproval=False, approval=True, sender='r@example.com'),
3290 git_cl._CommentSummary(
3291 message='not lgtm',
3292 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3293 disapproval=True, approval=False, sender='r2@example.com'),
3294 # Note: same order as in whatever Rietveld returns.
3295 git_cl._CommentSummary(
3296 message='PTAL',
3297 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3298 disapproval=False, approval=False, sender='owner@example.com'),
3299 ]
3300 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3301 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00003302 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3303 '-j', 'output.json']))
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003304
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003305 def test_git_cl_comments_fetch_gerrit(self):
3306 self.mock(sys, 'stdout', StringIO.StringIO())
3307 self.calls = [
3308 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3309 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3310 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3311 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3312 'origin/master'),
3313 ((['git', 'config', 'remote.origin.url'],),
3314 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003315 (('GetChangeDetail', 'chromium-review.googlesource.com',
3316 'infra%2Finfra~1',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003317 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003318 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003319 'messages': [
3320 {
3321 u'_revision_number': 1,
3322 u'author': {
3323 u'_account_id': 1111084,
3324 u'email': u'commit-bot@chromium.org',
3325 u'name': u'Commit Bot'
3326 },
3327 u'date': u'2017-03-15 20:08:45.000000000',
3328 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003329 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003330 u'tag': u'autogenerated:cq:dry-run'
3331 },
3332 {
3333 u'_revision_number': 2,
3334 u'author': {
3335 u'_account_id': 11151243,
3336 u'email': u'owner@example.com',
3337 u'name': u'owner'
3338 },
3339 u'date': u'2017-03-16 20:00:41.000000000',
3340 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3341 u'message': u'PTAL',
3342 },
3343 {
3344 u'_revision_number': 2,
3345 u'author': {
3346 u'_account_id': 148512 ,
3347 u'email': u'reviewer@example.com',
3348 u'name': u'reviewer'
3349 },
3350 u'date': u'2017-03-17 05:19:37.500000000',
3351 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3352 u'message': u'Patch Set 2: Code-Review+1',
3353 },
3354 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003355 }),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003356 (('GetChangeComments', 'chromium-review.googlesource.com',
3357 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003358 '/COMMIT_MSG': [
3359 {
3360 'author': {'email': u'reviewer@example.com'},
3361 'updated': u'2017-03-17 05:19:37.500000000',
3362 'patch_set': 2,
3363 'side': 'REVISION',
3364 'message': 'Please include a bug link',
3365 },
3366 ],
3367 'codereview.settings': [
3368 {
3369 'author': {'email': u'owner@example.com'},
3370 'updated': u'2017-03-16 20:00:41.000000000',
3371 'patch_set': 2,
3372 'side': 'PARENT',
3373 'line': 42,
3374 'message': 'I removed this because it is bad',
3375 },
3376 ]
Leszek Swirski45b20c42018-09-17 17:05:26 +00003377 })
3378 ] * 2 + [
3379 (('write_json', 'output.json', [
3380 {
3381 u'date': u'2017-03-16 20:00:41.000000',
3382 u'message': (
3383 u'PTAL\n' +
3384 u'\n' +
3385 u'codereview.settings\n' +
3386 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3387 u'c/1/2/codereview.settings#b42\n' +
3388 u' I removed this because it is bad\n'),
3389 u'approval': False,
3390 u'disapproval': False,
3391 u'sender': u'owner@example.com'
3392 }, {
3393 u'date': u'2017-03-17 05:19:37.500000',
3394 u'message': (
3395 u'Patch Set 2: Code-Review+1\n' +
3396 u'\n' +
3397 u'/COMMIT_MSG\n' +
3398 u' PS2, File comment: https://chromium-review.googlesource' +
3399 u'.com/c/1/2//COMMIT_MSG#\n' +
3400 u' Please include a bug link\n'),
3401 u'approval': False,
3402 u'disapproval': False,
3403 u'sender': u'reviewer@example.com'
3404 }
3405 ]),'')
3406 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003407 expected_comments_summary = [
3408 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003409 message=(
3410 u'PTAL\n' +
3411 u'\n' +
3412 u'codereview.settings\n' +
3413 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3414 u'c/1/2/codereview.settings#b42\n' +
3415 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003416 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3417 disapproval=False, approval=False, sender=u'owner@example.com'),
3418 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003419 message=(
3420 u'Patch Set 2: Code-Review+1\n' +
3421 u'\n' +
3422 u'/COMMIT_MSG\n' +
3423 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3424 u'c/1/2//COMMIT_MSG#\n' +
3425 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003426 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3427 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3428 ]
3429 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3430 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Leszek Swirski45b20c42018-09-17 17:05:26 +00003431 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3432 '-j', 'output.json']))
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003433
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003434 def test_get_remote_url_with_mirror(self):
3435 original_os_path_isdir = os.path.isdir
3436 def selective_os_path_isdir_mock(path):
3437 if path == '/cache/this-dir-exists':
3438 return self._mocked_call('os.path.isdir', path)
3439 return original_os_path_isdir(path)
3440 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
3441
3442 url = 'https://chromium.googlesource.com/my/repo'
3443 self.calls = [
3444 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3445 ((['git', 'config', 'branch.master.merge'],), 'master'),
3446 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3447 ((['git', 'config', 'remote.origin.url'],),
3448 '/cache/this-dir-exists'),
3449 (('os.path.isdir', '/cache/this-dir-exists'),
3450 True),
3451 # Runs in /cache/this-dir-exists.
3452 ((['git', 'config', 'remote.origin.url'],),
3453 url),
3454 ]
3455 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3456 self.assertEqual(cl.GetRemoteUrl(), url)
3457 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
3458
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003459 def test_gerrit_change_identifier_with_project(self):
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003460 self.calls = [
3461 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3462 ((['git', 'config', 'branch.master.merge'],), 'master'),
3463 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3464 ((['git', 'config', 'remote.origin.url'],),
3465 'https://chromium.googlesource.com/a/my/repo.git/'),
3466 ]
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003467 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3468 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
3469
3470 def test_gerrit_change_identifier_without_project(self):
3471 self.calls = [
3472 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3473 ((['git', 'config', 'branch.master.merge'],), 'master'),
3474 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3475 ((['git', 'config', 'remote.origin.url'],), CERR1),
3476 ]
3477 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3478 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003479
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003480
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003481if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003482 logging.basicConfig(
3483 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003484 unittest.main()