blob: 2cf432978da1bb26f8f596d5b3a2f8567944c498 [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
ukai@chromium.orge8077812012-02-03 03:41:46 +00001314 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001315 ((['git', 'push',
1316 'https://chromium.googlesource.com/yyy/zzz',
1317 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001318 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001319 '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'
Aaron Gable289b4312017-09-13 14:06:16 -07001327 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1328 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001329 'remote:\n'
1330 'To https://chromium.googlesource.com/yyy/zzz\n'
1331 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001332 ]
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'],), ''),
Daniel Cheng7227d212017-11-17 08:12:37 -08001344 (('AddReviewers', 'chromium-review.googlesource.com', 123456
1345 if squash else None, sorted(reviewers),
1346 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1347 cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001348 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001349 if tbr:
1350 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001351 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1352 ['LABELS']), {
1353 'labels': {
1354 'Code-Review': {
1355 'default_value': 0,
1356 'all': [],
1357 'values': {
1358 '+2': 'lgtm, approved',
1359 '+1': 'lgtm, but someone else must approve',
1360 ' 0': 'No score',
1361 '-1': 'Don\'t submit as-is',
1362 }
1363 }
1364 }
1365 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001366 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001367 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001368 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001369 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001370 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001371 return calls
1372
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001373 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001374 self,
1375 upload_args,
1376 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001377 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001378 squash=True,
1379 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001380 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001381 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001382 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001383 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001384 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001385 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001386 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001387 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001389 custom_cl_base=None,
1390 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001391 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001392 if squash_mode is None:
1393 if '--no-squash' in upload_args:
1394 squash_mode = 'nosquash'
1395 elif '--squash' in upload_args:
1396 squash_mode = 'squash'
1397 else:
1398 squash_mode = 'default'
1399
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001400 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001401 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001402 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001403 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001404 CookiesAuthenticatorMockFactory(
1405 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001406 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1407 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001408 self.mock(git_cl.gclient_utils, 'RunEditor',
1409 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001410 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1411 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001412
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001413 original_os_path_isdir = os.path.isdir
1414 def selective_os_path_isdir_mock(path):
1415 if path == '/cache/this-dir-exists':
1416 return self._mocked_call('os.path.isdir', path)
1417 return original_os_path_isdir(path)
1418 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1419
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001420 self.calls = self._gerrit_base_calls(
1421 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001422 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001423 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001424 other_cl_owner=other_cl_owner,
1425 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001426 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001427 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1428 expected_content=description))
1429 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001430 self.calls += self._gerrit_upload_calls(
1431 description, reviewers, squash,
1432 squash_mode=squash_mode,
1433 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001434 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001435 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001436 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001437 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001438 # Uncomment when debugging.
1439 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001440 git_cl.main(['upload'] + upload_args)
1441
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001442 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001443 self._run_gerrit_upload_test(
1444 ['--no-squash'],
1445 'desc\n\nBUG=\n',
1446 [],
1447 squash=False,
1448 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1449
1450 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001451 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001452 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001453 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001454 [],
tandriia60502f2016-06-20 02:01:53 -07001455 squash=False,
1456 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001457 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001458
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001459 def test_gerrit_no_reviewer(self):
1460 self._run_gerrit_upload_test(
1461 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001462 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001463 [],
1464 squash=False,
1465 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001466
Nick Carter8692b182017-11-06 16:30:38 -08001467 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001468 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1469 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001470 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001471 'desc\n\nBUG=\n\nChange-Id: I123456789',
1472 squash=False,
1473 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001474 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001475
ukai@chromium.orge8077812012-02-03 03:41:46 +00001476 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001477 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001478 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001479 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001480 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001481 squash=False,
1482 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001483 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001484
1485 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001486 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001487 [],
bradnelsond975b302016-10-23 12:20:23 -07001488 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1489 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001490 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001491 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001492 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001493 cc=['more@example.com', 'people@example.com'],
1494 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001495
1496 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001497 self._run_gerrit_upload_test(
1498 [],
1499 'desc\nBUG=\n\nChange-Id: 123456789',
1500 [],
1501 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001502
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001503 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001504 self._run_gerrit_upload_test(
1505 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001506 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001507 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001508 squash=True,
1509 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001510
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001511 def test_gerrit_upload_squash_first_against_rev(self):
1512 custom_cl_base = 'custom_cl_base_rev_or_branch'
1513 self._run_gerrit_upload_test(
1514 ['--squash', custom_cl_base],
1515 'desc\nBUG=\n\nChange-Id: 123456789',
1516 [],
1517 squash=True,
1518 expected_upstream_ref='origin/master',
1519 custom_cl_base=custom_cl_base)
1520 self.assertIn(
1521 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1522 sys.stdout.getvalue())
1523
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001524 def test_gerrit_upload_squash_first_with_mirror(self):
1525 self._run_gerrit_upload_test(
1526 ['--squash'],
1527 'desc\nBUG=\n\nChange-Id: 123456789',
1528 [],
1529 squash=True,
1530 expected_upstream_ref='origin/master',
1531 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1532
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001533 def test_gerrit_upload_squash_reupload(self):
1534 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001535 self._run_gerrit_upload_test(
1536 ['--squash'],
1537 description,
1538 [],
1539 squash=True,
1540 expected_upstream_ref='origin/master',
1541 issue=123456)
1542
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001543 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1544 self.mock(git_cl, 'DieWithError',
1545 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1546 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1547 with self.assertRaises(SystemExitMock):
1548 self._run_gerrit_upload_test(
1549 ['--squash'],
1550 description,
1551 [],
1552 squash=True,
1553 expected_upstream_ref='origin/master',
1554 issue=123456,
1555 fetched_status='ABANDONED')
1556
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001557 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1558 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1559 lambda *_, **__: {'email': 'yet-another@example.com'})
1560 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1561 self._run_gerrit_upload_test(
1562 ['--squash'],
1563 description,
1564 [],
1565 squash=True,
1566 expected_upstream_ref='origin/master',
1567 issue=123456,
1568 other_cl_owner='other@example.com')
1569 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001570 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001571 'authenticate to Gerrit as yet-another@example.com.\n'
1572 'Uploading may fail due to lack of permissions',
1573 git_cl.sys.stdout.getvalue())
1574
rmistry@google.com2dd99862015-06-22 12:22:18 +00001575 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001576 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001577 def mock_run_git(*args, **_kwargs):
1578 if args[0] == ['for-each-ref',
1579 '--format=%(refname:short) %(upstream:short)',
1580 'refs/heads']:
1581 # Create a local branch dependency tree that looks like this:
1582 # test1 -> test2 -> test3 -> test4 -> test5
1583 # -> test3.1
1584 # test6 -> test0
1585 branch_deps = [
1586 'test2 test1', # test1 -> test2
1587 'test3 test2', # test2 -> test3
1588 'test3.1 test2', # test2 -> test3.1
1589 'test4 test3', # test3 -> test4
1590 'test5 test4', # test4 -> test5
1591 'test6 test0', # test0 -> test6
1592 'test7', # test7
1593 ]
1594 return '\n'.join(branch_deps)
1595 self.mock(git_cl, 'RunGit', mock_run_git)
1596
1597 class RecordCalls:
1598 times_called = 0
1599 record_calls = RecordCalls()
1600 def mock_CMDupload(*args, **_kwargs):
1601 record_calls.times_called += 1
1602 return 0
1603 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1604
1605 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001606 (('ask_for_data', 'This command will checkout all dependent branches '
1607 'and run "git cl upload". Press Enter to continue, '
1608 'or Ctrl+C to abort'), ''),
1609 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001610
1611 class MockChangelist():
1612 def __init__(self):
1613 pass
1614 def GetBranch(self):
1615 return 'test1'
1616 def GetIssue(self):
1617 return '123'
1618 def GetPatchset(self):
1619 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001620 def IsGerrit(self):
1621 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001622
1623 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1624 # CMDupload should have been called 5 times because of 5 dependent branches.
1625 self.assertEquals(5, record_calls.times_called)
1626 self.assertEquals(0, ret)
1627
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001628 def test_gerrit_change_id(self):
1629 self.calls = [
1630 ((['git', 'write-tree'], ),
1631 'hashtree'),
1632 ((['git', 'rev-parse', 'HEAD~0'], ),
1633 'branch-parent'),
1634 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1635 'A B <a@b.org> 1456848326 +0100'),
1636 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1637 'C D <c@d.org> 1456858326 +0100'),
1638 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1639 'hashchange'),
1640 ]
1641 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1642 self.assertEqual(change_id, 'Ihashchange')
1643
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001644 def test_desecription_append_footer(self):
1645 for init_desc, footer_line, expected_desc in [
1646 # Use unique desc first lines for easy test failure identification.
1647 ('foo', 'R=one', 'foo\n\nR=one'),
1648 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1649 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1650 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1651 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1652 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1653 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1654 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1655 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1656 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1657 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1658 ]:
1659 desc = git_cl.ChangeDescription(init_desc)
1660 desc.append_footer(footer_line)
1661 self.assertEqual(desc.description, expected_desc)
1662
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001663 def test_update_reviewers(self):
1664 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001665 ('foo', [], [],
1666 'foo'),
1667 ('foo\nR=xx', [], [],
1668 'foo\nR=xx'),
1669 ('foo\nTBR=xx', [], [],
1670 'foo\nTBR=xx'),
1671 ('foo', ['a@c'], [],
1672 'foo\n\nR=a@c'),
1673 ('foo\nR=xx', ['a@c'], [],
1674 'foo\n\nR=a@c, xx'),
1675 ('foo\nTBR=xx', ['a@c'], [],
1676 'foo\n\nR=a@c\nTBR=xx'),
1677 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1678 'foo\n\nR=a@c, yy\nTBR=xx'),
1679 ('foo\nBUG=', ['a@c'], [],
1680 'foo\nBUG=\nR=a@c'),
1681 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1682 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1683 ('foo', ['a@c', 'b@c'], [],
1684 'foo\n\nR=a@c, b@c'),
1685 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1686 'foo\nBar\n\nR=c@c\nBUG='),
1687 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1688 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001689 # Same as the line before, but full of whitespaces.
1690 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001691 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001692 'foo\nBar\n\nR=c@c\n BUG =',
1693 ),
1694 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001695 ('foo BUG=allo R=joe ', ['c@c'], [],
1696 'foo BUG=allo R=joe\n\nR=c@c'),
1697 # Redundant TBRs get promoted to Rs
1698 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1699 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001700 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001701 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001702 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001703 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001704 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001705 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001706 actual.append(obj.description)
1707 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001708
Nodir Turakulov23b82142017-11-16 11:04:25 -08001709 def test_get_hash_tags(self):
1710 cases = [
1711 ('', []),
1712 ('a', []),
1713 ('[a]', ['a']),
1714 ('[aa]', ['aa']),
1715 ('[a ]', ['a']),
1716 ('[a- ]', ['a']),
1717 ('[a- b]', ['a-b']),
1718 ('[a--b]', ['a-b']),
1719 ('[a', []),
1720 ('[a]x', ['a']),
1721 ('[aa]x', ['aa']),
1722 ('[a b]', ['a-b']),
1723 ('[a b]', ['a-b']),
1724 ('[a__b]', ['a-b']),
1725 ('[a] x', ['a']),
1726 ('[a][b]', ['a', 'b']),
1727 ('[a] [b]', ['a', 'b']),
1728 ('[a][b]x', ['a', 'b']),
1729 ('[a][b] x', ['a', 'b']),
1730 ('[a]\n[b]', ['a']),
1731 ('[a\nb]', []),
1732 ('[a][', ['a']),
1733 ('Revert "[a] feature"', ['a']),
1734 ('Reland "[a] feature"', ['a']),
1735 ('Revert: [a] feature', ['a']),
1736 ('Reland: [a] feature', ['a']),
1737 ('Revert "Reland: [a] feature"', ['a']),
1738 ('Foo: feature', ['foo']),
1739 ('Foo Bar: feature', ['foo-bar']),
1740 ('Revert "Foo bar: feature"', ['foo-bar']),
1741 ('Reland "Foo bar: feature"', ['foo-bar']),
1742 ]
1743 for desc, expected in cases:
1744 change_desc = git_cl.ChangeDescription(desc)
1745 actual = change_desc.get_hash_tags()
1746 self.assertEqual(
1747 actual,
1748 expected,
1749 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1750
wittman@chromium.org455dc922015-01-26 20:15:50 +00001751 def test_get_target_ref(self):
1752 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001753 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001754 self.assertEqual(None, git_cl.GetTargetRef(None,
1755 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001756 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001757
wittman@chromium.org455dc922015-01-26 20:15:50 +00001758 # Check default target refs for branches.
1759 self.assertEqual('refs/heads/master',
1760 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001761 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001762 self.assertEqual('refs/heads/master',
1763 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001764 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001765 self.assertEqual('refs/heads/master',
1766 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001767 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001768 self.assertEqual('refs/branch-heads/123',
1769 git_cl.GetTargetRef('origin',
1770 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001771 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001772 self.assertEqual('refs/diff/test',
1773 git_cl.GetTargetRef('origin',
1774 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001775 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001776 self.assertEqual('refs/heads/chrome/m42',
1777 git_cl.GetTargetRef('origin',
1778 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001779 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001780
1781 # Check target refs for user-specified target branch.
1782 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1783 'refs/remotes/branch-heads/123'):
1784 self.assertEqual('refs/branch-heads/123',
1785 git_cl.GetTargetRef('origin',
1786 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001787 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001788 for branch in ('origin/master', 'remotes/origin/master',
1789 'refs/remotes/origin/master'):
1790 self.assertEqual('refs/heads/master',
1791 git_cl.GetTargetRef('origin',
1792 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001793 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001794 for branch in ('master', 'heads/master', 'refs/heads/master'):
1795 self.assertEqual('refs/heads/master',
1796 git_cl.GetTargetRef('origin',
1797 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001798 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001799
wychen@chromium.orga872e752015-04-28 23:42:18 +00001800 def test_patch_when_dirty(self):
1801 # Patch when local tree is dirty
1802 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1803 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1804
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001805 @staticmethod
1806 def _get_gerrit_codereview_server_calls(branch, value=None,
1807 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001808 detect_branch=True,
1809 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001810 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1811
1812 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1813 """
1814 calls = []
1815 if detect_branch:
1816 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001817 if detect_server:
1818 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1819 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001820 if value is None:
1821 calls += [
1822 ((['git', 'config', 'branch.' + branch + '.merge'],),
1823 'refs/heads' + branch),
1824 ((['git', 'config', 'branch.' + branch + '.remote'],),
1825 'origin'),
1826 ((['git', 'config', 'remote.origin.url'],),
1827 'https://%s.googlesource.com/my/repo' % git_short_host),
1828 ]
1829 return calls
1830
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001831 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001832 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001833 detect_gerrit_server=True,
1834 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001835 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1837 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001838 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001839 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001840 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1841
tandriidf09a462016-08-18 16:23:55 -07001842 if new_branch:
1843 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001844
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001845 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001846 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001847 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001848 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001849 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1850 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1851 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1852 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001853 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001854 if default_codereview == 'gerrit':
1855 if not force_codereview:
1856 self.calls += [
1857 ((['git', 'config', 'gerrit.host'],), 'true'),
1858 ]
1859 if detect_gerrit_server:
1860 self.calls += self._get_gerrit_codereview_server_calls(
1861 'master', git_short_host=git_short_host,
1862 detect_branch=not new_branch and force_codereview)
1863 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001864
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001865 elif default_codereview == 'rietveld':
1866 self.calls += [
1867 ((['git', 'config', 'gerrit.host'],), CERR1),
1868 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1869 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
1870 ]
1871 actual_codereview = 'rietveld'
1872
1873 if actual_codereview == 'rietveld':
1874 self.calls += [
1875 ((['git', 'rev-parse', '--show-cdup'],), ''),
1876 ]
1877 if not default_codereview:
1878 self.calls += [
1879 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1880 ]
1881 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001882 self.calls += [
1883 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001884 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001885 {
1886 'current_revision': '7777777777',
1887 'revisions': {
1888 '1111111111': {
1889 '_number': 1,
1890 'fetch': {'http': {
1891 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1892 'ref': 'refs/changes/56/123456/1',
1893 }},
1894 },
1895 '7777777777': {
1896 '_number': 7,
1897 'fetch': {'http': {
1898 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1899 'ref': 'refs/changes/56/123456/7',
1900 }},
1901 },
1902 },
1903 }),
1904 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001905
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001906 def _common_patch_rietveld_successful(self, **kwargs):
1907 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001908 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001909 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001910 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001911 ((['git', 'config', 'branch.master.rietveldserver',
1912 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001913 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001914 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001915 ((['git', 'commit', '-m',
1916 'Description\n\n' +
1917 'patch from issue 123456 at patchset 60001 ' +
1918 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001919 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001920
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001921 def test_patch_rietveld_default(self):
1922 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001923 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1924
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001925 def test_patch_rietveld_successful_new_branch(self):
1926 self._common_patch_rietveld_successful(default_codereview='rietveld',
1927 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001928 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1929
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001930 def test_patch_rietveld_guess_by_url(self):
1931 self._common_patch_rietveld_successful(
1932 default_codereview=None, # It doesn't matter.
1933 actual_codereview='rietveld')
1934 self.assertEqual(git_cl.main(
1935 ['patch', 'https://codereview.example.com/123456']), 0)
1936
1937 def test_patch_rietveld_conflict(self):
1938 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07001939 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001940 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001941
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001942 def test_patch_gerrit_default(self):
1943 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001944 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001945 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08001946 ((['git', 'config', 'remote.origin.url'],),
1947 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001948 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1949 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001950 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001951 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001952 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001953 ((['git', 'config', 'branch.master.gerritserver',
1954 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001955 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001956 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1957 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1958 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001959 ]
1960 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1961
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001962 def test_patch_gerrit_force(self):
1963 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001964 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001965 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08001966 ((['git', 'config', 'remote.origin.url'],),
1967 'https://host.googlesource.com/my/repo'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001968 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001969 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001970 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001971 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001972 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001973 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001974 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001975 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001976 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1977 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1978 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001979 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001980 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001981
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001982 def test_patch_gerrit_guess_by_url(self):
1983 self._patch_common(
1984 default_codereview=None, # It doesn't matter what's default.
1985 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08001986 git_short_host='else')
1987 self.calls += self._get_gerrit_codereview_server_calls(
1988 'master', git_short_host='else', detect_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001989 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001990 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001991 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001992 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001993 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001994 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001995 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001996 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001997 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001998 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1999 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2000 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 ]
2002 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002003 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002004
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002005 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2006 self._patch_common(
2007 default_codereview=None, # It doesn't matter what's default.
2008 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08002009 git_short_host='else')
2010 self.calls += self._get_gerrit_codereview_server_calls(
2011 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002012 self.calls += [
2013 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2014 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002015 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002016 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2017 ''),
2018 ((['git', 'config', 'branch.master.gerritserver',
2019 'https://else-review.googlesource.com'],), ''),
2020 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002021 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2022 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2023 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002024 ]
2025 self.assertEqual(git_cl.main(
2026 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2027
Aaron Gable697a91b2018-01-19 15:20:15 -08002028 def test_patch_gerrit_guess_by_url_with_repo(self):
2029 self._patch_common(
2030 default_codereview=None, # It doesn't matter what's default.
2031 actual_codereview='gerrit',
2032 git_short_host='else')
2033 self.calls += self._get_gerrit_codereview_server_calls(
2034 'master', git_short_host='else', detect_server=False)
2035 self.calls += [
2036 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2037 'refs/changes/56/123456/1'],), ''),
2038 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2039 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2040 ''),
2041 ((['git', 'config', 'branch.master.gerritserver',
2042 'https://else-review.googlesource.com'],), ''),
2043 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2044 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2045 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2046 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
2047 ]
2048 self.assertEqual(git_cl.main(
2049 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
2050 0)
2051
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002052 def test_patch_gerrit_conflict(self):
2053 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002054 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002055 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002056 ((['git', 'config', 'remote.origin.url'],),
2057 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002058 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002059 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002060 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2061 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2062 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002063 ]
2064 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002065 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002066
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002067 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002068 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002069 raise git_cl.gerrit_util.GerritError(404, '')
2070 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2071
tandriic2405f52016-10-10 08:13:15 -07002072 self.calls = [
2073 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002074 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2075 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2076 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2077 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002078 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2079 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2080 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2081 ((['git', 'config', 'remote.origin.url'],),
2082 'https://chromium.googlesource.com/my/repo'),
2083 ((['DieWithError',
2084 'change 123456 at https://chromium-review.googlesource.com does not '
2085 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002086 ]
2087 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002088 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002089
Aaron Gable697a91b2018-01-19 15:20:15 -08002090 def test_patch_gerrit_wrong_repo(self):
2091 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
2092 detect_gerrit_server=True)
2093 self.calls += [
2094 ((['git', 'config', 'remote.origin.url'],),
2095 'https://chromium.googlesource.com/wrong/repo'),
2096 ((['DieWithError',
2097 'Trying to patch a change from '
2098 'https://chromium.googlesource.com/my/repo but this repo appears '
2099 'to be https://chromium.googlesource.com/wrong/repo.'],),
2100 SystemExitMock()),
2101 ]
2102 with self.assertRaises(SystemExitMock):
2103 self.assertEqual(1, git_cl.main(['patch', '123456']))
2104
2105
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002106 def _checkout_calls(self):
2107 return [
2108 ((['git', 'config', '--local', '--get-regexp',
2109 'branch\\..*\\.rietveldissue'], ),
2110 ('branch.retrying.rietveldissue 1111111111\n'
2111 'branch.some-fix.rietveldissue 2222222222\n')),
2112 ((['git', 'config', '--local', '--get-regexp',
2113 'branch\\..*\\.gerritissue'], ),
2114 ('branch.ger-branch.gerritissue 123456\n'
2115 'branch.gbranch654.gerritissue 654321\n')),
2116 ]
2117
2118 def test_checkout_gerrit(self):
2119 """Tests git cl checkout <issue>."""
2120 self.calls = self._checkout_calls()
2121 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2122 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2123
2124 def test_checkout_rietveld(self):
2125 """Tests git cl checkout <issue>."""
2126 self.calls = self._checkout_calls()
2127 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2128 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2129
2130 def test_checkout_not_found(self):
2131 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002132 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002133 self.calls = self._checkout_calls()
2134 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2135
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002136 def test_checkout_no_branch_issues(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.org26c8fd22016-04-11 21:33:21 +00002139 self.calls = [
2140 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002141 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002142 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002143 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002144 ]
2145 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2146
tandrii@chromium.org28253532016-04-14 13:46:56 +00002147 def _test_gerrit_ensure_authenticated_common(self, auth,
2148 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002149 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2150 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2151 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002152 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002153 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002154 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002155 cl.branch = 'master'
2156 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002157 cl.lookedup_issue = True
2158 return cl
2159
2160 def test_gerrit_ensure_authenticated_missing(self):
2161 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002162 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002163 })
2164 self.calls.append(
2165 ((['DieWithError',
2166 'Credentials for the following hosts are required:\n'
2167 ' chromium-review.googlesource.com\n'
2168 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002169 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002170 'https://chromium-review.googlesource.com/new-password'],), ''),)
2171 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2172
2173 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002174 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002175 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002176 'chromium.googlesource.com':
2177 ('git-one.example.com', None, 'secret1'),
2178 'chromium-review.googlesource.com':
2179 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002180 })
2181 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002182 (('ask_for_data', 'If you know what you are doing '
2183 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002184 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2185
2186 def test_gerrit_ensure_authenticated_ok(self):
2187 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002188 'chromium.googlesource.com':
2189 ('git-same.example.com', None, 'secret'),
2190 'chromium-review.googlesource.com':
2191 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002192 })
2193 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2194
tandrii@chromium.org28253532016-04-14 13:46:56 +00002195 def test_gerrit_ensure_authenticated_skipped(self):
2196 cl = self._test_gerrit_ensure_authenticated_common(
2197 auth={}, skip_auth_check=True)
2198 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2199
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002200 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002201 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2202 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002203 self.calls = [
2204 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002205 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002206 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2207 ((['git', 'config', 'rietveld.server'],), ''),
2208 ((['git', 'config', 'rietveld.server'],), ''),
2209 ((['git', 'config', 'branch.feature.rietveldserver'],),
2210 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002211 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002212 ]
2213 self.assertEqual(0, git_cl.main(['set-commit']))
2214
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002215 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002216 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002217 lambda h, i, labels, notify=None:
2218 self._mocked_call(['SetReview', h, i, labels, notify]))
2219
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002220 self.calls = [
2221 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002222 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2223 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002224 ((['git', 'config', 'branch.feature.gerritserver'],),
2225 'https://chromium-review.googlesource.com'),
2226 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002227 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002228 ]
tandriid9e5ce52016-07-13 02:32:59 -07002229
2230 def test_cmd_set_commit_gerrit_clear(self):
2231 self._cmd_set_commit_gerrit_common(0)
2232 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2233
2234 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002235 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002236 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2237
tandriid9e5ce52016-07-13 02:32:59 -07002238 def test_cmd_set_commit_gerrit(self):
2239 self._cmd_set_commit_gerrit_common(2)
2240 self.assertEqual(0, git_cl.main(['set-commit']))
2241
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002242 def test_description_display(self):
2243 out = StringIO.StringIO()
2244 self.mock(git_cl.sys, 'stdout', out)
2245
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002246 self.mock(git_cl, 'Changelist', ChangelistMock)
2247 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002248
2249 self.assertEqual(0, git_cl.main(['description', '-d']))
2250 self.assertEqual('foo\n', out.getvalue())
2251
2252 def test_description_rietveld(self):
2253 out = StringIO.StringIO()
2254 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002255 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002256
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002257 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002258 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002259 self.assertEqual('foobar\n', out.getvalue())
2260
iannucci3c972b92016-08-17 13:24:10 -07002261 def test_StatusFieldOverrideIssueMissingArgs(self):
2262 out = StringIO.StringIO()
2263 self.mock(git_cl.sys, 'stderr', out)
2264
2265 try:
2266 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2267 except SystemExit as ex:
2268 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002269 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002270
2271 out = StringIO.StringIO()
2272 self.mock(git_cl.sys, 'stderr', out)
2273
2274 try:
2275 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2276 except SystemExit as ex:
2277 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002278 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002279
2280 def test_StatusFieldOverrideIssue(self):
2281 out = StringIO.StringIO()
2282 self.mock(git_cl.sys, 'stdout', out)
2283
2284 def assertIssue(cl_self, *_args):
2285 self.assertEquals(cl_self.issue, 1)
2286 return 'foobar'
2287
2288 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2289 self.calls = [
2290 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2291 ((['git', 'config', 'rietveld.server'],), ''),
2292 ((['git', 'config', 'rietveld.server'],), ''),
2293 ]
iannuccie53c9352016-08-17 14:40:40 -07002294 self.assertEqual(
2295 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2296 0)
iannucci3c972b92016-08-17 13:24:10 -07002297 self.assertEqual(out.getvalue(), 'foobar\n')
2298
iannuccie53c9352016-08-17 14:40:40 -07002299 def test_SetCloseOverrideIssue(self):
2300 def assertIssue(cl_self, *_args):
2301 self.assertEquals(cl_self.issue, 1)
2302 return 'foobar'
2303
2304 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2305 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2306 self.calls = [
2307 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2308 ((['git', 'config', 'rietveld.server'],), ''),
2309 ((['git', 'config', 'rietveld.server'],), ''),
2310 ]
2311 self.assertEqual(
2312 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2313
2314 def test_SetCommitOverrideIssue(self):
2315 def assertIssue(cl_self, *_args):
2316 self.assertEquals(cl_self.issue, 1)
2317 return 'foobar'
2318
2319 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2320 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2321 self.calls = [
2322 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2323 ((['git', 'config', 'rietveld.server'],), ''),
2324 ((['git', 'config', 'rietveld.server'],), ''),
2325 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2326 ((['git', 'config', 'rietveld.server'],), ''),
2327 ((['git', 'config', 'rietveld.server'],), ''),
2328 ]
2329 self.assertEqual(
2330 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2331
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002332 def test_description_gerrit(self):
2333 out = StringIO.StringIO()
2334 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002335 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002336 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002337 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2338 {
2339 'current_revision': 'sha1',
2340 'revisions': {'sha1': {
2341 'commit': {'message': 'foobar'},
2342 }},
2343 }),
2344 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002345 self.assertEqual(0, git_cl.main([
2346 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2347 self.assertEqual('foobar\n', out.getvalue())
2348
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002349 def test_description_set_raw(self):
2350 out = StringIO.StringIO()
2351 self.mock(git_cl.sys, 'stdout', out)
2352
2353 self.mock(git_cl, 'Changelist', ChangelistMock)
2354 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2355
2356 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2357 self.assertEqual('hihi', ChangelistMock.desc)
2358
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002359 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002360 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002361
2362 def RunEditor(desc, _, **kwargs):
2363 self.assertEquals(
2364 '# Enter a description of the change.\n'
2365 '# This will be displayed on the codereview site.\n'
2366 '# The first line will also be used as the subject of the review.\n'
2367 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002368 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002369 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002370 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002371 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002372 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002373
dsansomee2d6fd92016-09-08 00:10:47 -07002374 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002375 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002376
2377 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2378 self.mock(git_cl.Changelist, 'GetDescription',
2379 lambda *args: current_desc)
2380 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2381 UpdateDescriptionRemote)
2382 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2383
2384 self.calls = [
2385 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002386 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002387 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2388 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002389 ((['git', 'config', 'core.editor'],), 'vi'),
2390 ]
2391 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2392
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002393 def test_description_set_stdin(self):
2394 out = StringIO.StringIO()
2395 self.mock(git_cl.sys, 'stdout', out)
2396
2397 self.mock(git_cl, 'Changelist', ChangelistMock)
2398 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2399
2400 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2401 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2402
kmarshall3bff56b2016-06-06 18:31:47 -07002403 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002404 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2405
kmarshall3bff56b2016-06-06 18:31:47 -07002406 self.calls = \
2407 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2408 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002409 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002410 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2411 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002412 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2413 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2414 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002415 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2416 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2417 ((['git', 'branch', '-D', 'foo'],), '')]
2418
kmarshall3bff56b2016-06-06 18:31:47 -07002419 self.mock(git_cl, 'get_cl_statuses',
2420 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002421 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2422 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2423 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002424
2425 self.assertEqual(0, git_cl.main(['archive', '-f']))
2426
2427 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002428 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002429 self.calls = \
2430 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2431 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002432 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002433 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2434 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002435 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2436
kmarshall9249e012016-08-23 12:02:16 -07002437 self.mock(git_cl, 'get_cl_statuses',
2438 lambda branches, fine_grained, max_processes:
2439 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2440
2441 self.assertEqual(1, git_cl.main(['archive', '-f']))
2442
2443 def test_archive_dry_run(self):
2444 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2445
2446 self.calls = \
2447 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2448 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2449 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2450 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2451 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2452 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2453 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2454 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2455 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002456
2457 self.mock(git_cl, 'get_cl_statuses',
2458 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002459 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2460 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2461 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002462
kmarshall9249e012016-08-23 12:02:16 -07002463 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2464
2465 def test_archive_no_tags(self):
2466 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2467
2468 self.calls = \
2469 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2470 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2471 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2472 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2473 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2474 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2475 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2476 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2477 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2478 ((['git', 'branch', '-D', 'foo'],), '')]
2479
2480 self.mock(git_cl, 'get_cl_statuses',
2481 lambda branches, fine_grained, max_processes:
2482 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2483 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2484 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2485
2486 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002487
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002488 def test_cmd_issue_erase_existing(self):
2489 out = StringIO.StringIO()
2490 self.mock(git_cl.sys, 'stdout', out)
2491 self.calls = [
2492 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002493 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2494 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002495 # Let this command raise exception (retcode=1) - it should be ignored.
2496 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002497 CERR1),
2498 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2499 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002500 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2501 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2502 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002503 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002504 ]
2505 self.assertEqual(0, git_cl.main(['issue', '0']))
2506
Aaron Gable400e9892017-07-12 15:31:21 -07002507 def test_cmd_issue_erase_existing_with_change_id(self):
2508 out = StringIO.StringIO()
2509 self.mock(git_cl.sys, 'stdout', out)
2510 self.mock(git_cl.Changelist, 'GetDescription',
2511 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2512 self.calls = [
2513 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2514 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2515 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002516 # Let this command raise exception (retcode=1) - it should be ignored.
2517 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2518 CERR1),
2519 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2520 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2521 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2522 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2523 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002524 ((['git', 'log', '-1', '--format=%B'],),
2525 'This is a description\n\nChange-Id: Ideadbeef'),
2526 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002527 ]
2528 self.assertEqual(0, git_cl.main(['issue', '0']))
2529
phajdan.jre328cf92016-08-22 04:12:17 -07002530 def test_cmd_issue_json(self):
2531 out = StringIO.StringIO()
2532 self.mock(git_cl.sys, 'stdout', out)
2533 self.calls = [
2534 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002535 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002536 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2537 ((['git', 'config', 'rietveld.server'],),
2538 'https://codereview.chromium.org'),
2539 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2540 (('write_json', 'output.json',
2541 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2542 ''),
2543 ]
2544 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2545
tandriide281ae2016-10-12 06:02:30 -07002546 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002547 self.mock(git_cl.Changelist, 'GetChange',
2548 lambda _, *a: (
2549 self._mocked_call(['GetChange']+list(a))))
2550 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2551 lambda *_, **__: (
2552 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002553 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2554 lambda _, s: self._mocked_call(['SetCQState', s]))
2555 self.calls = [
2556 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002557 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002558 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2559 ((['git', 'config', 'rietveld.server'],),
2560 'https://codereview.chromium.org'),
2561 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2562 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2563 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2564 ((['get_or_create_merge_base', 'feature', 'feature'],),
2565 'fake_ancestor_sha'),
2566 ((['GetChange', 'fake_ancestor_sha', None], ),
2567 git_cl.presubmit_support.GitChange(
2568 '', '', '', '', '', '', '', '')),
2569 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2570 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002571 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2572 ]
2573 out = StringIO.StringIO()
2574 self.mock(git_cl.sys, 'stdout', out)
2575 self.assertEqual(0, git_cl.main(['try']))
2576 self.assertEqual(
2577 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002578 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002579
tandrii8c5a3532016-11-04 07:52:02 -07002580 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2581 self.mock(git_cl.Changelist, 'GetChange',
2582 lambda _, *a: (
2583 self._mocked_call(['GetChange']+list(a))))
2584 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2585 lambda *_, **__: (
2586 self._mocked_call(['DoGetTryMasters'])))
2587 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2588 lambda _, s: self._mocked_call(['SetCQState', s]))
2589
tandrii8c5a3532016-11-04 07:52:02 -07002590 self.calls = [
2591 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2592 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2593 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2594 ((['git', 'config', 'branch.feature.gerritserver'],),
2595 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002596 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2597 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2598 'project': 'depot_tools',
2599 'status': 'OPEN',
2600 'owner': {'email': 'owner@e.mail'},
2601 'revisions': {
2602 'deadbeaf': {
2603 '_number': 6,
2604 },
2605 'beeeeeef': {
2606 '_number': 7,
2607 'fetch': {'http': {
2608 'url': 'https://chromium.googlesource.com/depot_tools',
2609 'ref': 'refs/changes/56/123456/7'
2610 }},
2611 },
2612 },
2613 }),
tandrii8c5a3532016-11-04 07:52:02 -07002614 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2615 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2616 ((['get_or_create_merge_base', 'feature', 'feature'],),
2617 'fake_ancestor_sha'),
2618 ((['GetChange', 'fake_ancestor_sha', None], ),
2619 git_cl.presubmit_support.GitChange(
2620 '', '', '', '', '', '', '', '')),
2621 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2622 ((['DoGetTryMasters'], ), None),
2623 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2624 ]
2625 out = StringIO.StringIO()
2626 self.mock(git_cl.sys, 'stdout', out)
2627 self.assertEqual(0, git_cl.main(['try']))
2628 self.assertEqual(
2629 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002630 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002631 'https://chromium-review.googlesource.com/123456\n')
2632
2633 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2634 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2635 lambda _: {
2636 'owner_email': 'owner@e.mail',
2637 'private': False,
2638 'closed': False,
2639 'project': 'depot_tools',
2640 'patchsets': [20001],
2641 })
tandriide281ae2016-10-12 06:02:30 -07002642 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2643 self.calls = [
2644 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2645 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2646 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2647 ((['git', 'config', 'rietveld.server'],),
2648 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002649 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002650 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002651 ]
2652
2653 def _buildbucket_retry(*_, **kw):
2654 # self.maxDiff = 10000
2655 body = json.loads(kw['body'])
2656 self.assertEqual(len(body['builds']), 1)
2657 build = body['builds'][0]
2658 params = json.loads(build.pop('parameters_json'))
2659 self.assertEqual(params, {
2660 u'builder_name': u'win',
2661 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2662 u'revision': None}],
2663 u'properties': {
2664 u'category': u'git_cl_try',
2665 u'issue': 123,
2666 u'key': u'val',
2667 u'json': [{u'a': 1}, None],
2668 u'master': u'tryserver.chromium',
2669 u'patch_project': u'depot_tools',
2670 u'patch_storage': u'rietveld',
2671 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002672 u'rietveld': u'https://codereview.chromium.org',
2673 }
2674 })
2675 self.assertEqual(build, {
2676 u'bucket': u'master.tryserver.chromium',
2677 u'client_operation_id': u'uuid4',
2678 u'tags': [u'builder:win',
2679 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002680 u'user_agent:git_cl_try',
2681 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002682 })
2683
2684 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2685
2686 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2687 self.assertEqual(0, git_cl.main([
2688 'try', '-m', 'tryserver.chromium', '-b', 'win',
2689 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2690 self.assertRegexpMatches(
2691 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002692 'Tried jobs on:\nBucket: master.tryserver.chromium')
2693
tandrii8c5a3532016-11-04 07:52:02 -07002694 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2695 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2696 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2697
tandrii8c5a3532016-11-04 07:52:02 -07002698 self.calls = [
2699 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2700 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2701 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2702 ((['git', 'config', 'branch.feature.gerritserver'],),
2703 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002704 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002705 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002706 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002707 'status': 'OPEN',
2708 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002709 'revisions': {
2710 'deadbeaf': {
2711 '_number': 6,
2712 },
2713 'beeeeeef': {
2714 '_number': 7,
2715 'fetch': {'http': {
2716 'url': 'https://chromium.googlesource.com/depot_tools',
2717 'ref': 'refs/changes/56/123456/7'
2718 }},
2719 },
2720 },
2721 }),
2722 ]
2723
2724 def _buildbucket_retry(*_, **kw):
2725 # self.maxDiff = 10000
2726 body = json.loads(kw['body'])
2727 self.assertEqual(len(body['builds']), 1)
2728 build = body['builds'][0]
2729 params = json.loads(build.pop('parameters_json'))
2730 self.assertEqual(params, {
2731 u'builder_name': u'win',
2732 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2733 u'revision': None}],
2734 u'properties': {
2735 u'category': u'git_cl_try',
2736 u'key': u'val',
2737 u'json': [{u'a': 1}, None],
2738 u'master': u'tryserver.chromium',
2739
2740 u'patch_gerrit_url':
2741 u'https://chromium-review.googlesource.com',
2742 u'patch_issue': 123456,
2743 u'patch_project': u'depot_tools',
2744 u'patch_ref': u'refs/changes/56/123456/7',
2745 u'patch_repository_url':
2746 u'https://chromium.googlesource.com/depot_tools',
2747 u'patch_set': 7,
2748 u'patch_storage': u'gerrit',
2749 }
2750 })
2751 self.assertEqual(build, {
2752 u'bucket': u'master.tryserver.chromium',
2753 u'client_operation_id': u'uuid4',
2754 u'tags': [
2755 u'builder:win',
2756 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2757 u'user_agent:git_cl_try',
2758 u'master:tryserver.chromium'],
2759 })
2760
2761 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2762
2763 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2764 self.assertEqual(0, git_cl.main([
2765 'try', '-m', 'tryserver.chromium', '-b', 'win',
2766 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2767 self.assertRegexpMatches(
2768 git_cl.sys.stdout.getvalue(),
2769 'Tried jobs on:\nBucket: master.tryserver.chromium')
2770
borenet6c0efe62016-10-19 08:13:29 -07002771 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002772 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2773 lambda _: {
2774 'owner_email': 'owner@e.mail',
2775 'private': False,
2776 'closed': False,
2777 'project': 'depot_tools',
2778 'patchsets': [20001],
2779 })
borenet6c0efe62016-10-19 08:13:29 -07002780 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2781 self.calls = [
2782 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2783 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2784 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2785 ((['git', 'config', 'rietveld.server'],),
2786 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002787 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002788 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002789 ]
2790
2791 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002792 body = json.loads(kw['body'])
2793 self.assertEqual(len(body['builds']), 1)
2794 build = body['builds'][0]
2795 params = json.loads(build.pop('parameters_json'))
2796 self.assertEqual(params, {
2797 u'builder_name': u'win',
2798 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2799 u'revision': None}],
2800 u'properties': {
2801 u'category': u'git_cl_try',
2802 u'issue': 123,
2803 u'patch_project': u'depot_tools',
2804 u'patch_storage': u'rietveld',
2805 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002806 u'rietveld': u'https://codereview.chromium.org',
2807 }
2808 })
2809 self.assertEqual(build, {
2810 u'bucket': u'test.bucket',
2811 u'client_operation_id': u'uuid4',
2812 u'tags': [u'builder:win',
2813 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2814 u'user_agent:git_cl_try'],
2815 })
2816
2817 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2818
2819 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2820 self.assertEqual(0, git_cl.main([
2821 'try', '-B', 'test.bucket', '-b', 'win']))
2822 self.assertRegexpMatches(
2823 git_cl.sys.stdout.getvalue(),
2824 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002825
qyearsley123a4682016-10-26 09:12:17 -07002826 def test_git_cl_try_bots_on_multiple_masters(self):
2827 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2828 self.calls = [
2829 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2830 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2831 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2832 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002833 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002834 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2835 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2836 ]
2837
2838 def _buildbucket_retry(*_, **kw):
2839 body = json.loads(kw['body'])
2840 self.assertEqual(len(body['builds']), 2)
2841
Nodir Turakulovb422e682018-02-20 22:51:30 -08002842 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2843 params = json.loads(body['builds'][0]['parameters_json'])
2844 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002845
Nodir Turakulovb422e682018-02-20 22:51:30 -08002846 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2847 params = json.loads(body['builds'][1]['parameters_json'])
2848 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002849
2850 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2851
2852 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002853 json.dumps({
2854 'builder1': {'bucket': 'bucket1'},
2855 'builder2': {'bucket': 'bucket2'},
2856 })))
qyearsley123a4682016-10-26 09:12:17 -07002857
2858 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2859 self.assertEqual(
2860 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2861 self.assertEqual(
2862 git_cl.sys.stdout.getvalue(),
2863 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002864 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002865 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002866 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002867 ' builder2: []\n'
2868 'To see results here, run: git cl try-results\n'
2869 'To see results in browser, run: git cl web\n')
2870
tandrii16e0b4e2016-06-07 10:34:28 -07002871 def _common_GerritCommitMsgHookCheck(self):
2872 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2873 self.mock(git_cl.os.path, 'abspath',
2874 lambda path: self._mocked_call(['abspath', path]))
2875 self.mock(git_cl.os.path, 'exists',
2876 lambda path: self._mocked_call(['exists', path]))
2877 self.mock(git_cl.gclient_utils, 'FileRead',
2878 lambda path: self._mocked_call(['FileRead', path]))
2879 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2880 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2881 self.calls = [
2882 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2883 ((['abspath', '../'],), '/abs/git_repo_root'),
2884 ]
2885 return git_cl.Changelist(codereview='gerrit', issue=123)
2886
2887 def test_GerritCommitMsgHookCheck_custom_hook(self):
2888 cl = self._common_GerritCommitMsgHookCheck()
2889 self.calls += [
2890 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2891 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2892 '#!/bin/sh\necho "custom hook"')
2893 ]
2894 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2895
2896 def test_GerritCommitMsgHookCheck_not_exists(self):
2897 cl = self._common_GerritCommitMsgHookCheck()
2898 self.calls += [
2899 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2900 ]
2901 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2902
2903 def test_GerritCommitMsgHookCheck(self):
2904 cl = self._common_GerritCommitMsgHookCheck()
2905 self.calls += [
2906 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2907 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2908 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002909 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002910 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2911 ''),
2912 ]
2913 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2914
tandriic4344b52016-08-29 06:04:54 -07002915 def test_GerritCmdLand(self):
2916 self.calls += [
2917 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2918 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2919 'deadbeaf'),
2920 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2921 ((['git', 'config', 'branch.feature.gerritserver'],),
2922 'chromium-review.googlesource.com'),
2923 ]
2924 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2925 cl._codereview_impl._GetChangeDetail = lambda _: {
2926 'labels': {},
2927 'current_revision': 'deadbeaf',
2928 }
agable32978d92016-11-01 12:55:02 -07002929 cl._codereview_impl._GetChangeCommit = lambda: {
2930 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002931 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002932 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2933 }
tandriic4344b52016-08-29 06:04:54 -07002934 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002935 out = StringIO.StringIO()
2936 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002937 self.assertEqual(0, cl.CMDLand(force=True,
2938 bypass_hooks=True,
2939 verbose=True,
2940 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002941 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002942 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002943
tandrii221ab252016-10-06 08:12:04 -07002944 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002945 '9000': {
2946 'id': '9000',
2947 'bucket': 'master.x.y',
2948 'created_by': 'user:someone@chromium.org',
2949 'created_ts': '147200002222000',
2950 'experimental': False,
2951 'parameters_json': json.dumps({
2952 'builder_name': 'my-bot',
2953 'properties': {'category': 'cq'},
2954 }),
2955 'status': 'STARTED',
2956 'tags': [
2957 'build_address:x.y/my-bot/2',
2958 'builder:my-bot',
2959 'experimental:false',
2960 'user_agent:cq',
2961 ],
2962 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2963 },
2964 '8000': {
2965 'id': '8000',
2966 'bucket': 'master.x.y',
2967 'created_by': 'user:someone@chromium.org',
2968 'created_ts': '147200001111000',
2969 'experimental': False,
2970 'failure_reason': 'BUILD_FAILURE',
2971 'parameters_json': json.dumps({
2972 'builder_name': 'my-bot',
2973 'properties': {'category': 'cq'},
2974 }),
2975 'result_details_json': json.dumps({
2976 'properties': {'buildnumber': 1},
2977 }),
2978 'result': 'FAILURE',
2979 'status': 'COMPLETED',
2980 'tags': [
2981 'build_address:x.y/my-bot/1',
2982 'builder:my-bot',
2983 'experimental:false',
2984 'user_agent:cq',
2985 ],
2986 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2987 },
2988 }
tandrii221ab252016-10-06 08:12:04 -07002989
2990 def test_write_try_results_json(self):
2991 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002992 {
2993 'bucket': 'master.x.y',
2994 'buildbucket_id': '8000',
2995 'builder_name': 'my-bot',
2996 'created_ts': '147200001111000',
2997 'experimental': False,
2998 'failure_reason': 'BUILD_FAILURE',
2999 'result': 'FAILURE',
3000 'status': 'COMPLETED',
3001 'tags': [
3002 'build_address:x.y/my-bot/1',
3003 'builder:my-bot',
3004 'experimental:false',
3005 'user_agent:cq',
3006 ],
3007 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3008 },
3009 {
3010 'bucket': 'master.x.y',
3011 'buildbucket_id': '9000',
3012 'builder_name': 'my-bot',
3013 'created_ts': '147200002222000',
3014 'experimental': False,
3015 'failure_reason': None,
3016 'result': None,
3017 'status': 'STARTED',
3018 'tags': [
3019 'build_address:x.y/my-bot/2',
3020 'builder:my-bot',
3021 'experimental:false',
3022 'user_agent:cq',
3023 ],
3024 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3025 },
tandrii221ab252016-10-06 08:12:04 -07003026 ]
3027 self.calls = [(('write_json', 'output.json', expected_output), '')]
3028 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3029
tandrii45b2a582016-10-11 03:14:16 -07003030 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003031 out = StringIO.StringIO()
3032 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003033 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3034 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003035 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3036 self._mocked_call(['get_authenticator_for_host', host]))
3037 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3038 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003039
3040 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3041 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003042 self.calls += [
3043 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3044 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3045 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3046 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3047 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3048 ((['git', 'config', 'branch.feature.rietveldserver'],),
3049 'codereview.example.com'),
3050 ((['get_authenticator_for_host', 'codereview.example.com'],),
3051 AuthenticatorMock()),
3052 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3053
3054 def test_fetch_try_jobs_none_rietveld(self):
3055 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003056 # Simulate that user isn't logged in.
3057 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003058 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003059 self.assertRegexpMatches(sys.stdout.getvalue(),
3060 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003061 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3062
3063 def test_fetch_try_jobs_some_rietveld(self):
3064 self._setup_fetch_try_jobs_rietveld({
3065 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3066 })
3067 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003068 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3069 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3070 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3071
3072 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3073 self._setup_fetch_try_jobs(most_recent_patchset=13)
3074 self.calls += [
3075 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3076 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3077 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003078 # TODO(tandrii): Uncomment the below if we decide to support checking
3079 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003080 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003081 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003082 ((['git', 'config', 'branch.feature.gerritserver'],),
3083 'https://x-review.googlesource.com'),
3084 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3085 AuthenticatorMock()),
3086 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3087
3088 def test_fetch_try_jobs_none_gerrit(self):
3089 self._setup_fetch_try_jobs_gerrit({})
3090 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003091 # TODO(tandrii): Uncomment the below if we decide to support checking
3092 # patchsets for Gerrit.
3093 # self.assertRegexpMatches(
3094 # sys.stdout.getvalue(),
3095 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003096 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3097
3098 def test_fetch_try_jobs_some_gerrit(self):
3099 self._setup_fetch_try_jobs_gerrit({
3100 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3101 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003102 # TODO(tandrii): Uncomment the below if we decide to support checking
3103 # patchsets for Gerrit.
3104 # self.calls.remove(
3105 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003106 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3107
3108 # ... and doesn't result in warning.
3109 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3110 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003111 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3112 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3113
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003114 def _mock_gerrit_changes_for_detail_cache(self):
3115 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003116
3117 def test_gerrit_change_detail_cache_normalize(self):
3118 self._mock_gerrit_changes_for_detail_cache()
3119 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003120 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003121 ]
3122 cl = git_cl.Changelist(codereview='gerrit')
3123 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3124 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3125 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3126 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3127
3128 def test_gerrit_change_detail_cache_simple(self):
3129 self._mock_gerrit_changes_for_detail_cache()
3130 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003131 (('GetChangeDetail', 'host', '1', []), 'a'),
3132 (('GetChangeDetail', 'host', '2', []), 'b'),
3133 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003134 ]
3135 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3136 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3137 self.assertEqual(cl._GetChangeDetail(), 'a')
3138 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003139 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003140 self.assertEqual(cl._GetChangeDetail(), 'a')
3141 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3142
3143 def test_gerrit_change_detail_cache_options(self):
3144 self._mock_gerrit_changes_for_detail_cache()
3145 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003146 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3147 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3148 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3149 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003150 ]
3151 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3152 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3153 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3154 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3155 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3156 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3157 self.assertEqual(cl._GetChangeDetail(), 'cab')
3158
3159 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3160 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3161 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3162 self.assertEqual(cl._GetChangeDetail(), 'cab')
3163
3164 # Finally, no_cache should invalidate all caches for given change.
3165 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3166 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3167
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003168 def test_gerrit_description_caching(self):
3169 def gen_detail(rev, desc):
3170 return {
3171 'current_revision': rev,
3172 'revisions': {rev: {'commit': {'message': desc}}}
3173 }
3174 self.calls = [
3175 (('GetChangeDetail', 'host', '1',
3176 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3177 gen_detail('rev1', 'desc1')),
3178 (('GetChangeDetail', 'host', '1',
3179 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3180 gen_detail('rev2', 'desc2')),
3181 ]
3182
3183 self._mock_gerrit_changes_for_detail_cache()
3184 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3185 self.assertEqual(cl.GetDescription(), 'desc1')
3186 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3187 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003188
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003189 def test_print_current_creds(self):
3190 class CookiesAuthenticatorMock(object):
3191 def __init__(self):
3192 self.gitcookies = {
3193 'host.googlesource.com': ('user', 'pass'),
3194 'host-review.googlesource.com': ('user', 'pass'),
3195 }
3196 self.netrc = self
3197 self.netrc.hosts = {
3198 'github.com': ('user2', None, 'pass2'),
3199 'host2.googlesource.com': ('user3', None, 'pass'),
3200 }
3201 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3202 CookiesAuthenticatorMock)
3203 self.mock(sys, 'stdout', StringIO.StringIO())
3204 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3205 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3206 ' Host\t User\t Which file',
3207 '============================\t=====\t===========',
3208 'host-review.googlesource.com\t user\t.gitcookies',
3209 ' host.googlesource.com\t user\t.gitcookies',
3210 ' host2.googlesource.com\tuser3\t .netrc',
3211 ])
3212 sys.stdout.buf = ''
3213 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3214 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3215 ' Host\tUser\t Which file',
3216 '============================\t====\t===========',
3217 'host-review.googlesource.com\tuser\t.gitcookies',
3218 ' host.googlesource.com\tuser\t.gitcookies',
3219 ])
3220
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003221 def _common_creds_check_mocks(self):
3222 def exists_mock(path):
3223 dirname = os.path.dirname(path)
3224 if dirname == os.path.expanduser('~'):
3225 dirname = '~'
3226 base = os.path.basename(path)
3227 if base in ('.netrc', '.gitcookies'):
3228 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3229 # git cl also checks for existence other files not relevant to this test.
3230 return None
3231 self.mock(os.path, 'exists', exists_mock)
3232 self.mock(sys, 'stdout', StringIO.StringIO())
3233
3234 def test_creds_check_gitcookies_not_configured(self):
3235 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003236 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003237 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003238 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003239 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003240 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3241 (('os.path.exists', '~/.netrc'), True),
3242 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3243 'or Ctrl+C to abort'), ''),
3244 ((['git', 'config', '--global', 'http.cookiefile',
3245 os.path.expanduser('~/.gitcookies')], ), ''),
3246 ]
3247 self.assertEqual(0, git_cl.main(['creds-check']))
3248 self.assertRegexpMatches(
3249 sys.stdout.getvalue(),
3250 '^You seem to be using outdated .netrc for git credentials:')
3251 self.assertRegexpMatches(
3252 sys.stdout.getvalue(),
3253 '\nConfigured git to use .gitcookies from')
3254
3255 def test_creds_check_gitcookies_configured_custom_broken(self):
3256 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003257 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003258 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003259 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003260 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003261 ((['git', 'config', '--global', 'http.cookiefile'],),
3262 '/custom/.gitcookies'),
3263 (('os.path.exists', '/custom/.gitcookies'), False),
3264 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3265 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3266 ((['git', 'config', '--global', 'http.cookiefile',
3267 os.path.expanduser('~/.gitcookies')], ), ''),
3268 ]
3269 self.assertEqual(0, git_cl.main(['creds-check']))
3270 self.assertRegexpMatches(
3271 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003272 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003273 self.assertRegexpMatches(
3274 sys.stdout.getvalue(),
3275 'However, your configured .gitcookies file is missing.')
3276
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003277 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003278 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003279 lambda _, message, publish: self._mocked_call(
3280 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003281 self.calls = [
3282 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3283 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003284 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003285 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003286 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3287 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003288
3289 def test_git_cl_comment_add_gerrit(self):
3290 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003291 lambda host, change, msg, ready:
3292 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003293 self.calls = [
3294 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3295 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3296 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3297 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3298 'origin/master'),
3299 ((['git', 'config', 'remote.origin.url'],),
3300 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003301 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3302 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003303 ]
3304 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3305 '-a', 'msg']))
3306
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003307 def test_git_cl_comments_fetch_rietveld(self):
3308 self.mock(sys, 'stdout', StringIO.StringIO())
3309 self.calls = [
3310 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3311 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3312 ] * 2
3313 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3314 'messages': [
3315 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3316 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3317 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3318 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3319 # Intentionally wrong order here.
3320 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3321 'disapproval': False, 'approval': False,
3322 'sender': 'owner@example.com'},
3323 ],
3324 'owner_email': 'owner@example.com',
3325 })
3326 expected_comments_summary = [
3327 git_cl._CommentSummary(
3328 message='lgtm',
3329 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3330 disapproval=False, approval=True, sender='r@example.com'),
3331 git_cl._CommentSummary(
3332 message='not lgtm',
3333 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3334 disapproval=True, approval=False, sender='r2@example.com'),
3335 # Note: same order as in whatever Rietveld returns.
3336 git_cl._CommentSummary(
3337 message='PTAL',
3338 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3339 disapproval=False, approval=False, sender='owner@example.com'),
3340 ]
3341 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3342 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3343
3344 with git_cl.gclient_utils.temporary_directory() as tempdir:
3345 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3346 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3347 '-j', out_file]))
3348 with open(out_file) as f:
3349 read = json.load(f)
3350 self.assertEqual(len(read), 3)
3351 self.assertEqual(read[0], {
3352 'date': '2000-03-13 20:49:34.515270',
3353 'message': 'PTAL',
3354 'approval': False,
3355 'disapproval': False,
3356 'sender': 'owner@example.com'})
3357 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3358 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3359
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003360 def test_git_cl_comments_fetch_gerrit(self):
3361 self.mock(sys, 'stdout', StringIO.StringIO())
3362 self.calls = [
3363 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3364 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3365 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3366 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3367 'origin/master'),
3368 ((['git', 'config', 'remote.origin.url'],),
3369 'https://chromium.googlesource.com/infra/infra'),
3370 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3371 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003372 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003373 'messages': [
3374 {
3375 u'_revision_number': 1,
3376 u'author': {
3377 u'_account_id': 1111084,
3378 u'email': u'commit-bot@chromium.org',
3379 u'name': u'Commit Bot'
3380 },
3381 u'date': u'2017-03-15 20:08:45.000000000',
3382 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003383 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003384 u'tag': u'autogenerated:cq:dry-run'
3385 },
3386 {
3387 u'_revision_number': 2,
3388 u'author': {
3389 u'_account_id': 11151243,
3390 u'email': u'owner@example.com',
3391 u'name': u'owner'
3392 },
3393 u'date': u'2017-03-16 20:00:41.000000000',
3394 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3395 u'message': u'PTAL',
3396 },
3397 {
3398 u'_revision_number': 2,
3399 u'author': {
3400 u'_account_id': 148512 ,
3401 u'email': u'reviewer@example.com',
3402 u'name': u'reviewer'
3403 },
3404 u'date': u'2017-03-17 05:19:37.500000000',
3405 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3406 u'message': u'Patch Set 2: Code-Review+1',
3407 },
3408 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003409 }),
3410 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3411 '/COMMIT_MSG': [
3412 {
3413 'author': {'email': u'reviewer@example.com'},
3414 'updated': u'2017-03-17 05:19:37.500000000',
3415 'patch_set': 2,
3416 'side': 'REVISION',
3417 'message': 'Please include a bug link',
3418 },
3419 ],
3420 'codereview.settings': [
3421 {
3422 'author': {'email': u'owner@example.com'},
3423 'updated': u'2017-03-16 20:00:41.000000000',
3424 'patch_set': 2,
3425 'side': 'PARENT',
3426 'line': 42,
3427 'message': 'I removed this because it is bad',
3428 },
3429 ]
3430 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003431 ] * 2
3432 expected_comments_summary = [
3433 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003434 message=(
3435 u'PTAL\n' +
3436 u'\n' +
3437 u'codereview.settings\n' +
3438 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3439 u'c/1/2/codereview.settings#b42\n' +
3440 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003441 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3442 disapproval=False, approval=False, sender=u'owner@example.com'),
3443 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003444 message=(
3445 u'Patch Set 2: Code-Review+1\n' +
3446 u'\n' +
3447 u'/COMMIT_MSG\n' +
3448 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3449 u'c/1/2//COMMIT_MSG#\n' +
3450 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003451 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3452 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3453 ]
3454 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3455 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3456
3457 with git_cl.gclient_utils.temporary_directory() as tempdir:
3458 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3459 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3460 '-j', out_file]))
3461 with open(out_file) as f:
3462 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003463 self.assertEqual(len(read), 2)
3464 self.assertEqual(read[0], {
3465 u'date': u'2017-03-16 20:00:41.000000',
3466 u'message': (
3467 u'PTAL\n' +
3468 u'\n' +
3469 u'codereview.settings\n' +
3470 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3471 u'c/1/2/codereview.settings#b42\n' +
3472 u' I removed this because it is bad\n'),
3473 u'approval': False,
3474 u'disapproval': False,
3475 u'sender': u'owner@example.com'})
3476 self.assertEqual(read[1], {
3477 u'date': u'2017-03-17 05:19:37.500000',
3478 u'message': (
3479 u'Patch Set 2: Code-Review+1\n' +
3480 u'\n' +
3481 u'/COMMIT_MSG\n' +
3482 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3483 u'c/1/2//COMMIT_MSG#\n' +
3484 u' Please include a bug link\n'),
3485 u'approval': False,
3486 u'disapproval': False,
3487 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003488
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003489
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003490if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003491 logging.basicConfig(
3492 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003493 unittest.main()