blob: 7addf2d7c18e79fda37027abe8fc03f20b6bc656 [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
Aaron Gable13101a62018-02-09 13:20:41 -0800768 def _upload_calls(cls, private):
769 return (cls._rietveld_git_base_calls() +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000770 cls._git_upload_calls(private))
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
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000812 def _git_upload_calls(cls, private):
813 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000814 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000815 private_call = []
816 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000817 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000818 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000819 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000820
maruel@chromium.orga3353652011-11-30 14:26:57 +0000821 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000823 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800825 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000826 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700827 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000828 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000829 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000830 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700831 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000832 ] + cls._git_post_upload_calls()
833
834 @classmethod
835 def _git_post_upload_calls(cls):
836 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000837 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
838 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
839 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000840 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000841 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000842 ]
843
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000844 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000845 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000846 fake_ancestor = 'fake_ancestor'
847 fake_cl = 'fake_cl_for_patch'
848 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000849 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000850 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000851 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000852 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000853 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000854 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000855 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000856 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700857 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000858 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000859 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000860 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000861 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000862 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000863 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000864 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000865 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000866 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000867 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000868 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000869
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000870 @staticmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800871 def _cmd_line(description, args, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000872 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000873 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800874 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000875 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000876 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800877 '--cc',
878 ','.join(
879 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
880 cc),
Aaron Gable13101a62018-02-09 13:20:41 -0800881 ] + (['--private'] if private else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000882
883 def _run_reviewer_test(
884 self,
885 upload_args,
886 expected_description,
887 returned_description,
888 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000889 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700890 private=False,
891 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000892 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000893 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org79540052012-10-19 23:15:26 +0000894
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000895 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700896 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000897
Aaron Gable13101a62018-02-09 13:20:41 -0800898 self.calls = self._upload_calls(private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000899
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000900 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000901 self.assertEquals(
902 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000903 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000904 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000905 '#--------------------This line is 72 characters long'
906 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000907 expected_description,
908 desc)
909 return returned_description
910 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000911
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000912 def check_upload(args):
Aaron Gable13101a62018-02-09 13:20:41 -0800913 cmd_line = self._cmd_line(final_description, reviewers, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000914 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000915 return 1, 2
916 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000917
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000918 git_cl.main(['upload'] + upload_args)
919
920 def test_no_reviewer(self):
921 self._run_reviewer_test(
922 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000923 'desc\n\nBUG=',
924 '# Blah blah comment.\ndesc\n\nBUG=',
925 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000926 [])
927
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000928 def test_private(self):
929 self._run_reviewer_test(
930 ['--private'],
931 'desc\n\nBUG=',
932 '# Blah blah comment.\ndesc\n\nBUG=\n',
933 'desc\n\nBUG=',
934 [])
935
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000936 def test_reviewers_cmd_line(self):
937 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000938 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000939 self._run_reviewer_test(
940 ['-r' 'foo@example.com'],
941 description,
942 '\n%s\n' % description,
943 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000944 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000945
946 def test_reviewer_tbr_overriden(self):
947 # Reviewer is overriden with TBR
948 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000949 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950 self._run_reviewer_test(
951 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000952 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000953 description.strip('\n'),
954 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000955 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956
957 def test_reviewer_multiple(self):
958 # Handles multiple R= or TBR= lines.
959 description = (
bradnelsond975b302016-10-23 12:20:23 -0700960 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
961 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000962 self._run_reviewer_test(
963 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000964 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000965 description,
966 description,
bradnelsond975b302016-10-23 12:20:23 -0700967 ['--reviewers=another@example.com,reviewer@example.com'],
968 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000969
maruel@chromium.orga3353652011-11-30 14:26:57 +0000970 def test_reviewer_send_mail(self):
971 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000972 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000973 self._run_reviewer_test(
974 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000975 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000976 description.strip('\n'),
977 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000978 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000979
980 def test_reviewer_send_mail_no_rev(self):
981 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000982 stdout = StringIO.StringIO()
Aaron Gable13101a62018-02-09 13:20:41 -0800983 self.calls = self._rietveld_upload_no_rev_calls() + [
tandriic2405f52016-10-10 08:13:15 -0700984 ((['DieWithError', 'Must specify reviewers to send email.'],),
985 SystemExitMock())
986 ]
987
988 def RunEditor(desc, _, **kwargs):
989 return desc
990 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
991 self.mock(sys, 'stdout', stdout)
992 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000993 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -0700994 self.assertEqual(
995 '=====================================\n'
996 'NOTICE: Rietveld is being deprecated. '
997 'You can upload changes to Gerrit with\n'
998 ' git cl upload --gerrit\n'
999 'or set Gerrit to be your default code review tool with\n'
1000 ' git config gerrit.host true\n'
1001 '=====================================\n',
1002 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001003
tandriif9aefb72016-07-01 09:06:51 -07001004 def test_bug_on_cmd(self):
1005 self._run_reviewer_test(
1006 ['--bug=500658,proj:123'],
1007 'desc\n\nBUG=500658\nBUG=proj:123',
1008 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1009 'desc\n\nBUG=500658\nBUG=proj:1234',
1010 [])
1011
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001012 def test_git_numberer_not_whitelisted_repo(self):
1013 self.calls = []
1014 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001015 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1016 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001017 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001018
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001019 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001020 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1021 self.calls = [
1022 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001023 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001024 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001025 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001026 remote_url='https://chromium.googlesource.com/chromium/src',
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_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001031 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001032 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001033 def fake_temporary_directory(**kwargs):
1034 yield tempdir
1035 self.mock(git_cl.gclient_utils, 'temporary_directory',
1036 fake_temporary_directory)
1037 self._test_GitNumbererState_valid_configs_inner(tempdir)
1038
1039 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001040 self.calls = [
1041 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001042 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001043 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1044 '''
1045 [plugin "git-numberer"]
1046 validate-enabled-refglob = refs/else/*
1047 validate-enabled-refglob = refs/heads/*
1048 validate-disabled-refglob = refs/heads/disabled
1049 validate-disabled-refglob = refs/branch-heads/*
1050 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001051 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1052 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001053 'refs/else/*\n'
1054 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001055 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1056 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001057 'refs/heads/disabled\n'
1058 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001059 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001060
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001061 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001062 remote_url='https://chromium.googlesource.com/chromium/src',
1063 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001064 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001065
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001066 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001067 remote_url='https://chromium.googlesource.com/chromium/src',
1068 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001069 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001070
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001071 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001072 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001073 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001074 remote_url='https://chromium.googlesource.com/chromium/src',
1075 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001076 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001077
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001078 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001079 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001080 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001081 if skip_auth_check:
1082 return [((cmd, ), 'true')]
1083
tandrii5d48c322016-08-18 16:19:37 -07001084 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001085 if issue:
1086 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001087 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001088 ])
1089 calls.extend([
1090 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1091 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1092 ((['git', 'config', 'remote.origin.url'],),
1093 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001094 ])
1095 return calls
1096
1097 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001098 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001099 fetched_status=None, other_cl_owner=None,
1100 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001101 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001102 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001103 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1104 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1105 ((['git', 'config', 'branch.master.gerritissue'],),
1106 CERR1 if issue is None else str(issue)),
1107 ]
1108
1109 if custom_cl_base:
1110 ancestor_revision = custom_cl_base
1111 else:
1112 # Determine ancestor_revision to be merge base.
1113 ancestor_revision = 'fake_ancestor_sha'
1114 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001115 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001116 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001117 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001118 'refs/remotes/origin/master'],), ancestor_revision),
1119 ]
1120
1121 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001122 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1123
1124 if issue:
1125 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001126 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001127 'my%2Frepo~123456',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001128 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001129 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001130 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001131 'change_id': '123456789',
1132 'current_revision': 'sha1_of_current_revision',
1133 'revisions': { 'sha1_of_current_revision': {
1134 'commit': {'message': fetched_description},
1135 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001136 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001137 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001138 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001139 if fetched_status == 'ABANDONED':
1140 calls += [
1141 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1142 '123456 has been abandoned, new uploads are not '
1143 'allowed'), SystemExitMock()),
1144 ]
1145 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001146 if other_cl_owner:
1147 calls += [
1148 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1149 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001150
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001151 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1152 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001153 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001154 ((['git', 'rev-parse', '--show-cdup'],), ''),
1155 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001156
Aaron Gable7817f022017-12-12 09:43:17 -08001157 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1158 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001159 'M\t.gitignore\n'),
1160 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001161 ]
1162
1163 if not issue:
1164 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001165 ((['git', 'log', '--pretty=format:%s%n%n%b',
1166 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001168 ]
1169
1170 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001171 ((['git', 'config', 'user.email'],), 'me@example.com'),
1172 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1173 ([custom_cl_base] if custom_cl_base else
1174 [ancestor_revision, 'HEAD']),),
1175 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001176 ]
1177 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001178
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001179 @classmethod
1180 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001181 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001182 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001183 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001184 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001185 custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001186 if post_amend_description is None:
1187 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001188 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001189 # Determined in `_gerrit_base_calls`.
1190 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1191
1192 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001193
tandriia60502f2016-06-20 02:01:53 -07001194 if squash_mode == 'default':
1195 calls.extend([
1196 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1197 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1198 ])
1199 elif squash_mode in ('override_squash', 'override_nosquash'):
1200 calls.extend([
1201 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1202 'true' if squash_mode == 'override_squash' else 'false'),
1203 ])
1204 else:
1205 assert squash_mode in ('squash', 'nosquash')
1206
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001207 # If issue is given, then description is fetched from Gerrit instead.
1208 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001209 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001210 ((['git', 'log', '--pretty=format:%s\n\n%b',
1211 ((custom_cl_base + '..') if custom_cl_base else
1212 'fake_ancestor_sha..HEAD')],),
1213 description),
1214 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001215 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001216 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001217 else:
1218 if not title:
1219 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001220 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1221 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001222 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001223 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001224 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001225 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001226 (('DownloadGerritHook', False), ''),
1227 # Amending of commit message to get the Change-Id.
1228 ((['git', 'log', '--pretty=format:%s\n\n%b',
1229 determined_ancestor_revision + '..HEAD'],),
1230 description),
1231 ((['git', 'commit', '--amend', '-m', description],), ''),
1232 ((['git', 'log', '--pretty=format:%s\n\n%b',
1233 determined_ancestor_revision + '..HEAD'],),
1234 post_amend_description)
1235 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001236 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001237 if not issue:
1238 # Prompting to edit description on first upload.
1239 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001240 ((['git', 'config', 'core.editor'],), ''),
1241 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001242 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001243 ref_to_push = 'abcdef0123456789'
1244 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001245 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1246 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1247 ]
1248
1249 if custom_cl_base is None:
1250 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001251 ((['get_or_create_merge_base', 'master',
1252 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001253 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001254 ]
1255 parent = 'origin/master'
1256 else:
1257 calls += [
1258 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1259 'refs/remotes/origin/master'],),
1260 callError(1)), # Means not ancenstor.
1261 (('ask_for_data',
1262 'Do you take responsibility for cleaning up potential mess '
1263 'resulting from proceeding with upload? Press Enter to upload, '
1264 'or Ctrl+C to abort'), ''),
1265 ]
1266 parent = custom_cl_base
1267
1268 calls += [
1269 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1270 '0123456789abcdef'),
1271 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001272 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001273 ref_to_push),
1274 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001275 else:
1276 ref_to_push = 'HEAD'
1277
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001278 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001279 ((['git', 'rev-list',
1280 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1281 ref_to_push],),
1282 '1hashPerLine\n'),
1283 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001284
Aaron Gableafd52772017-06-27 16:40:10 -07001285 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001286 ref_suffix = '%ready,notify=ALL'
1287 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001288 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001289 ref_suffix = '%wip'
1290 else:
1291 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001292
Aaron Gable70f4e242017-06-26 10:45:59 -07001293 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001294 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001295
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001296 calls.append((
1297 (['git', 'push',
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001298 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001299 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1300 ('remote:\n'
1301 'remote: Processing changes: (\)\n'
1302 'remote: Processing changes: (|)\n'
1303 'remote: Processing changes: (/)\n'
1304 'remote: Processing changes: (-)\n'
1305 'remote: Processing changes: new: 1 (/)\n'
1306 'remote: Processing changes: new: 1, done\n'
1307 'remote:\n'
1308 'remote: New Changes:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001309 'remote: https://chromium-review.googlesource.com/#/c/my/repo/+/123456'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001310 ' XXX\n'
1311 'remote:\n'
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001312 'To https://chromium.googlesource.com/my/repo\n'
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001313 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')
1314 ))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001315 if squash:
1316 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001317 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001318 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001319 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001320 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001321 ((['git', 'config', 'branch.master.gerritsquashhash',
1322 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001323 ]
tandrii88189772016-09-29 04:29:57 -07001324 calls += [
1325 ((['git', 'config', 'rietveld.cc'],), ''),
tandrii88189772016-09-29 04:29:57 -07001326 ]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001327 if squash:
1328 calls += [
1329 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001330 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001331 sorted(reviewers),
1332 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1333 cc, notify), ''),
1334 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001335 if tbr:
1336 calls += [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001337 (('GetChangeDetail', 'chromium-review.googlesource.com',
1338 'my%2Frepo~123456', ['LABELS']), {
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001339 'labels': {
1340 'Code-Review': {
1341 'default_value': 0,
1342 'all': [],
1343 'values': {
1344 '+2': 'lgtm, approved',
1345 '+1': 'lgtm, but someone else must approve',
1346 ' 0': 'No score',
1347 '-1': 'Don\'t submit as-is',
1348 }
1349 }
1350 }
1351 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001352 (('SetReview',
1353 'chromium-review.googlesource.com',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001354 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001355 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001356 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001357 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001358 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001359 return calls
1360
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001361 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001362 self,
1363 upload_args,
1364 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001365 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001366 squash=True,
1367 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001368 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001369 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001370 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001371 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001372 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001373 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001374 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001375 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001376 custom_cl_base=None,
1377 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001378 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001379 if squash_mode is None:
1380 if '--no-squash' in upload_args:
1381 squash_mode = 'nosquash'
1382 elif '--squash' in upload_args:
1383 squash_mode = 'squash'
1384 else:
1385 squash_mode = 'default'
1386
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001387 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001388 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001389 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001390 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001391 CookiesAuthenticatorMockFactory(
1392 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001393 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1394 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001395 self.mock(git_cl.gclient_utils, 'RunEditor',
1396 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001397 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1398 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001399
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001400 self.calls = self._gerrit_base_calls(
1401 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001402 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001403 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001404 other_cl_owner=other_cl_owner,
1405 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001406 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001407 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1408 expected_content=description))
1409 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001410 self.calls += self._gerrit_upload_calls(
1411 description, reviewers, squash,
1412 squash_mode=squash_mode,
1413 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001414 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001415 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001416 issue=issue, cc=cc,
Aaron Gablefd238082017-06-07 13:42:34 -07001417 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001418 # Uncomment when debugging.
1419 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001420 git_cl.main(['upload'] + upload_args)
1421
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001422 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001423 self._run_gerrit_upload_test(
1424 ['--no-squash'],
1425 'desc\n\nBUG=\n',
1426 [],
1427 squash=False,
1428 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1429
1430 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001431 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001432 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001433 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001434 [],
tandriia60502f2016-06-20 02:01:53 -07001435 squash=False,
1436 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001437 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001438
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001439 def test_gerrit_no_reviewer(self):
1440 self._run_gerrit_upload_test(
1441 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001442 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001443 [],
1444 squash=False,
1445 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001446
Nick Carter8692b182017-11-06 16:30:38 -08001447 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001448 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1449 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001450 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001451 'desc\n\nBUG=\n\nChange-Id: I123456789',
1452 squash=False,
1453 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001454 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001455
ukai@chromium.orge8077812012-02-03 03:41:46 +00001456 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001457 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001458 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001459 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001460 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001461 squash=False,
1462 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001463 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001464
1465 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001466 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001467 [],
bradnelsond975b302016-10-23 12:20:23 -07001468 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1469 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001470 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001471 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001472 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001473 cc=['more@example.com', 'people@example.com'],
1474 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001475
1476 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001477 self._run_gerrit_upload_test(
1478 [],
1479 'desc\nBUG=\n\nChange-Id: 123456789',
1480 [],
1481 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001482
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001483 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001484 self._run_gerrit_upload_test(
1485 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001486 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001487 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001488 squash=True,
1489 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001490
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001491 def test_gerrit_upload_squash_first_against_rev(self):
1492 custom_cl_base = 'custom_cl_base_rev_or_branch'
1493 self._run_gerrit_upload_test(
1494 ['--squash', custom_cl_base],
1495 'desc\nBUG=\n\nChange-Id: 123456789',
1496 [],
1497 squash=True,
1498 expected_upstream_ref='origin/master',
1499 custom_cl_base=custom_cl_base)
1500 self.assertIn(
1501 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1502 sys.stdout.getvalue())
1503
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001504 def test_gerrit_upload_squash_reupload(self):
1505 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001506 self._run_gerrit_upload_test(
1507 ['--squash'],
1508 description,
1509 [],
1510 squash=True,
1511 expected_upstream_ref='origin/master',
1512 issue=123456)
1513
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001514 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1515 self.mock(git_cl, 'DieWithError',
1516 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1517 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1518 with self.assertRaises(SystemExitMock):
1519 self._run_gerrit_upload_test(
1520 ['--squash'],
1521 description,
1522 [],
1523 squash=True,
1524 expected_upstream_ref='origin/master',
1525 issue=123456,
1526 fetched_status='ABANDONED')
1527
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001528 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1529 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1530 lambda *_, **__: {'email': 'yet-another@example.com'})
1531 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1532 self._run_gerrit_upload_test(
1533 ['--squash'],
1534 description,
1535 [],
1536 squash=True,
1537 expected_upstream_ref='origin/master',
1538 issue=123456,
1539 other_cl_owner='other@example.com')
1540 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001541 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001542 'authenticate to Gerrit as yet-another@example.com.\n'
1543 'Uploading may fail due to lack of permissions',
1544 git_cl.sys.stdout.getvalue())
1545
rmistry@google.com2dd99862015-06-22 12:22:18 +00001546 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001547 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001548 def mock_run_git(*args, **_kwargs):
1549 if args[0] == ['for-each-ref',
1550 '--format=%(refname:short) %(upstream:short)',
1551 'refs/heads']:
1552 # Create a local branch dependency tree that looks like this:
1553 # test1 -> test2 -> test3 -> test4 -> test5
1554 # -> test3.1
1555 # test6 -> test0
1556 branch_deps = [
1557 'test2 test1', # test1 -> test2
1558 'test3 test2', # test2 -> test3
1559 'test3.1 test2', # test2 -> test3.1
1560 'test4 test3', # test3 -> test4
1561 'test5 test4', # test4 -> test5
1562 'test6 test0', # test0 -> test6
1563 'test7', # test7
1564 ]
1565 return '\n'.join(branch_deps)
1566 self.mock(git_cl, 'RunGit', mock_run_git)
1567
1568 class RecordCalls:
1569 times_called = 0
1570 record_calls = RecordCalls()
1571 def mock_CMDupload(*args, **_kwargs):
1572 record_calls.times_called += 1
1573 return 0
1574 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1575
1576 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001577 (('ask_for_data', 'This command will checkout all dependent branches '
1578 'and run "git cl upload". Press Enter to continue, '
1579 'or Ctrl+C to abort'), ''),
1580 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001581
1582 class MockChangelist():
1583 def __init__(self):
1584 pass
1585 def GetBranch(self):
1586 return 'test1'
1587 def GetIssue(self):
1588 return '123'
1589 def GetPatchset(self):
1590 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001591 def IsGerrit(self):
1592 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001593
1594 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1595 # CMDupload should have been called 5 times because of 5 dependent branches.
1596 self.assertEquals(5, record_calls.times_called)
1597 self.assertEquals(0, ret)
1598
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001599 def test_gerrit_change_id(self):
1600 self.calls = [
1601 ((['git', 'write-tree'], ),
1602 'hashtree'),
1603 ((['git', 'rev-parse', 'HEAD~0'], ),
1604 'branch-parent'),
1605 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1606 'A B <a@b.org> 1456848326 +0100'),
1607 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1608 'C D <c@d.org> 1456858326 +0100'),
1609 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1610 'hashchange'),
1611 ]
1612 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1613 self.assertEqual(change_id, 'Ihashchange')
1614
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001615 def test_desecription_append_footer(self):
1616 for init_desc, footer_line, expected_desc in [
1617 # Use unique desc first lines for easy test failure identification.
1618 ('foo', 'R=one', 'foo\n\nR=one'),
1619 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1620 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1621 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1622 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1623 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1624 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1625 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1626 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1627 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1628 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1629 ]:
1630 desc = git_cl.ChangeDescription(init_desc)
1631 desc.append_footer(footer_line)
1632 self.assertEqual(desc.description, expected_desc)
1633
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001634 def test_update_reviewers(self):
1635 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001636 ('foo', [], [],
1637 'foo'),
1638 ('foo\nR=xx', [], [],
1639 'foo\nR=xx'),
1640 ('foo\nTBR=xx', [], [],
1641 'foo\nTBR=xx'),
1642 ('foo', ['a@c'], [],
1643 'foo\n\nR=a@c'),
1644 ('foo\nR=xx', ['a@c'], [],
1645 'foo\n\nR=a@c, xx'),
1646 ('foo\nTBR=xx', ['a@c'], [],
1647 'foo\n\nR=a@c\nTBR=xx'),
1648 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1649 'foo\n\nR=a@c, yy\nTBR=xx'),
1650 ('foo\nBUG=', ['a@c'], [],
1651 'foo\nBUG=\nR=a@c'),
1652 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1653 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1654 ('foo', ['a@c', 'b@c'], [],
1655 'foo\n\nR=a@c, b@c'),
1656 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1657 'foo\nBar\n\nR=c@c\nBUG='),
1658 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1659 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001660 # Same as the line before, but full of whitespaces.
1661 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001662 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001663 'foo\nBar\n\nR=c@c\n BUG =',
1664 ),
1665 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001666 ('foo BUG=allo R=joe ', ['c@c'], [],
1667 'foo BUG=allo R=joe\n\nR=c@c'),
1668 # Redundant TBRs get promoted to Rs
1669 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1670 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001671 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001672 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001673 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001674 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001675 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001676 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001677 actual.append(obj.description)
1678 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001679
Nodir Turakulov23b82142017-11-16 11:04:25 -08001680 def test_get_hash_tags(self):
1681 cases = [
1682 ('', []),
1683 ('a', []),
1684 ('[a]', ['a']),
1685 ('[aa]', ['aa']),
1686 ('[a ]', ['a']),
1687 ('[a- ]', ['a']),
1688 ('[a- b]', ['a-b']),
1689 ('[a--b]', ['a-b']),
1690 ('[a', []),
1691 ('[a]x', ['a']),
1692 ('[aa]x', ['aa']),
1693 ('[a b]', ['a-b']),
1694 ('[a b]', ['a-b']),
1695 ('[a__b]', ['a-b']),
1696 ('[a] x', ['a']),
1697 ('[a][b]', ['a', 'b']),
1698 ('[a] [b]', ['a', 'b']),
1699 ('[a][b]x', ['a', 'b']),
1700 ('[a][b] x', ['a', 'b']),
1701 ('[a]\n[b]', ['a']),
1702 ('[a\nb]', []),
1703 ('[a][', ['a']),
1704 ('Revert "[a] feature"', ['a']),
1705 ('Reland "[a] feature"', ['a']),
1706 ('Revert: [a] feature', ['a']),
1707 ('Reland: [a] feature', ['a']),
1708 ('Revert "Reland: [a] feature"', ['a']),
1709 ('Foo: feature', ['foo']),
1710 ('Foo Bar: feature', ['foo-bar']),
1711 ('Revert "Foo bar: feature"', ['foo-bar']),
1712 ('Reland "Foo bar: feature"', ['foo-bar']),
1713 ]
1714 for desc, expected in cases:
1715 change_desc = git_cl.ChangeDescription(desc)
1716 actual = change_desc.get_hash_tags()
1717 self.assertEqual(
1718 actual,
1719 expected,
1720 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1721
wittman@chromium.org455dc922015-01-26 20:15:50 +00001722 def test_get_target_ref(self):
1723 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001724 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001725 self.assertEqual(None, git_cl.GetTargetRef(None,
1726 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001727 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001728
wittman@chromium.org455dc922015-01-26 20:15:50 +00001729 # Check default target refs for branches.
1730 self.assertEqual('refs/heads/master',
1731 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001732 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001733 self.assertEqual('refs/heads/master',
1734 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001735 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001736 self.assertEqual('refs/heads/master',
1737 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001738 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001739 self.assertEqual('refs/branch-heads/123',
1740 git_cl.GetTargetRef('origin',
1741 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001742 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001743 self.assertEqual('refs/diff/test',
1744 git_cl.GetTargetRef('origin',
1745 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001746 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001747 self.assertEqual('refs/heads/chrome/m42',
1748 git_cl.GetTargetRef('origin',
1749 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001750 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001751
1752 # Check target refs for user-specified target branch.
1753 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1754 'refs/remotes/branch-heads/123'):
1755 self.assertEqual('refs/branch-heads/123',
1756 git_cl.GetTargetRef('origin',
1757 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001758 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001759 for branch in ('origin/master', 'remotes/origin/master',
1760 'refs/remotes/origin/master'):
1761 self.assertEqual('refs/heads/master',
1762 git_cl.GetTargetRef('origin',
1763 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001764 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001765 for branch in ('master', 'heads/master', 'refs/heads/master'):
1766 self.assertEqual('refs/heads/master',
1767 git_cl.GetTargetRef('origin',
1768 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001769 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001770
wychen@chromium.orga872e752015-04-28 23:42:18 +00001771 def test_patch_when_dirty(self):
1772 # Patch when local tree is dirty
1773 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1774 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1775
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001776 @staticmethod
1777 def _get_gerrit_codereview_server_calls(branch, value=None,
1778 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001779 detect_branch=True,
1780 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001781 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1782
1783 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1784 """
1785 calls = []
1786 if detect_branch:
1787 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001788 if detect_server:
1789 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1790 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001791 if value is None:
1792 calls += [
1793 ((['git', 'config', 'branch.' + branch + '.merge'],),
1794 'refs/heads' + branch),
1795 ((['git', 'config', 'branch.' + branch + '.remote'],),
1796 'origin'),
1797 ((['git', 'config', 'remote.origin.url'],),
1798 'https://%s.googlesource.com/my/repo' % git_short_host),
1799 ]
1800 return calls
1801
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001802 def _patch_common(self, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001803 new_branch=False, git_short_host='host',
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001804 detect_gerrit_server=False,
1805 actual_codereview=None,
1806 codereview_in_url=False):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001807 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001808 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1809 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001810 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001811 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001812 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1813
tandriidf09a462016-08-18 16:23:55 -07001814 if new_branch:
1815 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001816
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001817 if codereview_in_url and actual_codereview == 'rietveld':
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001818 self.calls += [
1819 ((['git', 'rev-parse', '--show-cdup'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001820 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001821 ]
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001822
1823 if not force_codereview and not codereview_in_url:
1824 # These calls detect codereview to use.
1825 self.calls += [
1826 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1827 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1828 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1829 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1830 ((['git', 'config', 'gerrit.host'],), 'true'),
1831 ]
1832 if detect_gerrit_server:
1833 self.calls += self._get_gerrit_codereview_server_calls(
1834 'master', git_short_host=git_short_host,
1835 detect_branch=not new_branch and force_codereview)
1836 actual_codereview = 'gerrit'
1837
1838 if actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001839 self.calls += [
1840 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001841 'my%2Frepo~123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001842 {
1843 'current_revision': '7777777777',
1844 'revisions': {
1845 '1111111111': {
1846 '_number': 1,
1847 'fetch': {'http': {
1848 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1849 'ref': 'refs/changes/56/123456/1',
1850 }},
1851 },
1852 '7777777777': {
1853 '_number': 7,
1854 'fetch': {'http': {
1855 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1856 'ref': 'refs/changes/56/123456/7',
1857 }},
1858 },
1859 },
1860 }),
1861 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001862
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001863 def test_patch_rietveld_guess_by_url(self):
1864 self._patch_common(actual_codereview='rietveld', codereview_in_url=True)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001865 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001866 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001867 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001868 ((['git', 'config', 'branch.master.rietveldserver',
1869 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001870 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001871 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001872 ((['git', 'commit', '-m',
1873 'Description\n\n' +
1874 'patch from issue 123456 at patchset 60001 ' +
1875 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001876 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001877 self.assertEqual(git_cl.main(
1878 ['patch', 'https://codereview.example.com/123456']), 0)
1879
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001880 def test_patch_gerrit_default(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001881 self._patch_common(git_short_host='chromium', detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001882 self.calls += [
1883 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1884 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001885 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001886 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001887 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001888 ((['git', 'config', 'branch.master.gerritserver',
1889 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001890 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001891 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1892 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1893 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001894 ]
1895 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1896
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001897 def test_patch_gerrit_new_branch(self):
1898 self._patch_common(
1899 git_short_host='chromium', detect_gerrit_server=True, new_branch=True)
1900 self.calls += [
1901 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1902 'refs/changes/56/123456/7'],), ''),
1903 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1904 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1905 ''),
1906 ((['git', 'config', 'branch.master.gerritserver',
1907 'https://chromium-review.googlesource.com'],), ''),
1908 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
1909 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1910 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1911 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1912 ]
1913 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1914
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001915 def test_patch_gerrit_force(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001916 self._patch_common(
1917 force_codereview=True, git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001918 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001919 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001920 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001921 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001922 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001923 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001924 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001925 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001926 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001927 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1928 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1929 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001930 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001931 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001932
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001933 def test_patch_gerrit_guess_by_url(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001934 self.calls += self._get_gerrit_codereview_server_calls(
1935 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001936 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001937 actual_codereview='gerrit', git_short_host='else',
1938 codereview_in_url=True, detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001939 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001940 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001941 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001942 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001943 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001944 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001945 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001946 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001947 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001948 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1949 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1950 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001951 ]
1952 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001953 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001954
Aaron Gable697a91b2018-01-19 15:20:15 -08001955 def test_patch_gerrit_guess_by_url_with_repo(self):
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00001956 self.calls += self._get_gerrit_codereview_server_calls(
1957 'master', git_short_host='else', detect_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001958 self._patch_common(
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001959 actual_codereview='gerrit', git_short_host='else',
1960 codereview_in_url=True, detect_gerrit_server=False)
Aaron Gable697a91b2018-01-19 15:20:15 -08001961 self.calls += [
1962 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1963 'refs/changes/56/123456/1'],), ''),
1964 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
1965 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1966 ''),
1967 ((['git', 'config', 'branch.master.gerritserver',
1968 'https://else-review.googlesource.com'],), ''),
1969 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
1970 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1971 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1972 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
1973 ]
1974 self.assertEqual(git_cl.main(
1975 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1976 0)
1977
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001978 def test_patch_gerrit_conflict(self):
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001979 self._patch_common(detect_gerrit_server=True, git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001980 self.calls += [
1981 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001982 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001983 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1984 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1985 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001986 ]
1987 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001988 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001989
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001990 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001991 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001992 raise git_cl.gerrit_util.GerritError(404, '')
1993 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1994
tandriic2405f52016-10-10 08:13:15 -07001995 self.calls = [
1996 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07001997 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1998 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1999 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2000 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002001 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2002 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2003 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2004 ((['git', 'config', 'remote.origin.url'],),
2005 'https://chromium.googlesource.com/my/repo'),
2006 ((['DieWithError',
2007 'change 123456 at https://chromium-review.googlesource.com does not '
2008 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002009 ]
2010 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002011 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002012
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002013 def _checkout_calls(self):
2014 return [
2015 ((['git', 'config', '--local', '--get-regexp',
2016 'branch\\..*\\.rietveldissue'], ),
2017 ('branch.retrying.rietveldissue 1111111111\n'
2018 'branch.some-fix.rietveldissue 2222222222\n')),
2019 ((['git', 'config', '--local', '--get-regexp',
2020 'branch\\..*\\.gerritissue'], ),
2021 ('branch.ger-branch.gerritissue 123456\n'
2022 'branch.gbranch654.gerritissue 654321\n')),
2023 ]
2024
2025 def test_checkout_gerrit(self):
2026 """Tests git cl checkout <issue>."""
2027 self.calls = self._checkout_calls()
2028 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2029 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2030
2031 def test_checkout_rietveld(self):
2032 """Tests git cl checkout <issue>."""
2033 self.calls = self._checkout_calls()
2034 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2035 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2036
2037 def test_checkout_not_found(self):
2038 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002039 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002040 self.calls = self._checkout_calls()
2041 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2042
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002043 def test_checkout_no_branch_issues(self):
2044 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002045 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002046 self.calls = [
2047 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002048 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002049 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002050 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002051 ]
2052 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2053
tandrii@chromium.org28253532016-04-14 13:46:56 +00002054 def _test_gerrit_ensure_authenticated_common(self, auth,
2055 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002056 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2057 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2058 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002059 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002060 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002061 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002062 cl.branch = 'master'
2063 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002064 cl.lookedup_issue = True
2065 return cl
2066
2067 def test_gerrit_ensure_authenticated_missing(self):
2068 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002069 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002070 })
2071 self.calls.append(
2072 ((['DieWithError',
2073 'Credentials for the following hosts are required:\n'
2074 ' chromium-review.googlesource.com\n'
2075 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002076 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002077 'https://chromium-review.googlesource.com/new-password'],), ''),)
2078 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2079
2080 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002081 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002082 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002083 'chromium.googlesource.com':
2084 ('git-one.example.com', None, 'secret1'),
2085 'chromium-review.googlesource.com':
2086 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002087 })
2088 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002089 (('ask_for_data', 'If you know what you are doing '
2090 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002091 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2092
2093 def test_gerrit_ensure_authenticated_ok(self):
2094 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002095 'chromium.googlesource.com':
2096 ('git-same.example.com', None, 'secret'),
2097 'chromium-review.googlesource.com':
2098 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002099 })
2100 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2101
tandrii@chromium.org28253532016-04-14 13:46:56 +00002102 def test_gerrit_ensure_authenticated_skipped(self):
2103 cl = self._test_gerrit_ensure_authenticated_common(
2104 auth={}, skip_auth_check=True)
2105 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2106
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002107 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002108 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2109 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002110 self.calls = [
2111 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002112 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002113 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2114 ((['git', 'config', 'rietveld.server'],), ''),
2115 ((['git', 'config', 'rietveld.server'],), ''),
2116 ((['git', 'config', 'branch.feature.rietveldserver'],),
2117 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002118 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002119 ]
2120 self.assertEqual(0, git_cl.main(['set-commit']))
2121
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002122 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002123 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002124 lambda h, i, labels, notify=None:
2125 self._mocked_call(['SetReview', h, i, labels, notify]))
2126
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002127 self.calls = [
2128 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002129 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2130 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002131 ((['git', 'config', 'branch.feature.gerritserver'],),
2132 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002133 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
2134 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2135 ((['git', 'config', 'remote.origin.url'],),
2136 'https://chromium.googlesource.com/infra/infra.git'),
2137 ((['SetReview', 'chromium-review.googlesource.com',
2138 'infra%2Finfra~123',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002139 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002140 ]
tandriid9e5ce52016-07-13 02:32:59 -07002141
2142 def test_cmd_set_commit_gerrit_clear(self):
2143 self._cmd_set_commit_gerrit_common(0)
2144 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2145
2146 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002147 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002148 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2149
tandriid9e5ce52016-07-13 02:32:59 -07002150 def test_cmd_set_commit_gerrit(self):
2151 self._cmd_set_commit_gerrit_common(2)
2152 self.assertEqual(0, git_cl.main(['set-commit']))
2153
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002154 def test_description_display(self):
2155 out = StringIO.StringIO()
2156 self.mock(git_cl.sys, 'stdout', out)
2157
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002158 self.mock(git_cl, 'Changelist', ChangelistMock)
2159 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002160
2161 self.assertEqual(0, git_cl.main(['description', '-d']))
2162 self.assertEqual('foo\n', out.getvalue())
2163
2164 def test_description_rietveld(self):
2165 out = StringIO.StringIO()
2166 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002167 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002168
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002169 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002170 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002171 self.assertEqual('foobar\n', out.getvalue())
2172
iannucci3c972b92016-08-17 13:24:10 -07002173 def test_StatusFieldOverrideIssueMissingArgs(self):
2174 out = StringIO.StringIO()
2175 self.mock(git_cl.sys, 'stderr', out)
2176
2177 try:
2178 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2179 except SystemExit as ex:
2180 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002181 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002182
2183 out = StringIO.StringIO()
2184 self.mock(git_cl.sys, 'stderr', out)
2185
2186 try:
2187 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2188 except SystemExit as ex:
2189 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002190 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002191
2192 def test_StatusFieldOverrideIssue(self):
2193 out = StringIO.StringIO()
2194 self.mock(git_cl.sys, 'stdout', out)
2195
2196 def assertIssue(cl_self, *_args):
2197 self.assertEquals(cl_self.issue, 1)
2198 return 'foobar'
2199
2200 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2201 self.calls = [
2202 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2203 ((['git', 'config', 'rietveld.server'],), ''),
2204 ((['git', 'config', 'rietveld.server'],), ''),
2205 ]
iannuccie53c9352016-08-17 14:40:40 -07002206 self.assertEqual(
2207 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2208 0)
iannucci3c972b92016-08-17 13:24:10 -07002209 self.assertEqual(out.getvalue(), 'foobar\n')
2210
iannuccie53c9352016-08-17 14:40:40 -07002211 def test_SetCloseOverrideIssue(self):
2212 def assertIssue(cl_self, *_args):
2213 self.assertEquals(cl_self.issue, 1)
2214 return 'foobar'
2215
2216 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2217 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2218 self.calls = [
2219 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2220 ((['git', 'config', 'rietveld.server'],), ''),
2221 ((['git', 'config', 'rietveld.server'],), ''),
2222 ]
2223 self.assertEqual(
2224 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2225
2226 def test_SetCommitOverrideIssue(self):
2227 def assertIssue(cl_self, *_args):
2228 self.assertEquals(cl_self.issue, 1)
2229 return 'foobar'
2230
2231 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2232 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2233 self.calls = [
2234 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2235 ((['git', 'config', 'rietveld.server'],), ''),
2236 ((['git', 'config', 'rietveld.server'],), ''),
2237 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2238 ((['git', 'config', 'rietveld.server'],), ''),
2239 ((['git', 'config', 'rietveld.server'],), ''),
2240 ]
2241 self.assertEqual(
2242 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2243
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002244 def test_description_gerrit(self):
2245 out = StringIO.StringIO()
2246 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002247 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002248 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2249 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2250 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2251 ((['git', 'config', 'remote.origin.url'],),
2252 'https://chromium.googlesource.com/my/repo'),
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002253 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002254 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002255 {
2256 'current_revision': 'sha1',
2257 'revisions': {'sha1': {
2258 'commit': {'message': 'foobar'},
2259 }},
2260 }),
2261 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002262 self.assertEqual(0, git_cl.main([
2263 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2264 self.assertEqual('foobar\n', out.getvalue())
2265
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002266 def test_description_set_raw(self):
2267 out = StringIO.StringIO()
2268 self.mock(git_cl.sys, 'stdout', out)
2269
2270 self.mock(git_cl, 'Changelist', ChangelistMock)
2271 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2272
2273 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2274 self.assertEqual('hihi', ChangelistMock.desc)
2275
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002276 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002277 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002278
2279 def RunEditor(desc, _, **kwargs):
2280 self.assertEquals(
2281 '# Enter a description of the change.\n'
2282 '# This will be displayed on the codereview site.\n'
2283 '# The first line will also be used as the subject of the review.\n'
2284 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002285 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002286 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002287 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002288 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002289 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002290
dsansomee2d6fd92016-09-08 00:10:47 -07002291 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002292 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002293
2294 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2295 self.mock(git_cl.Changelist, 'GetDescription',
2296 lambda *args: current_desc)
2297 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2298 UpdateDescriptionRemote)
2299 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2300
2301 self.calls = [
2302 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002303 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002304 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2305 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002306 ((['git', 'config', 'core.editor'],), 'vi'),
2307 ]
2308 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2309
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002310 def test_description_set_stdin(self):
2311 out = StringIO.StringIO()
2312 self.mock(git_cl.sys, 'stdout', out)
2313
2314 self.mock(git_cl, 'Changelist', ChangelistMock)
2315 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2316
2317 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2318 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2319
kmarshall3bff56b2016-06-06 18:31:47 -07002320 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002321 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2322
kmarshall3bff56b2016-06-06 18:31:47 -07002323 self.calls = \
2324 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2325 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002326 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002327 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2328 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002329 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2330 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2331 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002332 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2333 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2334 ((['git', 'branch', '-D', 'foo'],), '')]
2335
kmarshall3bff56b2016-06-06 18:31:47 -07002336 self.mock(git_cl, 'get_cl_statuses',
2337 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002338 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2339 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2340 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002341
2342 self.assertEqual(0, git_cl.main(['archive', '-f']))
2343
2344 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002345 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002346 self.calls = \
2347 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2348 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002349 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002350 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2351 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002352 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2353
kmarshall9249e012016-08-23 12:02:16 -07002354 self.mock(git_cl, 'get_cl_statuses',
2355 lambda branches, fine_grained, max_processes:
2356 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2357
2358 self.assertEqual(1, git_cl.main(['archive', '-f']))
2359
2360 def test_archive_dry_run(self):
2361 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2362
2363 self.calls = \
2364 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2365 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2366 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2367 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2368 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2369 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2370 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2371 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2372 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002373
2374 self.mock(git_cl, 'get_cl_statuses',
2375 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002376 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2377 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2378 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002379
kmarshall9249e012016-08-23 12:02:16 -07002380 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2381
2382 def test_archive_no_tags(self):
2383 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2384
2385 self.calls = \
2386 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2387 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2388 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2389 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2390 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2391 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2392 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2393 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2394 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2395 ((['git', 'branch', '-D', 'foo'],), '')]
2396
2397 self.mock(git_cl, 'get_cl_statuses',
2398 lambda branches, fine_grained, max_processes:
2399 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2400 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2401 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2402
2403 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002404
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002405 def test_cmd_issue_erase_existing(self):
2406 out = StringIO.StringIO()
2407 self.mock(git_cl.sys, 'stdout', out)
2408 self.calls = [
2409 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002410 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2411 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002412 # Let this command raise exception (retcode=1) - it should be ignored.
2413 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002414 CERR1),
2415 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2416 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002417 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2418 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2419 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002420 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002421 ]
2422 self.assertEqual(0, git_cl.main(['issue', '0']))
2423
Aaron Gable400e9892017-07-12 15:31:21 -07002424 def test_cmd_issue_erase_existing_with_change_id(self):
2425 out = StringIO.StringIO()
2426 self.mock(git_cl.sys, 'stdout', out)
2427 self.mock(git_cl.Changelist, 'GetDescription',
2428 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2429 self.calls = [
2430 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2431 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2432 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002433 # Let this command raise exception (retcode=1) - it should be ignored.
2434 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2435 CERR1),
2436 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2437 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2438 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2439 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2440 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002441 ((['git', 'log', '-1', '--format=%B'],),
2442 'This is a description\n\nChange-Id: Ideadbeef'),
2443 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002444 ]
2445 self.assertEqual(0, git_cl.main(['issue', '0']))
2446
phajdan.jre328cf92016-08-22 04:12:17 -07002447 def test_cmd_issue_json(self):
2448 out = StringIO.StringIO()
2449 self.mock(git_cl.sys, 'stdout', out)
2450 self.calls = [
2451 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002452 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002453 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2454 ((['git', 'config', 'rietveld.server'],),
2455 'https://codereview.chromium.org'),
2456 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2457 (('write_json', 'output.json',
2458 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2459 ''),
2460 ]
2461 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2462
tandriide281ae2016-10-12 06:02:30 -07002463 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002464 self.mock(git_cl.Changelist, 'GetChange',
2465 lambda _, *a: (
2466 self._mocked_call(['GetChange']+list(a))))
2467 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2468 lambda *_, **__: (
2469 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002470 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2471 lambda _, s: self._mocked_call(['SetCQState', s]))
2472 self.calls = [
2473 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002474 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002475 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2476 ((['git', 'config', 'rietveld.server'],),
2477 'https://codereview.chromium.org'),
2478 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2479 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2480 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2481 ((['get_or_create_merge_base', 'feature', 'feature'],),
2482 'fake_ancestor_sha'),
2483 ((['GetChange', 'fake_ancestor_sha', None], ),
2484 git_cl.presubmit_support.GitChange(
2485 '', '', '', '', '', '', '', '')),
2486 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2487 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002488 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2489 ]
2490 out = StringIO.StringIO()
2491 self.mock(git_cl.sys, 'stdout', out)
2492 self.assertEqual(0, git_cl.main(['try']))
2493 self.assertEqual(
2494 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002495 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002496
tandrii8c5a3532016-11-04 07:52:02 -07002497 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2498 self.mock(git_cl.Changelist, 'GetChange',
2499 lambda _, *a: (
2500 self._mocked_call(['GetChange']+list(a))))
2501 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2502 lambda *_, **__: (
2503 self._mocked_call(['DoGetTryMasters'])))
2504 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2505 lambda _, s: self._mocked_call(['SetCQState', s]))
2506
tandrii8c5a3532016-11-04 07:52:02 -07002507 self.calls = [
2508 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2509 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2510 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2511 ((['git', 'config', 'branch.feature.gerritserver'],),
2512 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002513 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2514 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2515 ((['git', 'config', 'remote.origin.url'],),
2516 'https://chromium.googlesource.com/depot_tools'),
2517 (('GetChangeDetail', 'chromium-review.googlesource.com',
2518 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002519 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2520 'project': 'depot_tools',
2521 'status': 'OPEN',
2522 'owner': {'email': 'owner@e.mail'},
2523 'revisions': {
2524 'deadbeaf': {
2525 '_number': 6,
2526 },
2527 'beeeeeef': {
2528 '_number': 7,
2529 'fetch': {'http': {
2530 'url': 'https://chromium.googlesource.com/depot_tools',
2531 'ref': 'refs/changes/56/123456/7'
2532 }},
2533 },
2534 },
2535 }),
tandrii8c5a3532016-11-04 07:52:02 -07002536 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2537 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2538 ((['get_or_create_merge_base', 'feature', 'feature'],),
2539 'fake_ancestor_sha'),
2540 ((['GetChange', 'fake_ancestor_sha', None], ),
2541 git_cl.presubmit_support.GitChange(
2542 '', '', '', '', '', '', '', '')),
2543 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2544 ((['DoGetTryMasters'], ), None),
2545 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2546 ]
2547 out = StringIO.StringIO()
2548 self.mock(git_cl.sys, 'stdout', out)
2549 self.assertEqual(0, git_cl.main(['try']))
2550 self.assertEqual(
2551 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002552 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002553 'https://chromium-review.googlesource.com/123456\n')
2554
2555 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2556 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2557 lambda _: {
2558 'owner_email': 'owner@e.mail',
2559 'private': False,
2560 'closed': False,
2561 'project': 'depot_tools',
2562 'patchsets': [20001],
2563 })
tandriide281ae2016-10-12 06:02:30 -07002564 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2565 self.calls = [
2566 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2567 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2568 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2569 ((['git', 'config', 'rietveld.server'],),
2570 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002571 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002572 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002573 ]
2574
2575 def _buildbucket_retry(*_, **kw):
2576 # self.maxDiff = 10000
2577 body = json.loads(kw['body'])
2578 self.assertEqual(len(body['builds']), 1)
2579 build = body['builds'][0]
2580 params = json.loads(build.pop('parameters_json'))
2581 self.assertEqual(params, {
2582 u'builder_name': u'win',
2583 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2584 u'revision': None}],
2585 u'properties': {
2586 u'category': u'git_cl_try',
2587 u'issue': 123,
2588 u'key': u'val',
2589 u'json': [{u'a': 1}, None],
2590 u'master': u'tryserver.chromium',
2591 u'patch_project': u'depot_tools',
2592 u'patch_storage': u'rietveld',
2593 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002594 u'rietveld': u'https://codereview.chromium.org',
2595 }
2596 })
2597 self.assertEqual(build, {
2598 u'bucket': u'master.tryserver.chromium',
2599 u'client_operation_id': u'uuid4',
2600 u'tags': [u'builder:win',
2601 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002602 u'user_agent:git_cl_try',
2603 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002604 })
2605
2606 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2607
2608 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2609 self.assertEqual(0, git_cl.main([
2610 'try', '-m', 'tryserver.chromium', '-b', 'win',
2611 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2612 self.assertRegexpMatches(
2613 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002614 'Tried jobs on:\nBucket: master.tryserver.chromium')
2615
tandrii8c5a3532016-11-04 07:52:02 -07002616 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2617 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2618 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2619
tandrii8c5a3532016-11-04 07:52:02 -07002620 self.calls = [
2621 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2622 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2623 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2624 ((['git', 'config', 'branch.feature.gerritserver'],),
2625 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002626 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2627 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2628 ((['git', 'config', 'remote.origin.url'],),
2629 'https://chromium.googlesource.com/depot_tools'),
2630 (('GetChangeDetail', 'chromium-review.googlesource.com',
2631 'depot_tools~123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002632 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002633 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002634 'status': 'OPEN',
2635 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002636 'revisions': {
2637 'deadbeaf': {
2638 '_number': 6,
2639 },
2640 'beeeeeef': {
2641 '_number': 7,
2642 'fetch': {'http': {
2643 'url': 'https://chromium.googlesource.com/depot_tools',
2644 'ref': 'refs/changes/56/123456/7'
2645 }},
2646 },
2647 },
2648 }),
2649 ]
2650
2651 def _buildbucket_retry(*_, **kw):
2652 # self.maxDiff = 10000
2653 body = json.loads(kw['body'])
2654 self.assertEqual(len(body['builds']), 1)
2655 build = body['builds'][0]
2656 params = json.loads(build.pop('parameters_json'))
2657 self.assertEqual(params, {
2658 u'builder_name': u'win',
2659 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2660 u'revision': None}],
2661 u'properties': {
2662 u'category': u'git_cl_try',
2663 u'key': u'val',
2664 u'json': [{u'a': 1}, None],
2665 u'master': u'tryserver.chromium',
2666
2667 u'patch_gerrit_url':
2668 u'https://chromium-review.googlesource.com',
2669 u'patch_issue': 123456,
2670 u'patch_project': u'depot_tools',
2671 u'patch_ref': u'refs/changes/56/123456/7',
2672 u'patch_repository_url':
2673 u'https://chromium.googlesource.com/depot_tools',
2674 u'patch_set': 7,
2675 u'patch_storage': u'gerrit',
2676 }
2677 })
2678 self.assertEqual(build, {
2679 u'bucket': u'master.tryserver.chromium',
2680 u'client_operation_id': u'uuid4',
2681 u'tags': [
2682 u'builder:win',
2683 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2684 u'user_agent:git_cl_try',
2685 u'master:tryserver.chromium'],
2686 })
2687
2688 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2689
2690 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2691 self.assertEqual(0, git_cl.main([
2692 'try', '-m', 'tryserver.chromium', '-b', 'win',
2693 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2694 self.assertRegexpMatches(
2695 git_cl.sys.stdout.getvalue(),
2696 'Tried jobs on:\nBucket: master.tryserver.chromium')
2697
borenet6c0efe62016-10-19 08:13:29 -07002698 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002699 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2700 lambda _: {
2701 'owner_email': 'owner@e.mail',
2702 'private': False,
2703 'closed': False,
2704 'project': 'depot_tools',
2705 'patchsets': [20001],
2706 })
borenet6c0efe62016-10-19 08:13:29 -07002707 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2708 self.calls = [
2709 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2710 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2711 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2712 ((['git', 'config', 'rietveld.server'],),
2713 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002714 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002715 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002716 ]
2717
2718 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002719 body = json.loads(kw['body'])
2720 self.assertEqual(len(body['builds']), 1)
2721 build = body['builds'][0]
2722 params = json.loads(build.pop('parameters_json'))
2723 self.assertEqual(params, {
2724 u'builder_name': u'win',
2725 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2726 u'revision': None}],
2727 u'properties': {
2728 u'category': u'git_cl_try',
2729 u'issue': 123,
2730 u'patch_project': u'depot_tools',
2731 u'patch_storage': u'rietveld',
2732 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002733 u'rietveld': u'https://codereview.chromium.org',
2734 }
2735 })
2736 self.assertEqual(build, {
2737 u'bucket': u'test.bucket',
2738 u'client_operation_id': u'uuid4',
2739 u'tags': [u'builder:win',
2740 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2741 u'user_agent:git_cl_try'],
2742 })
2743
2744 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2745
2746 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2747 self.assertEqual(0, git_cl.main([
2748 'try', '-B', 'test.bucket', '-b', 'win']))
2749 self.assertRegexpMatches(
2750 git_cl.sys.stdout.getvalue(),
2751 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002752
qyearsley123a4682016-10-26 09:12:17 -07002753 def test_git_cl_try_bots_on_multiple_masters(self):
2754 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2755 self.calls = [
2756 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2757 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2758 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2759 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002760 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002761 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2762 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2763 ]
2764
2765 def _buildbucket_retry(*_, **kw):
2766 body = json.loads(kw['body'])
2767 self.assertEqual(len(body['builds']), 2)
2768
Nodir Turakulovb422e682018-02-20 22:51:30 -08002769 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2770 params = json.loads(body['builds'][0]['parameters_json'])
2771 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002772
Nodir Turakulovb422e682018-02-20 22:51:30 -08002773 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2774 params = json.loads(body['builds'][1]['parameters_json'])
2775 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002776
2777 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2778
2779 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002780 json.dumps({
2781 'builder1': {'bucket': 'bucket1'},
2782 'builder2': {'bucket': 'bucket2'},
2783 })))
qyearsley123a4682016-10-26 09:12:17 -07002784
2785 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2786 self.assertEqual(
2787 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2788 self.assertEqual(
2789 git_cl.sys.stdout.getvalue(),
2790 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002791 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002792 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002793 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002794 ' builder2: []\n'
2795 'To see results here, run: git cl try-results\n'
2796 'To see results in browser, run: git cl web\n')
2797
tandrii16e0b4e2016-06-07 10:34:28 -07002798 def _common_GerritCommitMsgHookCheck(self):
2799 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2800 self.mock(git_cl.os.path, 'abspath',
2801 lambda path: self._mocked_call(['abspath', path]))
2802 self.mock(git_cl.os.path, 'exists',
2803 lambda path: self._mocked_call(['exists', path]))
2804 self.mock(git_cl.gclient_utils, 'FileRead',
2805 lambda path: self._mocked_call(['FileRead', path]))
2806 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2807 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2808 self.calls = [
2809 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2810 ((['abspath', '../'],), '/abs/git_repo_root'),
2811 ]
2812 return git_cl.Changelist(codereview='gerrit', issue=123)
2813
2814 def test_GerritCommitMsgHookCheck_custom_hook(self):
2815 cl = self._common_GerritCommitMsgHookCheck()
2816 self.calls += [
2817 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2818 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2819 '#!/bin/sh\necho "custom hook"')
2820 ]
2821 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2822
2823 def test_GerritCommitMsgHookCheck_not_exists(self):
2824 cl = self._common_GerritCommitMsgHookCheck()
2825 self.calls += [
2826 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2827 ]
2828 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2829
2830 def test_GerritCommitMsgHookCheck(self):
2831 cl = self._common_GerritCommitMsgHookCheck()
2832 self.calls += [
2833 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2834 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2835 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002836 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002837 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2838 ''),
2839 ]
2840 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2841
tandriic4344b52016-08-29 06:04:54 -07002842 def test_GerritCmdLand(self):
2843 self.calls += [
2844 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2845 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2846 'deadbeaf'),
2847 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2848 ((['git', 'config', 'branch.feature.gerritserver'],),
2849 'chromium-review.googlesource.com'),
2850 ]
2851 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2852 cl._codereview_impl._GetChangeDetail = lambda _: {
2853 'labels': {},
2854 'current_revision': 'deadbeaf',
2855 }
agable32978d92016-11-01 12:55:02 -07002856 cl._codereview_impl._GetChangeCommit = lambda: {
2857 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002858 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002859 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2860 }
tandriic4344b52016-08-29 06:04:54 -07002861 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002862 out = StringIO.StringIO()
2863 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002864 self.assertEqual(0, cl.CMDLand(force=True,
2865 bypass_hooks=True,
2866 verbose=True,
2867 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002868 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002869 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002870
tandrii221ab252016-10-06 08:12:04 -07002871 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002872 '9000': {
2873 'id': '9000',
2874 'bucket': 'master.x.y',
2875 'created_by': 'user:someone@chromium.org',
2876 'created_ts': '147200002222000',
2877 'experimental': False,
2878 'parameters_json': json.dumps({
2879 'builder_name': 'my-bot',
2880 'properties': {'category': 'cq'},
2881 }),
2882 'status': 'STARTED',
2883 'tags': [
2884 'build_address:x.y/my-bot/2',
2885 'builder:my-bot',
2886 'experimental:false',
2887 'user_agent:cq',
2888 ],
2889 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2890 },
2891 '8000': {
2892 'id': '8000',
2893 'bucket': 'master.x.y',
2894 'created_by': 'user:someone@chromium.org',
2895 'created_ts': '147200001111000',
2896 'experimental': False,
2897 'failure_reason': 'BUILD_FAILURE',
2898 'parameters_json': json.dumps({
2899 'builder_name': 'my-bot',
2900 'properties': {'category': 'cq'},
2901 }),
2902 'result_details_json': json.dumps({
2903 'properties': {'buildnumber': 1},
2904 }),
2905 'result': 'FAILURE',
2906 'status': 'COMPLETED',
2907 'tags': [
2908 'build_address:x.y/my-bot/1',
2909 'builder:my-bot',
2910 'experimental:false',
2911 'user_agent:cq',
2912 ],
2913 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2914 },
2915 }
tandrii221ab252016-10-06 08:12:04 -07002916
2917 def test_write_try_results_json(self):
2918 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002919 {
2920 'bucket': 'master.x.y',
2921 'buildbucket_id': '8000',
2922 'builder_name': 'my-bot',
2923 'created_ts': '147200001111000',
2924 'experimental': False,
2925 'failure_reason': 'BUILD_FAILURE',
2926 'result': 'FAILURE',
2927 'status': 'COMPLETED',
2928 'tags': [
2929 'build_address:x.y/my-bot/1',
2930 'builder:my-bot',
2931 'experimental:false',
2932 'user_agent:cq',
2933 ],
2934 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2935 },
2936 {
2937 'bucket': 'master.x.y',
2938 'buildbucket_id': '9000',
2939 'builder_name': 'my-bot',
2940 'created_ts': '147200002222000',
2941 'experimental': False,
2942 'failure_reason': None,
2943 'result': None,
2944 'status': 'STARTED',
2945 'tags': [
2946 'build_address:x.y/my-bot/2',
2947 'builder:my-bot',
2948 'experimental:false',
2949 'user_agent:cq',
2950 ],
2951 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2952 },
tandrii221ab252016-10-06 08:12:04 -07002953 ]
2954 self.calls = [(('write_json', 'output.json', expected_output), '')]
2955 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2956
tandrii45b2a582016-10-11 03:14:16 -07002957 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002958 out = StringIO.StringIO()
2959 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002960 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2961 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002962 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2963 self._mocked_call(['get_authenticator_for_host', host]))
2964 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2965 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002966
2967 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2968 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002969 self.calls += [
2970 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2971 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2972 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2973 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2974 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2975 ((['git', 'config', 'branch.feature.rietveldserver'],),
2976 'codereview.example.com'),
2977 ((['get_authenticator_for_host', 'codereview.example.com'],),
2978 AuthenticatorMock()),
2979 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2980
2981 def test_fetch_try_jobs_none_rietveld(self):
2982 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002983 # Simulate that user isn't logged in.
2984 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002985 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002986 self.assertRegexpMatches(sys.stdout.getvalue(),
2987 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002988 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2989
2990 def test_fetch_try_jobs_some_rietveld(self):
2991 self._setup_fetch_try_jobs_rietveld({
2992 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2993 })
2994 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002995 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2996 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2997 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2998
2999 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3000 self._setup_fetch_try_jobs(most_recent_patchset=13)
3001 self.calls += [
3002 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3003 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3004 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003005 # TODO(tandrii): Uncomment the below if we decide to support checking
3006 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003007 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003008 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003009 ((['git', 'config', 'branch.feature.gerritserver'],),
3010 'https://x-review.googlesource.com'),
3011 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3012 AuthenticatorMock()),
3013 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3014
3015 def test_fetch_try_jobs_none_gerrit(self):
3016 self._setup_fetch_try_jobs_gerrit({})
3017 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003018 # TODO(tandrii): Uncomment the below if we decide to support checking
3019 # patchsets for Gerrit.
3020 # self.assertRegexpMatches(
3021 # sys.stdout.getvalue(),
3022 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003023 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3024
3025 def test_fetch_try_jobs_some_gerrit(self):
3026 self._setup_fetch_try_jobs_gerrit({
3027 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3028 })
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.calls.remove(
3032 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003033 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3034
3035 # ... and doesn't result in warning.
3036 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3037 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003038 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3039 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3040
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003041 def _mock_gerrit_changes_for_detail_cache(self):
3042 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003043
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003044 def test_gerrit_change_detail_cache_simple(self):
3045 self._mock_gerrit_changes_for_detail_cache()
3046 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003047 (('GetChangeDetail', 'host', 'my%2Frepo~1', []), 'a'),
3048 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b'),
3049 (('GetChangeDetail', 'host', 'ab%2Frepo~2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003050 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003051 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003052 cl1._cached_remote_url = (
3053 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003054 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003055 cl2._cached_remote_url = (
3056 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003057 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
3058 self.assertEqual(cl1._GetChangeDetail(), 'a')
3059 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
3060 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
3061 self.assertEqual(cl1._GetChangeDetail(), 'a')
3062 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003063
3064 def test_gerrit_change_detail_cache_options(self):
3065 self._mock_gerrit_changes_for_detail_cache()
3066 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003067 (('GetChangeDetail', 'host', 'repo~1', ['C', 'A', 'B']), 'cab'),
3068 (('GetChangeDetail', 'host', 'repo~1', ['A', 'D']), 'ad'),
3069 (('GetChangeDetail', 'host', 'repo~1', ['A']), 'a'), # no_cache=True
3070 # no longer in cache.
3071 (('GetChangeDetail', 'host', 'repo~1', ['B']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003072 ]
3073 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003074 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003075 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3076 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3077 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3078 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3079 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3080 self.assertEqual(cl._GetChangeDetail(), 'cab')
3081
3082 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3083 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3084 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3085 self.assertEqual(cl._GetChangeDetail(), 'cab')
3086
3087 # Finally, no_cache should invalidate all caches for given change.
3088 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3089 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3090
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003091 def test_gerrit_description_caching(self):
3092 def gen_detail(rev, desc):
3093 return {
3094 'current_revision': rev,
3095 'revisions': {rev: {'commit': {'message': desc}}}
3096 }
3097 self.calls = [
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003098 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003099 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3100 gen_detail('rev1', 'desc1')),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003101 (('GetChangeDetail', 'host', 'my%2Frepo~1',
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003102 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3103 gen_detail('rev2', 'desc2')),
3104 ]
3105
3106 self._mock_gerrit_changes_for_detail_cache()
3107 cl = git_cl.Changelist(issue=1, codereview='gerrit')
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003108 cl._cached_remote_url = (
3109 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003110 self.assertEqual(cl.GetDescription(), 'desc1')
3111 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3112 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003113
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003114 def test_print_current_creds(self):
3115 class CookiesAuthenticatorMock(object):
3116 def __init__(self):
3117 self.gitcookies = {
3118 'host.googlesource.com': ('user', 'pass'),
3119 'host-review.googlesource.com': ('user', 'pass'),
3120 }
3121 self.netrc = self
3122 self.netrc.hosts = {
3123 'github.com': ('user2', None, 'pass2'),
3124 'host2.googlesource.com': ('user3', None, 'pass'),
3125 }
3126 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3127 CookiesAuthenticatorMock)
3128 self.mock(sys, 'stdout', StringIO.StringIO())
3129 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3130 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3131 ' Host\t User\t Which file',
3132 '============================\t=====\t===========',
3133 'host-review.googlesource.com\t user\t.gitcookies',
3134 ' host.googlesource.com\t user\t.gitcookies',
3135 ' host2.googlesource.com\tuser3\t .netrc',
3136 ])
3137 sys.stdout.buf = ''
3138 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3139 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3140 ' Host\tUser\t Which file',
3141 '============================\t====\t===========',
3142 'host-review.googlesource.com\tuser\t.gitcookies',
3143 ' host.googlesource.com\tuser\t.gitcookies',
3144 ])
3145
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003146 def _common_creds_check_mocks(self):
3147 def exists_mock(path):
3148 dirname = os.path.dirname(path)
3149 if dirname == os.path.expanduser('~'):
3150 dirname = '~'
3151 base = os.path.basename(path)
3152 if base in ('.netrc', '.gitcookies'):
3153 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3154 # git cl also checks for existence other files not relevant to this test.
3155 return None
3156 self.mock(os.path, 'exists', exists_mock)
3157 self.mock(sys, 'stdout', StringIO.StringIO())
3158
3159 def test_creds_check_gitcookies_not_configured(self):
3160 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003161 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003162 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003163 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003164 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003165 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3166 (('os.path.exists', '~/.netrc'), True),
3167 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3168 'or Ctrl+C to abort'), ''),
3169 ((['git', 'config', '--global', 'http.cookiefile',
3170 os.path.expanduser('~/.gitcookies')], ), ''),
3171 ]
3172 self.assertEqual(0, git_cl.main(['creds-check']))
3173 self.assertRegexpMatches(
3174 sys.stdout.getvalue(),
3175 '^You seem to be using outdated .netrc for git credentials:')
3176 self.assertRegexpMatches(
3177 sys.stdout.getvalue(),
3178 '\nConfigured git to use .gitcookies from')
3179
3180 def test_creds_check_gitcookies_configured_custom_broken(self):
3181 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003182 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003183 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003184 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003185 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003186 ((['git', 'config', '--global', 'http.cookiefile'],),
3187 '/custom/.gitcookies'),
3188 (('os.path.exists', '/custom/.gitcookies'), False),
3189 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3190 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3191 ((['git', 'config', '--global', 'http.cookiefile',
3192 os.path.expanduser('~/.gitcookies')], ), ''),
3193 ]
3194 self.assertEqual(0, git_cl.main(['creds-check']))
3195 self.assertRegexpMatches(
3196 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003197 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003198 self.assertRegexpMatches(
3199 sys.stdout.getvalue(),
3200 'However, your configured .gitcookies file is missing.')
3201
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003202 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003203 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003204 lambda _, message, publish: self._mocked_call(
3205 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003206 self.calls = [
3207 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3208 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003209 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003210 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003211 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3212 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003213
3214 def test_git_cl_comment_add_gerrit(self):
3215 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003216 lambda host, change, msg, ready:
3217 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003218 self.calls = [
3219 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3220 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3221 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3222 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3223 'origin/master'),
3224 ((['git', 'config', 'remote.origin.url'],),
3225 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003226 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
3227 'msg', None),
Aaron Gable636b13f2017-07-14 10:42:48 -07003228 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003229 ]
3230 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3231 '-a', 'msg']))
3232
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003233 def test_git_cl_comments_fetch_rietveld(self):
3234 self.mock(sys, 'stdout', StringIO.StringIO())
3235 self.calls = [
3236 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3237 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3238 ] * 2
3239 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3240 'messages': [
3241 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3242 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3243 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3244 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3245 # Intentionally wrong order here.
3246 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3247 'disapproval': False, 'approval': False,
3248 'sender': 'owner@example.com'},
3249 ],
3250 'owner_email': 'owner@example.com',
3251 })
3252 expected_comments_summary = [
3253 git_cl._CommentSummary(
3254 message='lgtm',
3255 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3256 disapproval=False, approval=True, sender='r@example.com'),
3257 git_cl._CommentSummary(
3258 message='not lgtm',
3259 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3260 disapproval=True, approval=False, sender='r2@example.com'),
3261 # Note: same order as in whatever Rietveld returns.
3262 git_cl._CommentSummary(
3263 message='PTAL',
3264 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3265 disapproval=False, approval=False, sender='owner@example.com'),
3266 ]
3267 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3268 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3269
3270 with git_cl.gclient_utils.temporary_directory() as tempdir:
3271 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3272 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3273 '-j', out_file]))
3274 with open(out_file) as f:
3275 read = json.load(f)
3276 self.assertEqual(len(read), 3)
3277 self.assertEqual(read[0], {
3278 'date': '2000-03-13 20:49:34.515270',
3279 'message': 'PTAL',
3280 'approval': False,
3281 'disapproval': False,
3282 'sender': 'owner@example.com'})
3283 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3284 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3285
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003286 def test_git_cl_comments_fetch_gerrit(self):
3287 self.mock(sys, 'stdout', StringIO.StringIO())
3288 self.calls = [
3289 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3290 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3291 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3292 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3293 'origin/master'),
3294 ((['git', 'config', 'remote.origin.url'],),
3295 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00003296 (('GetChangeDetail', 'chromium-review.googlesource.com',
3297 'infra%2Finfra~1',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003298 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003299 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003300 'messages': [
3301 {
3302 u'_revision_number': 1,
3303 u'author': {
3304 u'_account_id': 1111084,
3305 u'email': u'commit-bot@chromium.org',
3306 u'name': u'Commit Bot'
3307 },
3308 u'date': u'2017-03-15 20:08:45.000000000',
3309 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003310 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003311 u'tag': u'autogenerated:cq:dry-run'
3312 },
3313 {
3314 u'_revision_number': 2,
3315 u'author': {
3316 u'_account_id': 11151243,
3317 u'email': u'owner@example.com',
3318 u'name': u'owner'
3319 },
3320 u'date': u'2017-03-16 20:00:41.000000000',
3321 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3322 u'message': u'PTAL',
3323 },
3324 {
3325 u'_revision_number': 2,
3326 u'author': {
3327 u'_account_id': 148512 ,
3328 u'email': u'reviewer@example.com',
3329 u'name': u'reviewer'
3330 },
3331 u'date': u'2017-03-17 05:19:37.500000000',
3332 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3333 u'message': u'Patch Set 2: Code-Review+1',
3334 },
3335 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003336 }),
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003337 (('GetChangeComments', 'chromium-review.googlesource.com',
3338 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003339 '/COMMIT_MSG': [
3340 {
3341 'author': {'email': u'reviewer@example.com'},
3342 'updated': u'2017-03-17 05:19:37.500000000',
3343 'patch_set': 2,
3344 'side': 'REVISION',
3345 'message': 'Please include a bug link',
3346 },
3347 ],
3348 'codereview.settings': [
3349 {
3350 'author': {'email': u'owner@example.com'},
3351 'updated': u'2017-03-16 20:00:41.000000000',
3352 'patch_set': 2,
3353 'side': 'PARENT',
3354 'line': 42,
3355 'message': 'I removed this because it is bad',
3356 },
3357 ]
3358 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003359 ] * 2
3360 expected_comments_summary = [
3361 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003362 message=(
3363 u'PTAL\n' +
3364 u'\n' +
3365 u'codereview.settings\n' +
3366 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3367 u'c/1/2/codereview.settings#b42\n' +
3368 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003369 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3370 disapproval=False, approval=False, sender=u'owner@example.com'),
3371 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003372 message=(
3373 u'Patch Set 2: Code-Review+1\n' +
3374 u'\n' +
3375 u'/COMMIT_MSG\n' +
3376 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3377 u'c/1/2//COMMIT_MSG#\n' +
3378 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003379 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3380 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3381 ]
3382 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3383 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3384
3385 with git_cl.gclient_utils.temporary_directory() as tempdir:
3386 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3387 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3388 '-j', out_file]))
3389 with open(out_file) as f:
3390 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003391 self.assertEqual(len(read), 2)
3392 self.assertEqual(read[0], {
3393 u'date': u'2017-03-16 20:00:41.000000',
3394 u'message': (
3395 u'PTAL\n' +
3396 u'\n' +
3397 u'codereview.settings\n' +
3398 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3399 u'c/1/2/codereview.settings#b42\n' +
3400 u' I removed this because it is bad\n'),
3401 u'approval': False,
3402 u'disapproval': False,
3403 u'sender': u'owner@example.com'})
3404 self.assertEqual(read[1], {
3405 u'date': u'2017-03-17 05:19:37.500000',
3406 u'message': (
3407 u'Patch Set 2: Code-Review+1\n' +
3408 u'\n' +
3409 u'/COMMIT_MSG\n' +
3410 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3411 u'c/1/2//COMMIT_MSG#\n' +
3412 u' Please include a bug link\n'),
3413 u'approval': False,
3414 u'disapproval': False,
3415 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003416
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003417 def test_get_remote_url_with_mirror(self):
3418 original_os_path_isdir = os.path.isdir
3419 def selective_os_path_isdir_mock(path):
3420 if path == '/cache/this-dir-exists':
3421 return self._mocked_call('os.path.isdir', path)
3422 return original_os_path_isdir(path)
3423 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
3424
3425 url = 'https://chromium.googlesource.com/my/repo'
3426 self.calls = [
3427 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3428 ((['git', 'config', 'branch.master.merge'],), 'master'),
3429 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3430 ((['git', 'config', 'remote.origin.url'],),
3431 '/cache/this-dir-exists'),
3432 (('os.path.isdir', '/cache/this-dir-exists'),
3433 True),
3434 # Runs in /cache/this-dir-exists.
3435 ((['git', 'config', 'remote.origin.url'],),
3436 url),
3437 ]
3438 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3439 self.assertEqual(cl.GetRemoteUrl(), url)
3440 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
3441
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003442 def test_gerrit_change_identifier_with_project(self):
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003443 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 'https://chromium.googlesource.com/a/my/repo.git/'),
3449 ]
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00003450 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3451 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
3452
3453 def test_gerrit_change_identifier_without_project(self):
3454 self.calls = [
3455 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
3456 ((['git', 'config', 'branch.master.merge'],), 'master'),
3457 ((['git', 'config', 'branch.master.remote'],), 'origin'),
3458 ((['git', 'config', 'remote.origin.url'],), CERR1),
3459 ]
3460 cl = git_cl.Changelist(codereview='gerrit', issue=123456)
3461 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00003462
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003463
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003464if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003465 logging.basicConfig(
3466 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003467 unittest.main()