blob: 524ec140cfa3a472f126a4329a2c1b8b1cf17e3b [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'),
1094 ((['git', 'config', 'remote.origin.url'],),
1095 'https://chromium.googlesource.com/my/repo'),
1096 ])
1097 return calls
1098
1099 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001100 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001101 fetched_status=None, other_cl_owner=None,
1102 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001103 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001104 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001105 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1106 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1107 ((['git', 'config', 'branch.master.gerritissue'],),
1108 CERR1 if issue is None else str(issue)),
1109 ]
1110
1111 if custom_cl_base:
1112 ancestor_revision = custom_cl_base
1113 else:
1114 # Determine ancestor_revision to be merge base.
1115 ancestor_revision = 'fake_ancestor_sha'
1116 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001117 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001118 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001119 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001120 'refs/remotes/origin/master'],), ancestor_revision),
1121 ]
1122
1123 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001124 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1125
1126 if issue:
1127 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001128 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001129 '123456',
1130 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001131 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001132 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001133 'change_id': '123456789',
1134 'current_revision': 'sha1_of_current_revision',
1135 'revisions': { 'sha1_of_current_revision': {
1136 'commit': {'message': fetched_description},
1137 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001138 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001139 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001140 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001141 if fetched_status == 'ABANDONED':
1142 calls += [
1143 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1144 '123456 has been abandoned, new uploads are not '
1145 'allowed'), SystemExitMock()),
1146 ]
1147 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001148 if other_cl_owner:
1149 calls += [
1150 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1151 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001152
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001153 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1154 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001155 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001156 ((['git', 'rev-parse', '--show-cdup'],), ''),
1157 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001158
Aaron Gable7817f022017-12-12 09:43:17 -08001159 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1160 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001161 'M\t.gitignore\n'),
1162 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001163 ]
1164
1165 if not issue:
1166 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001167 ((['git', 'log', '--pretty=format:%s%n%n%b',
1168 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001169 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001170 ]
1171
1172 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001173 ((['git', 'config', 'user.email'],), 'me@example.com'),
1174 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1175 ([custom_cl_base] if custom_cl_base else
1176 [ancestor_revision, 'HEAD']),),
1177 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001178 ]
1179 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001180
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001181 @classmethod
1182 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001183 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001184 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001185 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001186 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001187 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001188 if post_amend_description is None:
1189 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001190 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001191 # Determined in `_gerrit_base_calls`.
1192 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1193
1194 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001195
tandriia60502f2016-06-20 02:01:53 -07001196 if squash_mode == 'default':
1197 calls.extend([
1198 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1199 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1200 ])
1201 elif squash_mode in ('override_squash', 'override_nosquash'):
1202 calls.extend([
1203 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1204 'true' if squash_mode == 'override_squash' else 'false'),
1205 ])
1206 else:
1207 assert squash_mode in ('squash', 'nosquash')
1208
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001209 # If issue is given, then description is fetched from Gerrit instead.
1210 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001211 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001212 ((['git', 'log', '--pretty=format:%s\n\n%b',
1213 ((custom_cl_base + '..') if custom_cl_base else
1214 'fake_ancestor_sha..HEAD')],),
1215 description),
1216 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001217 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001218 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001219 else:
1220 if not title:
1221 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001222 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1223 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001224 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001225 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001226 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001227 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001228 (('DownloadGerritHook', False), ''),
1229 # Amending of commit message to get the Change-Id.
1230 ((['git', 'log', '--pretty=format:%s\n\n%b',
1231 determined_ancestor_revision + '..HEAD'],),
1232 description),
1233 ((['git', 'commit', '--amend', '-m', description],), ''),
1234 ((['git', 'log', '--pretty=format:%s\n\n%b',
1235 determined_ancestor_revision + '..HEAD'],),
1236 post_amend_description)
1237 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001238 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001239 if not issue:
1240 # Prompting to edit description on first upload.
1241 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001242 ((['git', 'config', 'core.editor'],), ''),
1243 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001244 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001245 ref_to_push = 'abcdef0123456789'
1246 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001247 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1248 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1249 ]
1250
1251 if custom_cl_base is None:
1252 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001253 ((['get_or_create_merge_base', 'master',
1254 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001255 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001256 ]
1257 parent = 'origin/master'
1258 else:
1259 calls += [
1260 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1261 'refs/remotes/origin/master'],),
1262 callError(1)), # Means not ancenstor.
1263 (('ask_for_data',
1264 'Do you take responsibility for cleaning up potential mess '
1265 'resulting from proceeding with upload? Press Enter to upload, '
1266 'or Ctrl+C to abort'), ''),
1267 ]
1268 parent = custom_cl_base
1269
1270 calls += [
1271 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1272 '0123456789abcdef'),
1273 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001274 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001275 ref_to_push),
1276 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001277 else:
1278 ref_to_push = 'HEAD'
1279
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001280 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001281 ((['git', 'rev-list',
1282 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1283 ref_to_push],),
1284 '1hashPerLine\n'),
1285 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001286
Aaron Gableafd52772017-06-27 16:40:10 -07001287 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001288 ref_suffix = '%ready,notify=ALL'
1289 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001290 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001291 ref_suffix = '%wip'
1292 else:
1293 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001294
Aaron Gable70f4e242017-06-26 10:45:59 -07001295 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001296 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001297
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001298 if git_mirror is None:
1299 calls += [
1300 ((['git', 'config', 'remote.origin.url'],),
1301 'https://chromium.googlesource.com/yyy/zzz'),
1302 ]
1303 else:
1304 calls += [
1305 ((['git', 'config', 'remote.origin.url'],),
1306 '/cache/this-dir-exists'),
1307 (('os.path.isdir', '/cache/this-dir-exists'),
1308 True),
1309 # Runs in /cache/this-dir-exists.
1310 ((['git', 'config', 'remote.origin.url'],),
1311 'https://chromium.googlesource.com/yyy/zzz'),
1312 ]
1313
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001314 calls.append((
1315 (['git', 'push',
1316 'https://chromium.googlesource.com/yyy/zzz',
1317 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1318 ('remote:\n'
1319 'remote: Processing changes: (\)\n'
1320 'remote: Processing changes: (|)\n'
1321 'remote: Processing changes: (/)\n'
1322 'remote: Processing changes: (-)\n'
1323 'remote: Processing changes: new: 1 (/)\n'
1324 'remote: Processing changes: new: 1, done\n'
1325 'remote:\n'
1326 'remote: New Changes:\n'
1327 'remote: https://chromium-review.googlesource.com/#/c/yyy/zzz/+/123456'
1328 ' XXX\n'
1329 'remote:\n'
1330 'To https://chromium.googlesource.com/yyy/zzz\n'
1331 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')
1332 ))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001333 if squash:
1334 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001335 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001336 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001337 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001338 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001339 ((['git', 'config', 'branch.master.gerritsquashhash',
1340 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001341 ]
tandrii88189772016-09-29 04:29:57 -07001342 calls += [
1343 ((['git', 'config', 'rietveld.cc'],), ''),
tandrii88189772016-09-29 04:29:57 -07001344 ]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001345 if squash:
1346 calls += [
1347 (('AddReviewers',
1348 'chromium-review.googlesource.com', 'yyy%2Fzzz~123456',
1349 sorted(reviewers),
1350 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1351 cc, notify), ''),
1352 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001353 if tbr:
1354 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001355 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1356 ['LABELS']), {
1357 'labels': {
1358 'Code-Review': {
1359 'default_value': 0,
1360 'all': [],
1361 'values': {
1362 '+2': 'lgtm, approved',
1363 '+1': 'lgtm, but someone else must approve',
1364 ' 0': 'No score',
1365 '-1': 'Don\'t submit as-is',
1366 }
1367 }
1368 }
1369 }),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001370 (('SetReview',
1371 'chromium-review.googlesource.com',
1372 'yyy%2Fzzz~123456',
1373 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001374 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001375 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001376 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001377 return calls
1378
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001379 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001380 self,
1381 upload_args,
1382 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001383 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001384 squash=True,
1385 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001386 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001387 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001388 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001389 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001390 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001391 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001392 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001393 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001394 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001395 custom_cl_base=None,
1396 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001397 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001398 if squash_mode is None:
1399 if '--no-squash' in upload_args:
1400 squash_mode = 'nosquash'
1401 elif '--squash' in upload_args:
1402 squash_mode = 'squash'
1403 else:
1404 squash_mode = 'default'
1405
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001406 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001407 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001408 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001409 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001410 CookiesAuthenticatorMockFactory(
1411 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001412 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1413 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001414 self.mock(git_cl.gclient_utils, 'RunEditor',
1415 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001416 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1417 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001418
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001419 original_os_path_isdir = os.path.isdir
1420 def selective_os_path_isdir_mock(path):
1421 if path == '/cache/this-dir-exists':
1422 return self._mocked_call('os.path.isdir', path)
1423 return original_os_path_isdir(path)
1424 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1425
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001426 self.calls = self._gerrit_base_calls(
1427 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001428 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001429 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001430 other_cl_owner=other_cl_owner,
1431 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001432 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001433 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1434 expected_content=description))
1435 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001436 self.calls += self._gerrit_upload_calls(
1437 description, reviewers, squash,
1438 squash_mode=squash_mode,
1439 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001440 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001441 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001442 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001443 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001444 # Uncomment when debugging.
1445 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001446 git_cl.main(['upload'] + upload_args)
1447
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001448 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001449 self._run_gerrit_upload_test(
1450 ['--no-squash'],
1451 'desc\n\nBUG=\n',
1452 [],
1453 squash=False,
1454 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1455
1456 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001457 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001458 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001459 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001460 [],
tandriia60502f2016-06-20 02:01:53 -07001461 squash=False,
1462 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001463 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001464
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001465 def test_gerrit_no_reviewer(self):
1466 self._run_gerrit_upload_test(
1467 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001468 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001469 [],
1470 squash=False,
1471 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001472
Nick Carter8692b182017-11-06 16:30:38 -08001473 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001474 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1475 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001476 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001477 'desc\n\nBUG=\n\nChange-Id: I123456789',
1478 squash=False,
1479 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001480 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001481
ukai@chromium.orge8077812012-02-03 03:41:46 +00001482 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001483 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001484 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001485 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001486 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001487 squash=False,
1488 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001489 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001490
1491 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001492 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001493 [],
bradnelsond975b302016-10-23 12:20:23 -07001494 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1495 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001496 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001497 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001498 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001499 cc=['more@example.com', 'people@example.com'],
1500 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001501
1502 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001503 self._run_gerrit_upload_test(
1504 [],
1505 'desc\nBUG=\n\nChange-Id: 123456789',
1506 [],
1507 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001508
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001509 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001510 self._run_gerrit_upload_test(
1511 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001512 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001513 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001514 squash=True,
1515 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001516
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001517 def test_gerrit_upload_squash_first_against_rev(self):
1518 custom_cl_base = 'custom_cl_base_rev_or_branch'
1519 self._run_gerrit_upload_test(
1520 ['--squash', custom_cl_base],
1521 'desc\nBUG=\n\nChange-Id: 123456789',
1522 [],
1523 squash=True,
1524 expected_upstream_ref='origin/master',
1525 custom_cl_base=custom_cl_base)
1526 self.assertIn(
1527 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1528 sys.stdout.getvalue())
1529
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001530 def test_gerrit_upload_squash_first_with_mirror(self):
1531 self._run_gerrit_upload_test(
1532 ['--squash'],
1533 'desc\nBUG=\n\nChange-Id: 123456789',
1534 [],
1535 squash=True,
1536 expected_upstream_ref='origin/master',
1537 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1538
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001539 def test_gerrit_upload_squash_reupload(self):
1540 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001541 self._run_gerrit_upload_test(
1542 ['--squash'],
1543 description,
1544 [],
1545 squash=True,
1546 expected_upstream_ref='origin/master',
1547 issue=123456)
1548
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001549 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1550 self.mock(git_cl, 'DieWithError',
1551 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1552 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1553 with self.assertRaises(SystemExitMock):
1554 self._run_gerrit_upload_test(
1555 ['--squash'],
1556 description,
1557 [],
1558 squash=True,
1559 expected_upstream_ref='origin/master',
1560 issue=123456,
1561 fetched_status='ABANDONED')
1562
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001563 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1564 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1565 lambda *_, **__: {'email': 'yet-another@example.com'})
1566 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1567 self._run_gerrit_upload_test(
1568 ['--squash'],
1569 description,
1570 [],
1571 squash=True,
1572 expected_upstream_ref='origin/master',
1573 issue=123456,
1574 other_cl_owner='other@example.com')
1575 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001576 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001577 'authenticate to Gerrit as yet-another@example.com.\n'
1578 'Uploading may fail due to lack of permissions',
1579 git_cl.sys.stdout.getvalue())
1580
rmistry@google.com2dd99862015-06-22 12:22:18 +00001581 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001582 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001583 def mock_run_git(*args, **_kwargs):
1584 if args[0] == ['for-each-ref',
1585 '--format=%(refname:short) %(upstream:short)',
1586 'refs/heads']:
1587 # Create a local branch dependency tree that looks like this:
1588 # test1 -> test2 -> test3 -> test4 -> test5
1589 # -> test3.1
1590 # test6 -> test0
1591 branch_deps = [
1592 'test2 test1', # test1 -> test2
1593 'test3 test2', # test2 -> test3
1594 'test3.1 test2', # test2 -> test3.1
1595 'test4 test3', # test3 -> test4
1596 'test5 test4', # test4 -> test5
1597 'test6 test0', # test0 -> test6
1598 'test7', # test7
1599 ]
1600 return '\n'.join(branch_deps)
1601 self.mock(git_cl, 'RunGit', mock_run_git)
1602
1603 class RecordCalls:
1604 times_called = 0
1605 record_calls = RecordCalls()
1606 def mock_CMDupload(*args, **_kwargs):
1607 record_calls.times_called += 1
1608 return 0
1609 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1610
1611 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001612 (('ask_for_data', 'This command will checkout all dependent branches '
1613 'and run "git cl upload". Press Enter to continue, '
1614 'or Ctrl+C to abort'), ''),
1615 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001616
1617 class MockChangelist():
1618 def __init__(self):
1619 pass
1620 def GetBranch(self):
1621 return 'test1'
1622 def GetIssue(self):
1623 return '123'
1624 def GetPatchset(self):
1625 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001626 def IsGerrit(self):
1627 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001628
1629 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1630 # CMDupload should have been called 5 times because of 5 dependent branches.
1631 self.assertEquals(5, record_calls.times_called)
1632 self.assertEquals(0, ret)
1633
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001634 def test_gerrit_change_id(self):
1635 self.calls = [
1636 ((['git', 'write-tree'], ),
1637 'hashtree'),
1638 ((['git', 'rev-parse', 'HEAD~0'], ),
1639 'branch-parent'),
1640 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1641 'A B <a@b.org> 1456848326 +0100'),
1642 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1643 'C D <c@d.org> 1456858326 +0100'),
1644 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1645 'hashchange'),
1646 ]
1647 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1648 self.assertEqual(change_id, 'Ihashchange')
1649
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001650 def test_desecription_append_footer(self):
1651 for init_desc, footer_line, expected_desc in [
1652 # Use unique desc first lines for easy test failure identification.
1653 ('foo', 'R=one', 'foo\n\nR=one'),
1654 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1655 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1656 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1657 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1658 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1659 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1660 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1661 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1662 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1663 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1664 ]:
1665 desc = git_cl.ChangeDescription(init_desc)
1666 desc.append_footer(footer_line)
1667 self.assertEqual(desc.description, expected_desc)
1668
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001669 def test_update_reviewers(self):
1670 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001671 ('foo', [], [],
1672 'foo'),
1673 ('foo\nR=xx', [], [],
1674 'foo\nR=xx'),
1675 ('foo\nTBR=xx', [], [],
1676 'foo\nTBR=xx'),
1677 ('foo', ['a@c'], [],
1678 'foo\n\nR=a@c'),
1679 ('foo\nR=xx', ['a@c'], [],
1680 'foo\n\nR=a@c, xx'),
1681 ('foo\nTBR=xx', ['a@c'], [],
1682 'foo\n\nR=a@c\nTBR=xx'),
1683 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1684 'foo\n\nR=a@c, yy\nTBR=xx'),
1685 ('foo\nBUG=', ['a@c'], [],
1686 'foo\nBUG=\nR=a@c'),
1687 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1688 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1689 ('foo', ['a@c', 'b@c'], [],
1690 'foo\n\nR=a@c, b@c'),
1691 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1692 'foo\nBar\n\nR=c@c\nBUG='),
1693 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1694 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001695 # Same as the line before, but full of whitespaces.
1696 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001697 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001698 'foo\nBar\n\nR=c@c\n BUG =',
1699 ),
1700 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001701 ('foo BUG=allo R=joe ', ['c@c'], [],
1702 'foo BUG=allo R=joe\n\nR=c@c'),
1703 # Redundant TBRs get promoted to Rs
1704 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1705 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001706 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001707 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001708 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001709 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001710 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001711 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001712 actual.append(obj.description)
1713 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001714
Nodir Turakulov23b82142017-11-16 11:04:25 -08001715 def test_get_hash_tags(self):
1716 cases = [
1717 ('', []),
1718 ('a', []),
1719 ('[a]', ['a']),
1720 ('[aa]', ['aa']),
1721 ('[a ]', ['a']),
1722 ('[a- ]', ['a']),
1723 ('[a- b]', ['a-b']),
1724 ('[a--b]', ['a-b']),
1725 ('[a', []),
1726 ('[a]x', ['a']),
1727 ('[aa]x', ['aa']),
1728 ('[a b]', ['a-b']),
1729 ('[a b]', ['a-b']),
1730 ('[a__b]', ['a-b']),
1731 ('[a] x', ['a']),
1732 ('[a][b]', ['a', 'b']),
1733 ('[a] [b]', ['a', 'b']),
1734 ('[a][b]x', ['a', 'b']),
1735 ('[a][b] x', ['a', 'b']),
1736 ('[a]\n[b]', ['a']),
1737 ('[a\nb]', []),
1738 ('[a][', ['a']),
1739 ('Revert "[a] feature"', ['a']),
1740 ('Reland "[a] feature"', ['a']),
1741 ('Revert: [a] feature', ['a']),
1742 ('Reland: [a] feature', ['a']),
1743 ('Revert "Reland: [a] feature"', ['a']),
1744 ('Foo: feature', ['foo']),
1745 ('Foo Bar: feature', ['foo-bar']),
1746 ('Revert "Foo bar: feature"', ['foo-bar']),
1747 ('Reland "Foo bar: feature"', ['foo-bar']),
1748 ]
1749 for desc, expected in cases:
1750 change_desc = git_cl.ChangeDescription(desc)
1751 actual = change_desc.get_hash_tags()
1752 self.assertEqual(
1753 actual,
1754 expected,
1755 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1756
wittman@chromium.org455dc922015-01-26 20:15:50 +00001757 def test_get_target_ref(self):
1758 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001759 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001760 self.assertEqual(None, git_cl.GetTargetRef(None,
1761 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001762 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001763
wittman@chromium.org455dc922015-01-26 20:15:50 +00001764 # Check default target refs for branches.
1765 self.assertEqual('refs/heads/master',
1766 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001767 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001768 self.assertEqual('refs/heads/master',
1769 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001770 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001771 self.assertEqual('refs/heads/master',
1772 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001773 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001774 self.assertEqual('refs/branch-heads/123',
1775 git_cl.GetTargetRef('origin',
1776 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001777 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001778 self.assertEqual('refs/diff/test',
1779 git_cl.GetTargetRef('origin',
1780 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001781 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001782 self.assertEqual('refs/heads/chrome/m42',
1783 git_cl.GetTargetRef('origin',
1784 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001785 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001786
1787 # Check target refs for user-specified target branch.
1788 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1789 'refs/remotes/branch-heads/123'):
1790 self.assertEqual('refs/branch-heads/123',
1791 git_cl.GetTargetRef('origin',
1792 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001793 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001794 for branch in ('origin/master', 'remotes/origin/master',
1795 'refs/remotes/origin/master'):
1796 self.assertEqual('refs/heads/master',
1797 git_cl.GetTargetRef('origin',
1798 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001799 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001800 for branch in ('master', 'heads/master', 'refs/heads/master'):
1801 self.assertEqual('refs/heads/master',
1802 git_cl.GetTargetRef('origin',
1803 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001804 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001805
wychen@chromium.orga872e752015-04-28 23:42:18 +00001806 def test_patch_when_dirty(self):
1807 # Patch when local tree is dirty
1808 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1809 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1810
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001811 @staticmethod
1812 def _get_gerrit_codereview_server_calls(branch, value=None,
1813 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001814 detect_branch=True,
1815 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001816 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1817
1818 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1819 """
1820 calls = []
1821 if detect_branch:
1822 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001823 if detect_server:
1824 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1825 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001826 if value is None:
1827 calls += [
1828 ((['git', 'config', 'branch.' + branch + '.merge'],),
1829 'refs/heads' + branch),
1830 ((['git', 'config', 'branch.' + branch + '.remote'],),
1831 'origin'),
1832 ((['git', 'config', 'remote.origin.url'],),
1833 'https://%s.googlesource.com/my/repo' % git_short_host),
1834 ]
1835 return calls
1836
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001837 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001838 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001839 detect_gerrit_server=True,
1840 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001841 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001842 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1843 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001844 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001845 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001846 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1847
tandriidf09a462016-08-18 16:23:55 -07001848 if new_branch:
1849 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001850
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001851 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001852 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001853 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001854 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001855 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1856 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1857 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1858 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001859 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001860 if default_codereview == 'gerrit':
1861 if not force_codereview:
1862 self.calls += [
1863 ((['git', 'config', 'gerrit.host'],), 'true'),
1864 ]
1865 if detect_gerrit_server:
1866 self.calls += self._get_gerrit_codereview_server_calls(
1867 'master', git_short_host=git_short_host,
1868 detect_branch=not new_branch and force_codereview)
1869 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001870
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001871 elif default_codereview == 'rietveld':
1872 self.calls += [
1873 ((['git', 'config', 'gerrit.host'],), CERR1),
1874 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1875 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
1876 ]
1877 actual_codereview = 'rietveld'
1878
1879 if actual_codereview == 'rietveld':
1880 self.calls += [
1881 ((['git', 'rev-parse', '--show-cdup'],), ''),
1882 ]
1883 if not default_codereview:
1884 self.calls += [
1885 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1886 ]
1887 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001888 self.calls += [
1889 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001890 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001891 {
1892 'current_revision': '7777777777',
1893 'revisions': {
1894 '1111111111': {
1895 '_number': 1,
1896 'fetch': {'http': {
1897 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1898 'ref': 'refs/changes/56/123456/1',
1899 }},
1900 },
1901 '7777777777': {
1902 '_number': 7,
1903 'fetch': {'http': {
1904 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1905 'ref': 'refs/changes/56/123456/7',
1906 }},
1907 },
1908 },
1909 }),
1910 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001911
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001912 def _common_patch_rietveld_successful(self, **kwargs):
1913 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001914 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001915 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001916 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001917 ((['git', 'config', 'branch.master.rietveldserver',
1918 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001919 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001920 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001921 ((['git', 'commit', '-m',
1922 'Description\n\n' +
1923 'patch from issue 123456 at patchset 60001 ' +
1924 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001925 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001926
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001927 def test_patch_rietveld_default(self):
1928 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001929 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1930
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001931 def test_patch_rietveld_successful_new_branch(self):
1932 self._common_patch_rietveld_successful(default_codereview='rietveld',
1933 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001934 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1935
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001936 def test_patch_rietveld_guess_by_url(self):
1937 self._common_patch_rietveld_successful(
1938 default_codereview=None, # It doesn't matter.
1939 actual_codereview='rietveld')
1940 self.assertEqual(git_cl.main(
1941 ['patch', 'https://codereview.example.com/123456']), 0)
1942
1943 def test_patch_rietveld_conflict(self):
1944 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07001945 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001946 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001947
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001948 def test_patch_gerrit_default(self):
1949 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001950 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001951 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08001952 ((['git', 'config', 'remote.origin.url'],),
1953 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001954 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1955 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001956 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001957 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001958 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001959 ((['git', 'config', 'branch.master.gerritserver',
1960 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001961 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001962 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1963 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1964 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001965 ]
1966 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1967
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001968 def test_patch_gerrit_force(self):
1969 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001970 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001971 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08001972 ((['git', 'config', 'remote.origin.url'],),
1973 'https://host.googlesource.com/my/repo'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001974 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001975 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001976 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001977 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001978 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001979 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001980 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001981 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001982 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1983 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1984 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001985 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001986 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001987
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001988 def test_patch_gerrit_guess_by_url(self):
1989 self._patch_common(
1990 default_codereview=None, # It doesn't matter what's default.
1991 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08001992 git_short_host='else')
1993 self.calls += self._get_gerrit_codereview_server_calls(
1994 'master', git_short_host='else', detect_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001995 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001996 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001997 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001998 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001999 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002000 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002002 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002003 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002004 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2005 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2006 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002007 ]
2008 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002009 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002010
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002011 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2012 self._patch_common(
2013 default_codereview=None, # It doesn't matter what's default.
2014 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08002015 git_short_host='else')
2016 self.calls += self._get_gerrit_codereview_server_calls(
2017 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002018 self.calls += [
2019 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2020 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002021 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002022 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2023 ''),
2024 ((['git', 'config', 'branch.master.gerritserver',
2025 'https://else-review.googlesource.com'],), ''),
2026 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002027 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2028 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2029 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002030 ]
2031 self.assertEqual(git_cl.main(
2032 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2033
Aaron Gable697a91b2018-01-19 15:20:15 -08002034 def test_patch_gerrit_guess_by_url_with_repo(self):
2035 self._patch_common(
2036 default_codereview=None, # It doesn't matter what's default.
2037 actual_codereview='gerrit',
2038 git_short_host='else')
2039 self.calls += self._get_gerrit_codereview_server_calls(
2040 'master', git_short_host='else', detect_server=False)
2041 self.calls += [
2042 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2043 'refs/changes/56/123456/1'],), ''),
2044 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2045 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2046 ''),
2047 ((['git', 'config', 'branch.master.gerritserver',
2048 'https://else-review.googlesource.com'],), ''),
2049 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2050 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2051 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2052 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
2053 ]
2054 self.assertEqual(git_cl.main(
2055 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
2056 0)
2057
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002058 def test_patch_gerrit_conflict(self):
2059 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002060 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002061 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002062 ((['git', 'config', 'remote.origin.url'],),
2063 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002064 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002065 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002066 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2067 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2068 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002069 ]
2070 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002071 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002072
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002073 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002074 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002075 raise git_cl.gerrit_util.GerritError(404, '')
2076 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2077
tandriic2405f52016-10-10 08:13:15 -07002078 self.calls = [
2079 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002080 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2081 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2082 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2083 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002084 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2085 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2086 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2087 ((['git', 'config', 'remote.origin.url'],),
2088 'https://chromium.googlesource.com/my/repo'),
2089 ((['DieWithError',
2090 'change 123456 at https://chromium-review.googlesource.com does not '
2091 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002092 ]
2093 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002094 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002095
Aaron Gable697a91b2018-01-19 15:20:15 -08002096 def test_patch_gerrit_wrong_repo(self):
2097 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
2098 detect_gerrit_server=True)
2099 self.calls += [
2100 ((['git', 'config', 'remote.origin.url'],),
2101 'https://chromium.googlesource.com/wrong/repo'),
2102 ((['DieWithError',
2103 'Trying to patch a change from '
2104 'https://chromium.googlesource.com/my/repo but this repo appears '
2105 'to be https://chromium.googlesource.com/wrong/repo.'],),
2106 SystemExitMock()),
2107 ]
2108 with self.assertRaises(SystemExitMock):
2109 self.assertEqual(1, git_cl.main(['patch', '123456']))
2110
2111
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002112 def _checkout_calls(self):
2113 return [
2114 ((['git', 'config', '--local', '--get-regexp',
2115 'branch\\..*\\.rietveldissue'], ),
2116 ('branch.retrying.rietveldissue 1111111111\n'
2117 'branch.some-fix.rietveldissue 2222222222\n')),
2118 ((['git', 'config', '--local', '--get-regexp',
2119 'branch\\..*\\.gerritissue'], ),
2120 ('branch.ger-branch.gerritissue 123456\n'
2121 'branch.gbranch654.gerritissue 654321\n')),
2122 ]
2123
2124 def test_checkout_gerrit(self):
2125 """Tests git cl checkout <issue>."""
2126 self.calls = self._checkout_calls()
2127 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2128 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2129
2130 def test_checkout_rietveld(self):
2131 """Tests git cl checkout <issue>."""
2132 self.calls = self._checkout_calls()
2133 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2134 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2135
2136 def test_checkout_not_found(self):
2137 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002138 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002139 self.calls = self._checkout_calls()
2140 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2141
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002142 def test_checkout_no_branch_issues(self):
2143 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002144 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002145 self.calls = [
2146 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002147 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002148 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002149 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002150 ]
2151 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2152
tandrii@chromium.org28253532016-04-14 13:46:56 +00002153 def _test_gerrit_ensure_authenticated_common(self, auth,
2154 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002155 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2156 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2157 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002158 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002159 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002160 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002161 cl.branch = 'master'
2162 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002163 cl.lookedup_issue = True
2164 return cl
2165
2166 def test_gerrit_ensure_authenticated_missing(self):
2167 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002168 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002169 })
2170 self.calls.append(
2171 ((['DieWithError',
2172 'Credentials for the following hosts are required:\n'
2173 ' chromium-review.googlesource.com\n'
2174 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002175 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002176 'https://chromium-review.googlesource.com/new-password'],), ''),)
2177 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2178
2179 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002180 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002181 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002182 'chromium.googlesource.com':
2183 ('git-one.example.com', None, 'secret1'),
2184 'chromium-review.googlesource.com':
2185 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002186 })
2187 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002188 (('ask_for_data', 'If you know what you are doing '
2189 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002190 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2191
2192 def test_gerrit_ensure_authenticated_ok(self):
2193 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002194 'chromium.googlesource.com':
2195 ('git-same.example.com', None, 'secret'),
2196 'chromium-review.googlesource.com':
2197 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002198 })
2199 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2200
tandrii@chromium.org28253532016-04-14 13:46:56 +00002201 def test_gerrit_ensure_authenticated_skipped(self):
2202 cl = self._test_gerrit_ensure_authenticated_common(
2203 auth={}, skip_auth_check=True)
2204 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2205
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002206 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002207 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2208 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002209 self.calls = [
2210 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002211 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002212 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2213 ((['git', 'config', 'rietveld.server'],), ''),
2214 ((['git', 'config', 'rietveld.server'],), ''),
2215 ((['git', 'config', 'branch.feature.rietveldserver'],),
2216 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002217 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002218 ]
2219 self.assertEqual(0, git_cl.main(['set-commit']))
2220
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002221 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002222 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002223 lambda h, i, labels, notify=None:
2224 self._mocked_call(['SetReview', h, i, labels, notify]))
2225
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002226 self.calls = [
2227 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002228 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2229 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002230 ((['git', 'config', 'branch.feature.gerritserver'],),
2231 'https://chromium-review.googlesource.com'),
2232 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002233 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002234 ]
tandriid9e5ce52016-07-13 02:32:59 -07002235
2236 def test_cmd_set_commit_gerrit_clear(self):
2237 self._cmd_set_commit_gerrit_common(0)
2238 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2239
2240 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002241 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002242 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2243
tandriid9e5ce52016-07-13 02:32:59 -07002244 def test_cmd_set_commit_gerrit(self):
2245 self._cmd_set_commit_gerrit_common(2)
2246 self.assertEqual(0, git_cl.main(['set-commit']))
2247
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002248 def test_description_display(self):
2249 out = StringIO.StringIO()
2250 self.mock(git_cl.sys, 'stdout', out)
2251
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002252 self.mock(git_cl, 'Changelist', ChangelistMock)
2253 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002254
2255 self.assertEqual(0, git_cl.main(['description', '-d']))
2256 self.assertEqual('foo\n', out.getvalue())
2257
2258 def test_description_rietveld(self):
2259 out = StringIO.StringIO()
2260 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002261 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002262
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002263 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002264 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002265 self.assertEqual('foobar\n', out.getvalue())
2266
iannucci3c972b92016-08-17 13:24:10 -07002267 def test_StatusFieldOverrideIssueMissingArgs(self):
2268 out = StringIO.StringIO()
2269 self.mock(git_cl.sys, 'stderr', out)
2270
2271 try:
2272 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2273 except SystemExit as ex:
2274 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002275 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002276
2277 out = StringIO.StringIO()
2278 self.mock(git_cl.sys, 'stderr', out)
2279
2280 try:
2281 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2282 except SystemExit as ex:
2283 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002284 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002285
2286 def test_StatusFieldOverrideIssue(self):
2287 out = StringIO.StringIO()
2288 self.mock(git_cl.sys, 'stdout', out)
2289
2290 def assertIssue(cl_self, *_args):
2291 self.assertEquals(cl_self.issue, 1)
2292 return 'foobar'
2293
2294 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2295 self.calls = [
2296 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2297 ((['git', 'config', 'rietveld.server'],), ''),
2298 ((['git', 'config', 'rietveld.server'],), ''),
2299 ]
iannuccie53c9352016-08-17 14:40:40 -07002300 self.assertEqual(
2301 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2302 0)
iannucci3c972b92016-08-17 13:24:10 -07002303 self.assertEqual(out.getvalue(), 'foobar\n')
2304
iannuccie53c9352016-08-17 14:40:40 -07002305 def test_SetCloseOverrideIssue(self):
2306 def assertIssue(cl_self, *_args):
2307 self.assertEquals(cl_self.issue, 1)
2308 return 'foobar'
2309
2310 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2311 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2312 self.calls = [
2313 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2314 ((['git', 'config', 'rietveld.server'],), ''),
2315 ((['git', 'config', 'rietveld.server'],), ''),
2316 ]
2317 self.assertEqual(
2318 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2319
2320 def test_SetCommitOverrideIssue(self):
2321 def assertIssue(cl_self, *_args):
2322 self.assertEquals(cl_self.issue, 1)
2323 return 'foobar'
2324
2325 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2326 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2327 self.calls = [
2328 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2329 ((['git', 'config', 'rietveld.server'],), ''),
2330 ((['git', 'config', 'rietveld.server'],), ''),
2331 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2332 ((['git', 'config', 'rietveld.server'],), ''),
2333 ((['git', 'config', 'rietveld.server'],), ''),
2334 ]
2335 self.assertEqual(
2336 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2337
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002338 def test_description_gerrit(self):
2339 out = StringIO.StringIO()
2340 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002341 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002342 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002343 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2344 {
2345 'current_revision': 'sha1',
2346 'revisions': {'sha1': {
2347 'commit': {'message': 'foobar'},
2348 }},
2349 }),
2350 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002351 self.assertEqual(0, git_cl.main([
2352 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2353 self.assertEqual('foobar\n', out.getvalue())
2354
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002355 def test_description_set_raw(self):
2356 out = StringIO.StringIO()
2357 self.mock(git_cl.sys, 'stdout', out)
2358
2359 self.mock(git_cl, 'Changelist', ChangelistMock)
2360 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2361
2362 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2363 self.assertEqual('hihi', ChangelistMock.desc)
2364
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002365 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002366 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002367
2368 def RunEditor(desc, _, **kwargs):
2369 self.assertEquals(
2370 '# Enter a description of the change.\n'
2371 '# This will be displayed on the codereview site.\n'
2372 '# The first line will also be used as the subject of the review.\n'
2373 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002374 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002375 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002376 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002377 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002378 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002379
dsansomee2d6fd92016-09-08 00:10:47 -07002380 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002381 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002382
2383 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2384 self.mock(git_cl.Changelist, 'GetDescription',
2385 lambda *args: current_desc)
2386 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2387 UpdateDescriptionRemote)
2388 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2389
2390 self.calls = [
2391 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002392 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002393 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2394 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002395 ((['git', 'config', 'core.editor'],), 'vi'),
2396 ]
2397 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2398
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002399 def test_description_set_stdin(self):
2400 out = StringIO.StringIO()
2401 self.mock(git_cl.sys, 'stdout', out)
2402
2403 self.mock(git_cl, 'Changelist', ChangelistMock)
2404 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2405
2406 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2407 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2408
kmarshall3bff56b2016-06-06 18:31:47 -07002409 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002410 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2411
kmarshall3bff56b2016-06-06 18:31:47 -07002412 self.calls = \
2413 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2414 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002415 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002416 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2417 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002418 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2419 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2420 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002421 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2422 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2423 ((['git', 'branch', '-D', 'foo'],), '')]
2424
kmarshall3bff56b2016-06-06 18:31:47 -07002425 self.mock(git_cl, 'get_cl_statuses',
2426 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002427 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2428 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2429 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002430
2431 self.assertEqual(0, git_cl.main(['archive', '-f']))
2432
2433 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002434 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002435 self.calls = \
2436 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2437 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002438 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002439 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2440 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002441 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2442
kmarshall9249e012016-08-23 12:02:16 -07002443 self.mock(git_cl, 'get_cl_statuses',
2444 lambda branches, fine_grained, max_processes:
2445 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2446
2447 self.assertEqual(1, git_cl.main(['archive', '-f']))
2448
2449 def test_archive_dry_run(self):
2450 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2451
2452 self.calls = \
2453 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2454 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2455 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2456 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2457 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2458 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2459 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2460 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2461 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002462
2463 self.mock(git_cl, 'get_cl_statuses',
2464 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002465 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2466 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2467 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002468
kmarshall9249e012016-08-23 12:02:16 -07002469 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2470
2471 def test_archive_no_tags(self):
2472 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2473
2474 self.calls = \
2475 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2476 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2477 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2478 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2479 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2480 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2481 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2482 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2483 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2484 ((['git', 'branch', '-D', 'foo'],), '')]
2485
2486 self.mock(git_cl, 'get_cl_statuses',
2487 lambda branches, fine_grained, max_processes:
2488 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2489 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2490 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2491
2492 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002493
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002494 def test_cmd_issue_erase_existing(self):
2495 out = StringIO.StringIO()
2496 self.mock(git_cl.sys, 'stdout', out)
2497 self.calls = [
2498 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002499 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2500 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002501 # Let this command raise exception (retcode=1) - it should be ignored.
2502 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002503 CERR1),
2504 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2505 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002506 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2507 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2508 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002509 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002510 ]
2511 self.assertEqual(0, git_cl.main(['issue', '0']))
2512
Aaron Gable400e9892017-07-12 15:31:21 -07002513 def test_cmd_issue_erase_existing_with_change_id(self):
2514 out = StringIO.StringIO()
2515 self.mock(git_cl.sys, 'stdout', out)
2516 self.mock(git_cl.Changelist, 'GetDescription',
2517 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2518 self.calls = [
2519 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2520 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2521 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002522 # Let this command raise exception (retcode=1) - it should be ignored.
2523 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2524 CERR1),
2525 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2526 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2527 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2528 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2529 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002530 ((['git', 'log', '-1', '--format=%B'],),
2531 'This is a description\n\nChange-Id: Ideadbeef'),
2532 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002533 ]
2534 self.assertEqual(0, git_cl.main(['issue', '0']))
2535
phajdan.jre328cf92016-08-22 04:12:17 -07002536 def test_cmd_issue_json(self):
2537 out = StringIO.StringIO()
2538 self.mock(git_cl.sys, 'stdout', out)
2539 self.calls = [
2540 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002541 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002542 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2543 ((['git', 'config', 'rietveld.server'],),
2544 'https://codereview.chromium.org'),
2545 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2546 (('write_json', 'output.json',
2547 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2548 ''),
2549 ]
2550 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2551
tandriide281ae2016-10-12 06:02:30 -07002552 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002553 self.mock(git_cl.Changelist, 'GetChange',
2554 lambda _, *a: (
2555 self._mocked_call(['GetChange']+list(a))))
2556 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2557 lambda *_, **__: (
2558 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002559 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2560 lambda _, s: self._mocked_call(['SetCQState', s]))
2561 self.calls = [
2562 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002563 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002564 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2565 ((['git', 'config', 'rietveld.server'],),
2566 'https://codereview.chromium.org'),
2567 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2568 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2569 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2570 ((['get_or_create_merge_base', 'feature', 'feature'],),
2571 'fake_ancestor_sha'),
2572 ((['GetChange', 'fake_ancestor_sha', None], ),
2573 git_cl.presubmit_support.GitChange(
2574 '', '', '', '', '', '', '', '')),
2575 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2576 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002577 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2578 ]
2579 out = StringIO.StringIO()
2580 self.mock(git_cl.sys, 'stdout', out)
2581 self.assertEqual(0, git_cl.main(['try']))
2582 self.assertEqual(
2583 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002584 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002585
tandrii8c5a3532016-11-04 07:52:02 -07002586 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2587 self.mock(git_cl.Changelist, 'GetChange',
2588 lambda _, *a: (
2589 self._mocked_call(['GetChange']+list(a))))
2590 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2591 lambda *_, **__: (
2592 self._mocked_call(['DoGetTryMasters'])))
2593 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2594 lambda _, s: self._mocked_call(['SetCQState', s]))
2595
tandrii8c5a3532016-11-04 07:52:02 -07002596 self.calls = [
2597 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2598 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2599 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2600 ((['git', 'config', 'branch.feature.gerritserver'],),
2601 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002602 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2603 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2604 'project': 'depot_tools',
2605 'status': 'OPEN',
2606 'owner': {'email': 'owner@e.mail'},
2607 'revisions': {
2608 'deadbeaf': {
2609 '_number': 6,
2610 },
2611 'beeeeeef': {
2612 '_number': 7,
2613 'fetch': {'http': {
2614 'url': 'https://chromium.googlesource.com/depot_tools',
2615 'ref': 'refs/changes/56/123456/7'
2616 }},
2617 },
2618 },
2619 }),
tandrii8c5a3532016-11-04 07:52:02 -07002620 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2621 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2622 ((['get_or_create_merge_base', 'feature', 'feature'],),
2623 'fake_ancestor_sha'),
2624 ((['GetChange', 'fake_ancestor_sha', None], ),
2625 git_cl.presubmit_support.GitChange(
2626 '', '', '', '', '', '', '', '')),
2627 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2628 ((['DoGetTryMasters'], ), None),
2629 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2630 ]
2631 out = StringIO.StringIO()
2632 self.mock(git_cl.sys, 'stdout', out)
2633 self.assertEqual(0, git_cl.main(['try']))
2634 self.assertEqual(
2635 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002636 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002637 'https://chromium-review.googlesource.com/123456\n')
2638
2639 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2640 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2641 lambda _: {
2642 'owner_email': 'owner@e.mail',
2643 'private': False,
2644 'closed': False,
2645 'project': 'depot_tools',
2646 'patchsets': [20001],
2647 })
tandriide281ae2016-10-12 06:02:30 -07002648 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2649 self.calls = [
2650 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2651 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2652 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2653 ((['git', 'config', 'rietveld.server'],),
2654 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002655 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002656 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002657 ]
2658
2659 def _buildbucket_retry(*_, **kw):
2660 # self.maxDiff = 10000
2661 body = json.loads(kw['body'])
2662 self.assertEqual(len(body['builds']), 1)
2663 build = body['builds'][0]
2664 params = json.loads(build.pop('parameters_json'))
2665 self.assertEqual(params, {
2666 u'builder_name': u'win',
2667 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2668 u'revision': None}],
2669 u'properties': {
2670 u'category': u'git_cl_try',
2671 u'issue': 123,
2672 u'key': u'val',
2673 u'json': [{u'a': 1}, None],
2674 u'master': u'tryserver.chromium',
2675 u'patch_project': u'depot_tools',
2676 u'patch_storage': u'rietveld',
2677 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002678 u'rietveld': u'https://codereview.chromium.org',
2679 }
2680 })
2681 self.assertEqual(build, {
2682 u'bucket': u'master.tryserver.chromium',
2683 u'client_operation_id': u'uuid4',
2684 u'tags': [u'builder:win',
2685 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002686 u'user_agent:git_cl_try',
2687 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002688 })
2689
2690 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2691
2692 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2693 self.assertEqual(0, git_cl.main([
2694 'try', '-m', 'tryserver.chromium', '-b', 'win',
2695 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2696 self.assertRegexpMatches(
2697 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002698 'Tried jobs on:\nBucket: master.tryserver.chromium')
2699
tandrii8c5a3532016-11-04 07:52:02 -07002700 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2701 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2702 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2703
tandrii8c5a3532016-11-04 07:52:02 -07002704 self.calls = [
2705 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2706 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2707 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2708 ((['git', 'config', 'branch.feature.gerritserver'],),
2709 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002710 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002711 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002712 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002713 'status': 'OPEN',
2714 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002715 'revisions': {
2716 'deadbeaf': {
2717 '_number': 6,
2718 },
2719 'beeeeeef': {
2720 '_number': 7,
2721 'fetch': {'http': {
2722 'url': 'https://chromium.googlesource.com/depot_tools',
2723 'ref': 'refs/changes/56/123456/7'
2724 }},
2725 },
2726 },
2727 }),
2728 ]
2729
2730 def _buildbucket_retry(*_, **kw):
2731 # self.maxDiff = 10000
2732 body = json.loads(kw['body'])
2733 self.assertEqual(len(body['builds']), 1)
2734 build = body['builds'][0]
2735 params = json.loads(build.pop('parameters_json'))
2736 self.assertEqual(params, {
2737 u'builder_name': u'win',
2738 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2739 u'revision': None}],
2740 u'properties': {
2741 u'category': u'git_cl_try',
2742 u'key': u'val',
2743 u'json': [{u'a': 1}, None],
2744 u'master': u'tryserver.chromium',
2745
2746 u'patch_gerrit_url':
2747 u'https://chromium-review.googlesource.com',
2748 u'patch_issue': 123456,
2749 u'patch_project': u'depot_tools',
2750 u'patch_ref': u'refs/changes/56/123456/7',
2751 u'patch_repository_url':
2752 u'https://chromium.googlesource.com/depot_tools',
2753 u'patch_set': 7,
2754 u'patch_storage': u'gerrit',
2755 }
2756 })
2757 self.assertEqual(build, {
2758 u'bucket': u'master.tryserver.chromium',
2759 u'client_operation_id': u'uuid4',
2760 u'tags': [
2761 u'builder:win',
2762 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2763 u'user_agent:git_cl_try',
2764 u'master:tryserver.chromium'],
2765 })
2766
2767 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2768
2769 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2770 self.assertEqual(0, git_cl.main([
2771 'try', '-m', 'tryserver.chromium', '-b', 'win',
2772 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2773 self.assertRegexpMatches(
2774 git_cl.sys.stdout.getvalue(),
2775 'Tried jobs on:\nBucket: master.tryserver.chromium')
2776
borenet6c0efe62016-10-19 08:13:29 -07002777 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002778 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2779 lambda _: {
2780 'owner_email': 'owner@e.mail',
2781 'private': False,
2782 'closed': False,
2783 'project': 'depot_tools',
2784 'patchsets': [20001],
2785 })
borenet6c0efe62016-10-19 08:13:29 -07002786 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2787 self.calls = [
2788 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2789 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2790 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2791 ((['git', 'config', 'rietveld.server'],),
2792 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002793 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002794 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002795 ]
2796
2797 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002798 body = json.loads(kw['body'])
2799 self.assertEqual(len(body['builds']), 1)
2800 build = body['builds'][0]
2801 params = json.loads(build.pop('parameters_json'))
2802 self.assertEqual(params, {
2803 u'builder_name': u'win',
2804 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2805 u'revision': None}],
2806 u'properties': {
2807 u'category': u'git_cl_try',
2808 u'issue': 123,
2809 u'patch_project': u'depot_tools',
2810 u'patch_storage': u'rietveld',
2811 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002812 u'rietveld': u'https://codereview.chromium.org',
2813 }
2814 })
2815 self.assertEqual(build, {
2816 u'bucket': u'test.bucket',
2817 u'client_operation_id': u'uuid4',
2818 u'tags': [u'builder:win',
2819 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2820 u'user_agent:git_cl_try'],
2821 })
2822
2823 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2824
2825 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2826 self.assertEqual(0, git_cl.main([
2827 'try', '-B', 'test.bucket', '-b', 'win']))
2828 self.assertRegexpMatches(
2829 git_cl.sys.stdout.getvalue(),
2830 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002831
qyearsley123a4682016-10-26 09:12:17 -07002832 def test_git_cl_try_bots_on_multiple_masters(self):
2833 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2834 self.calls = [
2835 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2836 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2837 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2838 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002839 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002840 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2841 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2842 ]
2843
2844 def _buildbucket_retry(*_, **kw):
2845 body = json.loads(kw['body'])
2846 self.assertEqual(len(body['builds']), 2)
2847
Nodir Turakulovb422e682018-02-20 22:51:30 -08002848 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2849 params = json.loads(body['builds'][0]['parameters_json'])
2850 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002851
Nodir Turakulovb422e682018-02-20 22:51:30 -08002852 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2853 params = json.loads(body['builds'][1]['parameters_json'])
2854 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002855
2856 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2857
2858 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002859 json.dumps({
2860 'builder1': {'bucket': 'bucket1'},
2861 'builder2': {'bucket': 'bucket2'},
2862 })))
qyearsley123a4682016-10-26 09:12:17 -07002863
2864 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2865 self.assertEqual(
2866 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2867 self.assertEqual(
2868 git_cl.sys.stdout.getvalue(),
2869 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002870 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002871 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002872 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002873 ' builder2: []\n'
2874 'To see results here, run: git cl try-results\n'
2875 'To see results in browser, run: git cl web\n')
2876
tandrii16e0b4e2016-06-07 10:34:28 -07002877 def _common_GerritCommitMsgHookCheck(self):
2878 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2879 self.mock(git_cl.os.path, 'abspath',
2880 lambda path: self._mocked_call(['abspath', path]))
2881 self.mock(git_cl.os.path, 'exists',
2882 lambda path: self._mocked_call(['exists', path]))
2883 self.mock(git_cl.gclient_utils, 'FileRead',
2884 lambda path: self._mocked_call(['FileRead', path]))
2885 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2886 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2887 self.calls = [
2888 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2889 ((['abspath', '../'],), '/abs/git_repo_root'),
2890 ]
2891 return git_cl.Changelist(codereview='gerrit', issue=123)
2892
2893 def test_GerritCommitMsgHookCheck_custom_hook(self):
2894 cl = self._common_GerritCommitMsgHookCheck()
2895 self.calls += [
2896 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2897 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2898 '#!/bin/sh\necho "custom hook"')
2899 ]
2900 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2901
2902 def test_GerritCommitMsgHookCheck_not_exists(self):
2903 cl = self._common_GerritCommitMsgHookCheck()
2904 self.calls += [
2905 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2906 ]
2907 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2908
2909 def test_GerritCommitMsgHookCheck(self):
2910 cl = self._common_GerritCommitMsgHookCheck()
2911 self.calls += [
2912 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2913 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2914 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002915 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002916 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2917 ''),
2918 ]
2919 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2920
tandriic4344b52016-08-29 06:04:54 -07002921 def test_GerritCmdLand(self):
2922 self.calls += [
2923 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2924 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2925 'deadbeaf'),
2926 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2927 ((['git', 'config', 'branch.feature.gerritserver'],),
2928 'chromium-review.googlesource.com'),
2929 ]
2930 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2931 cl._codereview_impl._GetChangeDetail = lambda _: {
2932 'labels': {},
2933 'current_revision': 'deadbeaf',
2934 }
agable32978d92016-11-01 12:55:02 -07002935 cl._codereview_impl._GetChangeCommit = lambda: {
2936 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002937 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002938 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2939 }
tandriic4344b52016-08-29 06:04:54 -07002940 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002941 out = StringIO.StringIO()
2942 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002943 self.assertEqual(0, cl.CMDLand(force=True,
2944 bypass_hooks=True,
2945 verbose=True,
2946 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002947 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002948 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002949
tandrii221ab252016-10-06 08:12:04 -07002950 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002951 '9000': {
2952 'id': '9000',
2953 'bucket': 'master.x.y',
2954 'created_by': 'user:someone@chromium.org',
2955 'created_ts': '147200002222000',
2956 'experimental': False,
2957 'parameters_json': json.dumps({
2958 'builder_name': 'my-bot',
2959 'properties': {'category': 'cq'},
2960 }),
2961 'status': 'STARTED',
2962 'tags': [
2963 'build_address:x.y/my-bot/2',
2964 'builder:my-bot',
2965 'experimental:false',
2966 'user_agent:cq',
2967 ],
2968 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2969 },
2970 '8000': {
2971 'id': '8000',
2972 'bucket': 'master.x.y',
2973 'created_by': 'user:someone@chromium.org',
2974 'created_ts': '147200001111000',
2975 'experimental': False,
2976 'failure_reason': 'BUILD_FAILURE',
2977 'parameters_json': json.dumps({
2978 'builder_name': 'my-bot',
2979 'properties': {'category': 'cq'},
2980 }),
2981 'result_details_json': json.dumps({
2982 'properties': {'buildnumber': 1},
2983 }),
2984 'result': 'FAILURE',
2985 'status': 'COMPLETED',
2986 'tags': [
2987 'build_address:x.y/my-bot/1',
2988 'builder:my-bot',
2989 'experimental:false',
2990 'user_agent:cq',
2991 ],
2992 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2993 },
2994 }
tandrii221ab252016-10-06 08:12:04 -07002995
2996 def test_write_try_results_json(self):
2997 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002998 {
2999 'bucket': 'master.x.y',
3000 'buildbucket_id': '8000',
3001 'builder_name': 'my-bot',
3002 'created_ts': '147200001111000',
3003 'experimental': False,
3004 'failure_reason': 'BUILD_FAILURE',
3005 'result': 'FAILURE',
3006 'status': 'COMPLETED',
3007 'tags': [
3008 'build_address:x.y/my-bot/1',
3009 'builder:my-bot',
3010 'experimental:false',
3011 'user_agent:cq',
3012 ],
3013 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3014 },
3015 {
3016 'bucket': 'master.x.y',
3017 'buildbucket_id': '9000',
3018 'builder_name': 'my-bot',
3019 'created_ts': '147200002222000',
3020 'experimental': False,
3021 'failure_reason': None,
3022 'result': None,
3023 'status': 'STARTED',
3024 'tags': [
3025 'build_address:x.y/my-bot/2',
3026 'builder:my-bot',
3027 'experimental:false',
3028 'user_agent:cq',
3029 ],
3030 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3031 },
tandrii221ab252016-10-06 08:12:04 -07003032 ]
3033 self.calls = [(('write_json', 'output.json', expected_output), '')]
3034 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3035
tandrii45b2a582016-10-11 03:14:16 -07003036 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003037 out = StringIO.StringIO()
3038 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003039 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3040 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003041 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3042 self._mocked_call(['get_authenticator_for_host', host]))
3043 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3044 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003045
3046 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3047 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003048 self.calls += [
3049 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3050 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3051 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3052 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3053 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3054 ((['git', 'config', 'branch.feature.rietveldserver'],),
3055 'codereview.example.com'),
3056 ((['get_authenticator_for_host', 'codereview.example.com'],),
3057 AuthenticatorMock()),
3058 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3059
3060 def test_fetch_try_jobs_none_rietveld(self):
3061 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003062 # Simulate that user isn't logged in.
3063 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003064 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003065 self.assertRegexpMatches(sys.stdout.getvalue(),
3066 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003067 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3068
3069 def test_fetch_try_jobs_some_rietveld(self):
3070 self._setup_fetch_try_jobs_rietveld({
3071 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3072 })
3073 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003074 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3075 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3076 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3077
3078 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3079 self._setup_fetch_try_jobs(most_recent_patchset=13)
3080 self.calls += [
3081 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3082 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3083 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003084 # TODO(tandrii): Uncomment the below if we decide to support checking
3085 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003086 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003087 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003088 ((['git', 'config', 'branch.feature.gerritserver'],),
3089 'https://x-review.googlesource.com'),
3090 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3091 AuthenticatorMock()),
3092 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3093
3094 def test_fetch_try_jobs_none_gerrit(self):
3095 self._setup_fetch_try_jobs_gerrit({})
3096 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003097 # TODO(tandrii): Uncomment the below if we decide to support checking
3098 # patchsets for Gerrit.
3099 # self.assertRegexpMatches(
3100 # sys.stdout.getvalue(),
3101 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003102 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3103
3104 def test_fetch_try_jobs_some_gerrit(self):
3105 self._setup_fetch_try_jobs_gerrit({
3106 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3107 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003108 # TODO(tandrii): Uncomment the below if we decide to support checking
3109 # patchsets for Gerrit.
3110 # self.calls.remove(
3111 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003112 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3113
3114 # ... and doesn't result in warning.
3115 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3116 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003117 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3118 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3119
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003120 def _mock_gerrit_changes_for_detail_cache(self):
3121 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003122
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003123 def test_gerrit_change_detail_cache_simple(self):
3124 self._mock_gerrit_changes_for_detail_cache()
3125 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003126 (('GetChangeDetail', 'host', '1', []), 'a'),
3127 (('GetChangeDetail', 'host', '2', []), 'b'),
3128 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003129 ]
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00003130 cl1 = git_cl.Changelist(issue=1, codereview='gerrit')
3131 cl2 = git_cl.Changelist(issue=2, codereview='gerrit')
3132 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
3133 self.assertEqual(cl1._GetChangeDetail(), 'a')
3134 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
3135 self.assertEqual(cl2._GetChangeDetail(no_cache=True), 'b2') # Miss.
3136 self.assertEqual(cl1._GetChangeDetail(), 'a')
3137 self.assertEqual(cl2._GetChangeDetail(), 'b2')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003138
3139 def test_gerrit_change_detail_cache_options(self):
3140 self._mock_gerrit_changes_for_detail_cache()
3141 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003142 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3143 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3144 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3145 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003146 ]
3147 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3148 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3149 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3150 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3151 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3152 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3153 self.assertEqual(cl._GetChangeDetail(), 'cab')
3154
3155 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3156 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3157 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3158 self.assertEqual(cl._GetChangeDetail(), 'cab')
3159
3160 # Finally, no_cache should invalidate all caches for given change.
3161 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3162 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3163
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003164 def test_gerrit_description_caching(self):
3165 def gen_detail(rev, desc):
3166 return {
3167 'current_revision': rev,
3168 'revisions': {rev: {'commit': {'message': desc}}}
3169 }
3170 self.calls = [
3171 (('GetChangeDetail', 'host', '1',
3172 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3173 gen_detail('rev1', 'desc1')),
3174 (('GetChangeDetail', 'host', '1',
3175 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3176 gen_detail('rev2', 'desc2')),
3177 ]
3178
3179 self._mock_gerrit_changes_for_detail_cache()
3180 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3181 self.assertEqual(cl.GetDescription(), 'desc1')
3182 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3183 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003184
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003185 def test_print_current_creds(self):
3186 class CookiesAuthenticatorMock(object):
3187 def __init__(self):
3188 self.gitcookies = {
3189 'host.googlesource.com': ('user', 'pass'),
3190 'host-review.googlesource.com': ('user', 'pass'),
3191 }
3192 self.netrc = self
3193 self.netrc.hosts = {
3194 'github.com': ('user2', None, 'pass2'),
3195 'host2.googlesource.com': ('user3', None, 'pass'),
3196 }
3197 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3198 CookiesAuthenticatorMock)
3199 self.mock(sys, 'stdout', StringIO.StringIO())
3200 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3201 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3202 ' Host\t User\t Which file',
3203 '============================\t=====\t===========',
3204 'host-review.googlesource.com\t user\t.gitcookies',
3205 ' host.googlesource.com\t user\t.gitcookies',
3206 ' host2.googlesource.com\tuser3\t .netrc',
3207 ])
3208 sys.stdout.buf = ''
3209 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3210 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3211 ' Host\tUser\t Which file',
3212 '============================\t====\t===========',
3213 'host-review.googlesource.com\tuser\t.gitcookies',
3214 ' host.googlesource.com\tuser\t.gitcookies',
3215 ])
3216
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003217 def _common_creds_check_mocks(self):
3218 def exists_mock(path):
3219 dirname = os.path.dirname(path)
3220 if dirname == os.path.expanduser('~'):
3221 dirname = '~'
3222 base = os.path.basename(path)
3223 if base in ('.netrc', '.gitcookies'):
3224 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3225 # git cl also checks for existence other files not relevant to this test.
3226 return None
3227 self.mock(os.path, 'exists', exists_mock)
3228 self.mock(sys, 'stdout', StringIO.StringIO())
3229
3230 def test_creds_check_gitcookies_not_configured(self):
3231 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003232 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003233 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003234 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003235 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003236 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3237 (('os.path.exists', '~/.netrc'), True),
3238 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3239 'or Ctrl+C to abort'), ''),
3240 ((['git', 'config', '--global', 'http.cookiefile',
3241 os.path.expanduser('~/.gitcookies')], ), ''),
3242 ]
3243 self.assertEqual(0, git_cl.main(['creds-check']))
3244 self.assertRegexpMatches(
3245 sys.stdout.getvalue(),
3246 '^You seem to be using outdated .netrc for git credentials:')
3247 self.assertRegexpMatches(
3248 sys.stdout.getvalue(),
3249 '\nConfigured git to use .gitcookies from')
3250
3251 def test_creds_check_gitcookies_configured_custom_broken(self):
3252 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003253 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003254 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003255 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003256 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003257 ((['git', 'config', '--global', 'http.cookiefile'],),
3258 '/custom/.gitcookies'),
3259 (('os.path.exists', '/custom/.gitcookies'), False),
3260 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3261 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3262 ((['git', 'config', '--global', 'http.cookiefile',
3263 os.path.expanduser('~/.gitcookies')], ), ''),
3264 ]
3265 self.assertEqual(0, git_cl.main(['creds-check']))
3266 self.assertRegexpMatches(
3267 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003268 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003269 self.assertRegexpMatches(
3270 sys.stdout.getvalue(),
3271 'However, your configured .gitcookies file is missing.')
3272
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003273 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003274 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003275 lambda _, message, publish: self._mocked_call(
3276 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003277 self.calls = [
3278 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3279 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003280 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003281 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003282 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3283 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003284
3285 def test_git_cl_comment_add_gerrit(self):
3286 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003287 lambda host, change, msg, ready:
3288 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003289 self.calls = [
3290 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3291 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3292 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3293 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3294 'origin/master'),
3295 ((['git', 'config', 'remote.origin.url'],),
3296 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003297 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3298 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003299 ]
3300 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3301 '-a', 'msg']))
3302
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003303 def test_git_cl_comments_fetch_rietveld(self):
3304 self.mock(sys, 'stdout', StringIO.StringIO())
3305 self.calls = [
3306 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3307 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3308 ] * 2
3309 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3310 'messages': [
3311 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3312 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3313 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3314 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3315 # Intentionally wrong order here.
3316 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3317 'disapproval': False, 'approval': False,
3318 'sender': 'owner@example.com'},
3319 ],
3320 'owner_email': 'owner@example.com',
3321 })
3322 expected_comments_summary = [
3323 git_cl._CommentSummary(
3324 message='lgtm',
3325 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3326 disapproval=False, approval=True, sender='r@example.com'),
3327 git_cl._CommentSummary(
3328 message='not lgtm',
3329 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3330 disapproval=True, approval=False, sender='r2@example.com'),
3331 # Note: same order as in whatever Rietveld returns.
3332 git_cl._CommentSummary(
3333 message='PTAL',
3334 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3335 disapproval=False, approval=False, sender='owner@example.com'),
3336 ]
3337 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3338 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3339
3340 with git_cl.gclient_utils.temporary_directory() as tempdir:
3341 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3342 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3343 '-j', out_file]))
3344 with open(out_file) as f:
3345 read = json.load(f)
3346 self.assertEqual(len(read), 3)
3347 self.assertEqual(read[0], {
3348 'date': '2000-03-13 20:49:34.515270',
3349 'message': 'PTAL',
3350 'approval': False,
3351 'disapproval': False,
3352 'sender': 'owner@example.com'})
3353 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3354 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3355
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003356 def test_git_cl_comments_fetch_gerrit(self):
3357 self.mock(sys, 'stdout', StringIO.StringIO())
3358 self.calls = [
3359 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3360 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3361 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3362 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3363 'origin/master'),
3364 ((['git', 'config', 'remote.origin.url'],),
3365 'https://chromium.googlesource.com/infra/infra'),
3366 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3367 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003368 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003369 'messages': [
3370 {
3371 u'_revision_number': 1,
3372 u'author': {
3373 u'_account_id': 1111084,
3374 u'email': u'commit-bot@chromium.org',
3375 u'name': u'Commit Bot'
3376 },
3377 u'date': u'2017-03-15 20:08:45.000000000',
3378 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003379 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003380 u'tag': u'autogenerated:cq:dry-run'
3381 },
3382 {
3383 u'_revision_number': 2,
3384 u'author': {
3385 u'_account_id': 11151243,
3386 u'email': u'owner@example.com',
3387 u'name': u'owner'
3388 },
3389 u'date': u'2017-03-16 20:00:41.000000000',
3390 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3391 u'message': u'PTAL',
3392 },
3393 {
3394 u'_revision_number': 2,
3395 u'author': {
3396 u'_account_id': 148512 ,
3397 u'email': u'reviewer@example.com',
3398 u'name': u'reviewer'
3399 },
3400 u'date': u'2017-03-17 05:19:37.500000000',
3401 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3402 u'message': u'Patch Set 2: Code-Review+1',
3403 },
3404 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003405 }),
3406 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3407 '/COMMIT_MSG': [
3408 {
3409 'author': {'email': u'reviewer@example.com'},
3410 'updated': u'2017-03-17 05:19:37.500000000',
3411 'patch_set': 2,
3412 'side': 'REVISION',
3413 'message': 'Please include a bug link',
3414 },
3415 ],
3416 'codereview.settings': [
3417 {
3418 'author': {'email': u'owner@example.com'},
3419 'updated': u'2017-03-16 20:00:41.000000000',
3420 'patch_set': 2,
3421 'side': 'PARENT',
3422 'line': 42,
3423 'message': 'I removed this because it is bad',
3424 },
3425 ]
3426 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003427 ] * 2
3428 expected_comments_summary = [
3429 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003430 message=(
3431 u'PTAL\n' +
3432 u'\n' +
3433 u'codereview.settings\n' +
3434 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3435 u'c/1/2/codereview.settings#b42\n' +
3436 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003437 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3438 disapproval=False, approval=False, sender=u'owner@example.com'),
3439 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003440 message=(
3441 u'Patch Set 2: Code-Review+1\n' +
3442 u'\n' +
3443 u'/COMMIT_MSG\n' +
3444 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3445 u'c/1/2//COMMIT_MSG#\n' +
3446 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003447 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3448 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3449 ]
3450 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3451 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3452
3453 with git_cl.gclient_utils.temporary_directory() as tempdir:
3454 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3455 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3456 '-j', out_file]))
3457 with open(out_file) as f:
3458 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003459 self.assertEqual(len(read), 2)
3460 self.assertEqual(read[0], {
3461 u'date': u'2017-03-16 20:00:41.000000',
3462 u'message': (
3463 u'PTAL\n' +
3464 u'\n' +
3465 u'codereview.settings\n' +
3466 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3467 u'c/1/2/codereview.settings#b42\n' +
3468 u' I removed this because it is bad\n'),
3469 u'approval': False,
3470 u'disapproval': False,
3471 u'sender': u'owner@example.com'})
3472 self.assertEqual(read[1], {
3473 u'date': u'2017-03-17 05:19:37.500000',
3474 u'message': (
3475 u'Patch Set 2: Code-Review+1\n' +
3476 u'\n' +
3477 u'/COMMIT_MSG\n' +
3478 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3479 u'c/1/2//COMMIT_MSG#\n' +
3480 u' Please include a bug link\n'),
3481 u'approval': False,
3482 u'disapproval': False,
3483 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003484
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003485
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003486if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003487 logging.basicConfig(
3488 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003489 unittest.main()