blob: 9c179c6883b3b47eff1eb2a87d8a18e90c00fc59 [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
15import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000016import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017
18sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
19
20from testing_support.auto_stub import TestCase
21
22import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000023import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000024import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026
tandrii5d48c322016-08-18 16:19:37 -070027def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
28 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
29
30
31CERR1 = callError(1)
32
33
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000034class ChangelistMock(object):
35 # A class variable so we can access it when we don't have access to the
36 # instance that's being set.
37 desc = ""
38 def __init__(self, **kwargs):
39 pass
40 def GetIssue(self):
41 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080042 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070044 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000045 ChangelistMock.desc = desc
46
tandrii5d48c322016-08-18 16:19:37 -070047
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000048class PresubmitMock(object):
49 def __init__(self, *args, **kwargs):
50 self.reviewers = []
51 @staticmethod
52 def should_continue():
53 return True
54
55
56class RietveldMock(object):
57 def __init__(self, *args, **kwargs):
58 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000059
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000060 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080061 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000062 return 'Issue: %d' % issue
63
maruel@chromium.org78936cb2013-04-11 00:17:52 +000064 @staticmethod
65 def get_issue_properties(_issue, _messages):
66 return {
67 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
68 'messages': [
69 {
70 'approval': True,
71 'sender': 'john@chromium.org',
72 },
73 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010074 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000075 }
76
iannuccie53c9352016-08-17 14:40:40 -070077 @staticmethod
78 def close_issue(_issue):
79 return 'Closed'
80
skobes6468b902016-10-24 08:45:10 -070081 @staticmethod
82 def get_patch(issue, patchset):
83 return 'patch set from issue %s patchset %s' % (issue, patchset)
84
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010085 @staticmethod
86 def update_description(_issue, _description):
87 return 'Updated'
88
89 @staticmethod
90 def add_comment(_issue, _comment):
91 return 'Commented'
92
93
94
skobes6468b902016-10-24 08:45:10 -070095
96class GitCheckoutMock(object):
97 def __init__(self, *args, **kwargs):
98 pass
99
100 @staticmethod
101 def reset():
102 GitCheckoutMock.conflict = False
103
104 def apply_patch(self, p):
105 if GitCheckoutMock.conflict:
106 raise Exception('failed')
107
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000108
109class WatchlistsMock(object):
110 def __init__(self, _):
111 pass
112 @staticmethod
113 def GetWatchersForPaths(_):
114 return ['joe@example.com']
115
116
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000117class CodereviewSettingsFileMock(object):
118 def __init__(self):
119 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800120 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000121 def read(self):
122 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000123 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000124
125
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000126class AuthenticatorMock(object):
127 def __init__(self, *_args):
128 pass
129 def has_cached_credentials(self):
130 return True
tandrii221ab252016-10-06 08:12:04 -0700131 def authorize(self, http):
132 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000133
134
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100135def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000136 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
137
138 Usage:
139 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100140 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000141
142 OR
143 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100144 CookiesAuthenticatorMockFactory(
145 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000146 """
147 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800148 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000149 # Intentionally not calling super() because it reads actual cookie files.
150 pass
151 @classmethod
152 def get_gitcookies_path(cls):
153 return '~/.gitcookies'
154 @classmethod
155 def get_netrc_path(cls):
156 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100157 def _get_auth_for_host(self, host):
158 if same_auth:
159 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000160 return (hosts_with_creds or {}).get(host)
161 return CookiesAuthenticatorMock
162
kmarshall9249e012016-08-23 12:02:16 -0700163class MockChangelistWithBranchAndIssue():
164 def __init__(self, branch, issue):
165 self.branch = branch
166 self.issue = issue
167 def GetBranch(self):
168 return self.branch
169 def GetIssue(self):
170 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000171
tandriic2405f52016-10-10 08:13:15 -0700172
173class SystemExitMock(Exception):
174 pass
175
176
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000177class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100178 def test_get_description(self):
179 cl = git_cl.Changelist(issue=1, codereview='rietveld',
180 codereview_host='host')
181 cl.description = 'x'
182 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800183 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100184 self.assertEquals(cl.GetDescription(), 'x')
185 self.assertEquals(cl.GetDescription(force=True), 'y')
186 self.assertEquals(cl.GetDescription(), 'y')
187
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700188 def test_description_footers(self):
189 cl = git_cl.Changelist(issue=1, codereview='gerrit',
190 codereview_host='host')
191 cl.description = '\n'.join([
192 'This is some message',
193 '',
194 'It has some lines',
195 'and, also',
196 '',
197 'Some: Really',
198 'Awesome: Footers',
199 ])
200 cl.has_description = True
201 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
202 msg, footers = cl.GetDescriptionFooters()
203 self.assertEquals(
204 msg, ['This is some message', '', 'It has some lines', 'and, also'])
205 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
206
207 msg.append('wut')
208 footers.append(('gnarly-dude', 'beans'))
209 cl.UpdateDescriptionFooters(msg, footers)
210 self.assertEquals(cl.GetDescription().splitlines(), [
211 'This is some message',
212 '',
213 'It has some lines',
214 'and, also',
215 'wut'
216 '',
217 'Some: Really',
218 'Awesome: Footers',
219 'Gnarly-Dude: beans',
220 ])
221
tandriif9aefb72016-07-01 09:06:51 -0700222 def test_get_bug_line_values(self):
223 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
224 self.assertEqual(f('', ''), [])
225 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
226 self.assertEqual(f('v8', '456'), ['v8:456'])
227 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
228 # Not nice, but not worth carying.
229 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
230 ['v8:456', 'chromium:123', 'v8:123'])
231
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100232 def _test_git_number(self, parent_msg, dest_ref, child_msg,
233 parent_hash='parenthash'):
234 desc = git_cl.ChangeDescription(child_msg)
235 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
236 return desc.description
237
238 def assertEqualByLine(self, actual, expected):
239 self.assertEqual(actual.splitlines(), expected.splitlines())
240
241 def test_git_number_bad_parent(self):
242 with self.assertRaises(ValueError):
243 self._test_git_number('Parent', 'refs/heads/master', 'Child')
244
245 def test_git_number_bad_parent_footer(self):
246 with self.assertRaises(AssertionError):
247 self._test_git_number(
248 'Parent\n'
249 '\n'
250 'Cr-Commit-Position: wrong',
251 'refs/heads/master', 'Child')
252
253 def test_git_number_bad_lineage_ignored(self):
254 actual = self._test_git_number(
255 'Parent\n'
256 '\n'
257 'Cr-Commit-Position: refs/heads/master@{#1}\n'
258 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
259 'refs/heads/master', 'Child')
260 self.assertEqualByLine(
261 actual,
262 'Child\n'
263 '\n'
264 'Cr-Commit-Position: refs/heads/master@{#2}\n'
265 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
266
267 def test_git_number_same_branch(self):
268 actual = self._test_git_number(
269 'Parent\n'
270 '\n'
271 'Cr-Commit-Position: refs/heads/master@{#12}',
272 dest_ref='refs/heads/master',
273 child_msg='Child')
274 self.assertEqualByLine(
275 actual,
276 'Child\n'
277 '\n'
278 'Cr-Commit-Position: refs/heads/master@{#13}')
279
280 def test_git_number_same_branch_with_originals(self):
281 actual = self._test_git_number(
282 'Parent\n'
283 '\n'
284 'Cr-Commit-Position: refs/heads/master@{#12}',
285 dest_ref='refs/heads/master',
286 child_msg='Child\n'
287 '\n'
288 'Some users are smart and insert their own footers\n'
289 '\n'
290 'Cr-Whatever: value\n'
291 'Cr-Commit-Position: refs/copy/paste@{#22}')
292 self.assertEqualByLine(
293 actual,
294 'Child\n'
295 '\n'
296 'Some users are smart and insert their own footers\n'
297 '\n'
298 'Cr-Original-Whatever: value\n'
299 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
300 'Cr-Commit-Position: refs/heads/master@{#13}')
301
302 def test_git_number_new_branch(self):
303 actual = self._test_git_number(
304 'Parent\n'
305 '\n'
306 'Cr-Commit-Position: refs/heads/master@{#12}',
307 dest_ref='refs/heads/branch',
308 child_msg='Child')
309 self.assertEqualByLine(
310 actual,
311 'Child\n'
312 '\n'
313 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
314 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
315
316 def test_git_number_lineage(self):
317 actual = self._test_git_number(
318 'Parent\n'
319 '\n'
320 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
321 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
322 dest_ref='refs/heads/branch',
323 child_msg='Child')
324 self.assertEqualByLine(
325 actual,
326 'Child\n'
327 '\n'
328 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
329 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
330
331 def test_git_number_moooooooore_lineage(self):
332 actual = self._test_git_number(
333 'Parent\n'
334 '\n'
335 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
336 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
337 dest_ref='refs/heads/mooore',
338 child_msg='Child')
339 self.assertEqualByLine(
340 actual,
341 'Child\n'
342 '\n'
343 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
344 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
345 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
346
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100347 def test_git_number_ever_moooooooore_lineage(self):
348 self.maxDiff = 10000
349 actual = self._test_git_number(
350 'CQ commit on fresh new branch + numbering.\n'
351 '\n'
352 'NOTRY=True\n'
353 'NOPRESUBMIT=True\n'
354 'BUG=\n'
355 '\n'
356 'Review-Url: https://codereview.chromium.org/2577703003\n'
357 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
358 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
359 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
360 dest_ref='refs/heads/gnumb-test/cl',
361 child_msg='git cl on fresh new branch + numbering.\n'
362 '\n'
363 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
364 self.assertEqualByLine(
365 actual,
366 'git cl on fresh new branch + numbering.\n'
367 '\n'
368 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
369 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
370 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
371 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
372 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100373
374 def test_git_number_cherry_pick(self):
375 actual = self._test_git_number(
376 'Parent\n'
377 '\n'
378 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
379 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
380 dest_ref='refs/heads/branch',
381 child_msg='Child, which is cherry-pick from master\n'
382 '\n'
383 'Cr-Commit-Position: refs/heads/master@{#100}\n'
384 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
385 self.assertEqualByLine(
386 actual,
387 'Child, which is cherry-pick from master\n'
388 '\n'
389 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
390 '\n'
391 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
392 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
393 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
394
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000395
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200396class TestParseIssueURL(unittest.TestCase):
397 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
398 codereview=None, fail=False):
399 self.assertIsNotNone(parsed)
400 if fail:
401 self.assertFalse(parsed.valid)
402 return
403 self.assertTrue(parsed.valid)
404 self.assertEqual(parsed.issue, issue)
405 self.assertEqual(parsed.patchset, patchset)
406 self.assertEqual(parsed.hostname, hostname)
407 self.assertEqual(parsed.codereview, codereview)
408
409 def _run_and_validate(self, func, url, *args, **kwargs):
410 result = func(urlparse.urlparse(url))
411 if kwargs.pop('fail', False):
412 self.assertIsNone(result)
413 return None
414 self._validate(result, *args, fail=False, **kwargs)
415
416 def test_rietveld(self):
417 def test(url, *args, **kwargs):
418 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
419 *args, codereview='rietveld', **kwargs)
420
421 test('http://codereview.chromium.org/123',
422 123, None, 'codereview.chromium.org')
423 test('https://codereview.chromium.org/123',
424 123, None, 'codereview.chromium.org')
425 test('https://codereview.chromium.org/123/',
426 123, None, 'codereview.chromium.org')
427 test('https://codereview.chromium.org/123/whatever',
428 123, None, 'codereview.chromium.org')
429 test('https://codereview.chromium.org/123/#ps20001',
430 123, 20001, 'codereview.chromium.org')
431 test('http://codereview.chromium.org/download/issue123_4.diff',
432 123, 4, 'codereview.chromium.org')
433 # This looks like bad Gerrit, but is actually valid Rietveld, too.
434 test('https://chrome-review.source.com/123/4/',
435 123, None, 'chrome-review.source.com')
436
437 test('https://codereview.chromium.org/deadbeaf', fail=True)
438 test('https://codereview.chromium.org/api/123', fail=True)
439 test('bad://codereview.chromium.org/123', fail=True)
440 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
441
442 def test_gerrit(self):
443 def test(url, issue=None, patchset=None, hostname=None, fail=None):
444 self._test_ParseIssueUrl(
445 git_cl._GerritChangelistImpl.ParseIssueURL,
446 url, issue, patchset, hostname, fail)
447 def test(url, *args, **kwargs):
448 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
449 *args, codereview='gerrit', **kwargs)
450
451 test('http://chrome-review.source.com/c/123',
452 123, None, 'chrome-review.source.com')
453 test('https://chrome-review.source.com/c/123/',
454 123, None, 'chrome-review.source.com')
455 test('https://chrome-review.source.com/c/123/4',
456 123, 4, 'chrome-review.source.com')
457 test('https://chrome-review.source.com/#/c/123/4',
458 123, 4, 'chrome-review.source.com')
459 test('https://chrome-review.source.com/c/123/4',
460 123, 4, 'chrome-review.source.com')
461 test('https://chrome-review.source.com/123',
462 123, None, 'chrome-review.source.com')
463 test('https://chrome-review.source.com/123/4',
464 123, 4, 'chrome-review.source.com')
465
466 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
467 test('https://chrome-review.source.com/c/abc/', fail=True)
468 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
469
470 def test_ParseIssueNumberArgument(self):
471 def test(arg, *args, **kwargs):
472 self._validate(git_cl.ParseIssueNumberArgument(arg), *args, **kwargs)
473
474 test('123', 123)
475 test('', fail=True)
476 test('abc', fail=True)
477 test('123/1', fail=True)
478 test('123a', fail=True)
479 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
480 # Rietveld.
481 test('https://codereview.source.com/www123', fail=True)
482 # Matches both, but we take Rietveld now.
483 test('https://codereview.source.com/123',
484 123, None, 'codereview.source.com', 'rietveld')
485 # Gerrrit.
486 test('https://chrome-review.source.com/c/123/4',
487 123, 4, 'chrome-review.source.com', 'gerrit')
488 test('https://chrome-review.source.com/bad/123/4', fail=True)
489
490
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100491class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100492 def setUp(self):
493 super(GitCookiesCheckerTest, self).setUp()
494 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100495 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100496
497 def mock_hosts_creds(self, subhost_identity_pairs):
498 def ensure_googlesource(h):
499 if not h.endswith(self.c._GOOGLESOURCE):
500 assert not h.endswith('.')
501 return h + '.' + self.c._GOOGLESOURCE
502 return h
503 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
504 for h, i in subhost_identity_pairs]
505
506 def test_analysis_nothing(self):
507 self.c._all_hosts = []
508 self.assertFalse(self.c.has_generic_host())
509 self.assertEqual(set(), self.c.get_conflicting_hosts())
510 self.assertEqual(set(), self.c.get_duplicated_hosts())
511 self.assertEqual(set(), self.c.get_partially_configured_hosts())
512 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
513
514 def test_analysis(self):
515 self.mock_hosts_creds([
516 ('.googlesource.com', 'git-example.chromium.org'),
517
518 ('chromium', 'git-example.google.com'),
519 ('chromium-review', 'git-example.google.com'),
520 ('chrome-internal', 'git-example.chromium.org'),
521 ('chrome-internal-review', 'git-example.chromium.org'),
522 ('conflict', 'git-example.google.com'),
523 ('conflict-review', 'git-example.chromium.org'),
524 ('dup', 'git-example.google.com'),
525 ('dup', 'git-example.google.com'),
526 ('dup-review', 'git-example.google.com'),
527 ('partial', 'git-example.google.com'),
528 ])
529 self.assertTrue(self.c.has_generic_host())
530 self.assertEqual(set(['conflict.googlesource.com']),
531 self.c.get_conflicting_hosts())
532 self.assertEqual(set(['dup.googlesource.com']),
533 self.c.get_duplicated_hosts())
534 self.assertEqual(set(['partial.googlesource.com']),
535 self.c.get_partially_configured_hosts())
536 self.assertEqual(set(['chromium.googlesource.com',
537 'chrome-internal.googlesource.com']),
538 self.c.get_hosts_with_wrong_identities())
539
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100540 def test_report_no_problems(self):
541 self.test_analysis_nothing()
542 self.mock(sys, 'stdout', StringIO.StringIO())
543 self.assertFalse(self.c.find_and_report_problems())
544 self.assertEqual(sys.stdout.getvalue(), '')
545
546 def test_report(self):
547 self.test_analysis()
548 self.mock(sys, 'stdout', StringIO.StringIO())
549 self.assertTrue(self.c.find_and_report_problems())
550 with open(os.path.join(os.path.dirname(__file__),
551 'git_cl_creds_check_report.txt')) as f:
552 expected = f.read()
553 def by_line(text):
554 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200555 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100556
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000557class TestGitCl(TestCase):
558 def setUp(self):
559 super(TestGitCl, self).setUp()
560 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700561 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000562 self.mock(subprocess2, 'call', self._mocked_call)
563 self.mock(subprocess2, 'check_call', self._mocked_call)
564 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700565 self.mock(subprocess2, 'communicate',
566 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000567 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000568 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000569 self.mock(git_common, 'get_or_create_merge_base',
570 lambda *a: (
571 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000572 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000573 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100574 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
575 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700576 self.mock(git_cl, 'write_json', lambda path, contents:
577 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000578 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000579 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000580 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700581 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
582 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000583 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000584 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000585 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100586 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
587 lambda *args, **kwargs: self._mocked_call(
588 'GetChangeDetail', *args, **kwargs))
589 self.mock(git_cl.gerrit_util, 'AddReviewers',
590 lambda h, i, add, is_reviewer, notify: self._mocked_call(
591 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000592 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
593 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700594 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100595 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000596 # It's important to reset settings to not have inter-tests interference.
597 git_cl.settings = None
598
599 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000600 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100601 self.assertEquals([], self.calls)
602 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000603 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100604 raise
605 # Sadly, has_failed() returns True if this OR any other tests before this
606 # one have failed.
607 git_cl.logging.exception(
608 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
609 'There are un-consumed self.calls after this test has finished.\n'
610 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700611 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100612 '\n'
613 'If you are already running just this single test, then **first** '
614 'fix the problem whose exception is emitted below by unittest '
615 'runner.\n'
616 '\n'
617 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700618 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100619 'and follow instructions above.\n' +
620 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000621 finally:
622 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000623
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000624 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000625 self.assertTrue(
626 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700627 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000628 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000629 expected_args, result = top
630
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000631 # Also logs otherwise it could get caught in a try/finally and be hard to
632 # diagnose.
633 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700634 N = 5
635 prior_calls = '\n '.join(
636 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
637 for i, c in enumerate(self._calls_done[-N:]))
638 following_calls = '\n '.join(
639 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
640 for i, c in enumerate(self.calls[:N]))
641 extended_msg = (
642 'A few prior calls:\n %s\n\n'
643 'This (expected):\n @%d: %r\n'
644 'This (actual):\n @%d: %r\n\n'
645 'A few following expected calls:\n %s' %
646 (prior_calls, len(self._calls_done), expected_args,
647 len(self._calls_done), args, following_calls))
648 git_cl.logging.error(extended_msg)
649
tandrii99a72f22016-08-17 14:33:24 -0700650 self.fail('@%d\n'
651 ' Expected: %r\n'
652 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700653 len(self._calls_done), expected_args, args))
654
655 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700656 if isinstance(result, Exception):
657 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000658 return result
659
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100660 def test_ask_for_explicit_yes_true(self):
661 self.calls = [
662 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
663 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
664 ]
665 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
666
667 def test_ask_for_explicit_yes_true(self):
668 self.calls = [
669 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
670 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
671 ]
672 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
673
tandrii48df5812016-10-17 03:55:37 -0700674 def test_LoadCodereviewSettingsFromFile_gerrit(self):
675 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
676 self.calls = [
677 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
678 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
679 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
680 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
681 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
682 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700683 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
684 CERR1),
685 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700686 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
687 CERR1),
688 ((['git', 'config', 'gerrit.host', 'true'],), ''),
689 ]
690 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
691
maruel@chromium.orga3353652011-11-30 14:26:57 +0000692 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000693 def _is_gerrit_calls(cls, gerrit=False):
694 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
695 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
696
697 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000698 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000699 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000700 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000701
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000702 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000703 def _upload_no_rev_calls(cls, similarity, find_copies):
704 return (cls._git_base_calls(similarity, find_copies) +
705 cls._git_upload_no_rev_calls())
706
707 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000708 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000709 if similarity is None:
710 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700711 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700712 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000713 else:
tandrii33a46ff2016-08-23 05:53:40 -0700714 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700715 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000716
717 if find_copies is None:
718 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700719 find_copies_call = ((['git', 'config', '--bool',
720 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000721 else:
tandrii5d48c322016-08-18 16:19:37 -0700722 val = str(find_copies).lower()
723 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000724 'branch.master.git-find-copies', val],), '')
725
726 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000727 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800728 '-l100000', '-C'+similarity,
729 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000730 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000731 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000732 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000733
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000734 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000735 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000736 similarity_call,
737 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
738 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000739 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000740 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700741 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
742 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000743 ((['git', 'config', 'rietveld.server'],),
744 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000745 ((['git', 'config', 'branch.master.merge'],), 'master'),
746 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000747 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000748 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000749 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000750 ((['git', 'rev-parse', '--show-cdup'],), ''),
751 ((['git', 'rev-parse', 'HEAD'],), '12345'),
752 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000753 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000754 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700755 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000756 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000757 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000758 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000759 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000760 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000761 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000762 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000763 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700764 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000765 ]
766
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000767 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000768 def _git_upload_no_rev_calls(cls):
769 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000770 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000771 ]
772
773 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000774 def _git_upload_calls(cls, private):
775 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000776 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000777 private_call = []
778 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000779 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000780 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000781 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000782
maruel@chromium.orga3353652011-11-30 14:26:57 +0000783 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000784 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000785 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000786 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800787 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000788 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700789 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000791 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000792 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700793 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000794 ] + cls._git_post_upload_calls()
795
796 @classmethod
797 def _git_post_upload_calls(cls):
798 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000799 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
800 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
801 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000802 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000803 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000804 ]
805
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000806 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000807 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000808 fake_ancestor = 'fake_ancestor'
809 fake_cl = 'fake_cl_for_patch'
810 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000811 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000812 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000813 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000814 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000815 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000816 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000817 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700819 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000820 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000821 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000823 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000824 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000825 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000826 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000827 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000828 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000829 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000830 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000831
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000832 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700833 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000834 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000835 return [
836 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000837 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000838 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000839 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700840 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000841 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000842 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100843 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000844 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000845 ]
846
847 def _run_reviewer_test(
848 self,
849 upload_args,
850 expected_description,
851 returned_description,
852 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000853 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700854 private=False,
855 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000856 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000857 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000858 try:
859 similarity = upload_args[upload_args.index('--similarity')+1]
860 except ValueError:
861 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000862
863 if '--find-copies' in upload_args:
864 find_copies = True
865 elif '--no-find-copies' in upload_args:
866 find_copies = False
867 else:
868 find_copies = None
869
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000870 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700871 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000872
873 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000874
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000875 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000876 self.assertEquals(
877 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000878 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000879 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000880 '#--------------------This line is 72 characters long'
881 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000882 expected_description,
883 desc)
884 return returned_description
885 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000886
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000887 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000888 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700889 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000890 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000891 return 1, 2
892 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000893
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000894 git_cl.main(['upload'] + upload_args)
895
896 def test_no_reviewer(self):
897 self._run_reviewer_test(
898 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000899 'desc\n\nBUG=',
900 '# Blah blah comment.\ndesc\n\nBUG=',
901 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000902 [])
903
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000904 def test_keep_similarity(self):
905 self._run_reviewer_test(
906 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000907 'desc\n\nBUG=',
908 '# Blah blah comment.\ndesc\n\nBUG=',
909 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000910 [])
911
iannucci@chromium.org79540052012-10-19 23:15:26 +0000912 def test_keep_find_copies(self):
913 self._run_reviewer_test(
914 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000915 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000916 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000917 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000918 [])
919
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000920 def test_private(self):
921 self._run_reviewer_test(
922 ['--private'],
923 'desc\n\nBUG=',
924 '# Blah blah comment.\ndesc\n\nBUG=\n',
925 'desc\n\nBUG=',
926 [])
927
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000928 def test_reviewers_cmd_line(self):
929 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000930 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000931 self._run_reviewer_test(
932 ['-r' 'foo@example.com'],
933 description,
934 '\n%s\n' % description,
935 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000936 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000937
938 def test_reviewer_tbr_overriden(self):
939 # Reviewer is overriden with TBR
940 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000941 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000942 self._run_reviewer_test(
943 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000944 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000945 description.strip('\n'),
946 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000947 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000948
949 def test_reviewer_multiple(self):
950 # Handles multiple R= or TBR= lines.
951 description = (
bradnelsond975b302016-10-23 12:20:23 -0700952 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
953 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000954 self._run_reviewer_test(
955 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000956 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000957 description,
958 description,
bradnelsond975b302016-10-23 12:20:23 -0700959 ['--reviewers=another@example.com,reviewer@example.com'],
960 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000961
maruel@chromium.orga3353652011-11-30 14:26:57 +0000962 def test_reviewer_send_mail(self):
963 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000964 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000965 self._run_reviewer_test(
966 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000967 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000968 description.strip('\n'),
969 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000970 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000971
972 def test_reviewer_send_mail_no_rev(self):
973 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000974 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700975 self.calls = self._upload_no_rev_calls(None, None) + [
976 ((['DieWithError', 'Must specify reviewers to send email.'],),
977 SystemExitMock())
978 ]
979
980 def RunEditor(desc, _, **kwargs):
981 return desc
982 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
983 self.mock(sys, 'stdout', stdout)
984 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000985 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700986 self.assertEqual(
987 'Using 50% similarity for rename/copy detection. Override with '
988 '--similarity.\n',
989 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000990
tandriif9aefb72016-07-01 09:06:51 -0700991 def test_bug_on_cmd(self):
992 self._run_reviewer_test(
993 ['--bug=500658,proj:123'],
994 'desc\n\nBUG=500658\nBUG=proj:123',
995 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
996 'desc\n\nBUG=500658\nBUG=proj:1234',
997 [])
998
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100999 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1000 parent_msg=None,
1001 new_msg=None,
1002 fail_after_parent_msg=False,
1003 fail_cherry_pick=False,
1004 fail_push_count=0,
1005 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001006 if debug:
1007 # Very useful due to finally clause in git cl land raising exceptions and
1008 # shadowing real cause of failure.
1009 self.mock(git_cl, '_IS_BEING_TESTED', True)
1010 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001011 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001012
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001013 if git_numberer_enabled:
1014 # Special mocks to check validity of timestamp.
1015 original_git_amend_head = git_cl._git_amend_head
1016 def _git_amend_head_mock(msg, tstamp):
1017 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1018 return original_git_amend_head(msg, tstamp)
1019 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1020
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001021 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1022 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001023 self.mock(RietveldMock, 'update_description', staticmethod(
1024 lambda i, d: self._mocked_call(['update_description', i, d])))
1025 self.mock(RietveldMock, 'add_comment', staticmethod(
1026 lambda i, c: self._mocked_call(['add_comment', i, c])))
1027 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001028 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1029 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1030 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1031 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1032 CERR1),
1033 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1034 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001035 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001036 ((['git', 'config', 'rietveld.server'],),
1037 'https://codereview.chromium.org'),
1038 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1039 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1040 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1041 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001042 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1043 ''), # No commits to rebase, according to local view of origin.
1044 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1045 'fake_ancestor_sha'),
1046 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1047 ((['git', 'rev-parse', '--show-cdup'],), ''),
1048 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1049 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1050 'fake_ancestor_sha...', '.'],),
1051 'M\tfile1.cpp'),
1052 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1053 ((['git', 'config', 'branch.feature.rietveldserver'],),
1054 'https://codereview.chromium.org'),
1055 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1056 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1057 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1058 'fake_ancestor_sha', 'feature'],),
1059 # This command just prints smth like this:
1060 # file1.cpp | 53 ++++++--
1061 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1062 ''),
1063 ((['git', 'show-ref', '--quiet', '--verify',
1064 'refs/heads/git-cl-commit'],),
1065 ''), # 0 return code means branch exists.
1066 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1067 ((['git', 'show-ref', '--quiet', '--verify',
1068 'refs/heads/git-cl-cherry-pick'],),
1069 CERR1), # This means git-cl-cherry-pick branch does not exist.
1070 ((['git', 'rev-parse', '--show-cdup'],), ''),
1071 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1072 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1073 ((['git', 'commit', '-m',
1074 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001075 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001076 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1077 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1078 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001079 repo_url),
1080
1081 ((['git', 'config', 'remote.origin.url'],), repo_url),
1082 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1083 git_numberer_enabled),
1084
1085 # Auto-rebase init.
1086 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1087 ]
1088 # Auto-rebase loops.
1089 for attempt in xrange(fail_push_count + 1):
1090 self.calls += [
1091 # Auto-rebase loop start.
1092 ((['git', 'retry', 'fetch', 'origin',
1093 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1094 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1095 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1096 # different in each loop iteration for truly realistic test.
1097 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1098 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1099 callError(1, 'failed to cherry pick') if fail_cherry_pick
1100 else ''),
1101 ]
1102 if fail_cherry_pick:
1103 return
1104
1105 if git_numberer_enabled:
1106 assert parent_msg
1107 self.calls += [
1108 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1109 parent_msg),
1110 ]
1111 if fail_after_parent_msg:
1112 return
1113 assert new_msg
1114 self.calls += [
1115 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1116 '1480022355'), # Committer's unix timestamp.
1117 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1118 '1480024000'),
1119 ((['git_amend_head committer timestamp', 1480024000],), ''),
1120 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1121 ]
1122 self.calls += [
1123 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1124 CERR1 if attempt < fail_push_count else ''),
1125 ]
1126 # End of autorebase + push.
1127
1128 self.calls += [
1129 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1130 ]
1131 if git_numberer_enabled:
1132 self.calls += [
1133 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1134 ]
1135
1136 # Cleanup calls.
1137 self.calls += [
1138 ((['git', 'checkout', '-q', 'feature'],), ''),
1139 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1140 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001141 ]
1142
1143 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001144 self._land_rietveld_calls(
1145 repo_url='https://chromium.googlesource.com/infra/infra',
1146 git_numberer_enabled=False,
1147 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001148 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001149 ((['git', 'config', 'rietveld.viewvc-url'],),
1150 'https://chromium.googlesource.com/infra/infra/+/'),
1151 ((['update_description', 123,
1152 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001153 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001154 ''),
1155 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001156 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001157 ]
1158 git_cl.main(['land'])
1159
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001160 def test_land_rietveld_fail_cherry_pick(self):
1161 self._land_rietveld_calls(
1162 repo_url='https://chromium.googlesource.com/infra/infra',
1163 git_numberer_enabled=False,
1164 fail_cherry_pick=True,
1165 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001166 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001167 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1168 'U path/file1\n'
1169 'U file2.cpp\n'),
1170 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001171 ((['git', 'checkout', '-q', 'feature'],), ''),
1172 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001173 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1174 ]
1175 git_cl.main(['land'])
1176
1177 def test_land_rietveld_git_numberer_fail_1_push(self):
1178 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1179
1180 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1181 self._land_rietveld_calls(
1182 repo_url='https://chromium.googlesource.com/chromium/src',
1183 git_numberer_enabled=True,
1184 parent_msg=('This is parent commit.\n'
1185 '\n'
1186 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1187 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1188 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1189 '\n'
1190 'Review-Url: https://codereview.chromium.org/123 .\n'
1191 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1192 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1193 fail_push_count=fail_push_count,
1194 debug=False)
1195
1196 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001197 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001198 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001199 ((['update_description', 123,
1200 'Issue: 123\n\nR=john@chromium.org\n'
1201 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001202 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001203 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1204 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1205 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001206 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001207 ''),
1208 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001209 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001210 ]
1211 git_cl.main(['land'])
1212
1213 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001214 self._land_rietveld_calls(
1215 repo_url='https://chromium.googlesource.com/v8/v8',
1216 git_numberer_enabled=True,
1217 parent_msg='This is parent commit with no footer.',
1218 fail_after_parent_msg=True,
1219 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001220 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001221 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001222 ((['git', 'checkout', '-q', 'feature'],), ''),
1223 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001224 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001225 ]
1226 with self.assertRaises(ValueError) as cm:
1227 git_cl.main(['land'])
1228 self.assertEqual(cm.exception.message,
1229 'Unable to infer commit position from footers')
1230
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001231 def test_git_numberer_not_whitelisted_repo(self):
1232 self.calls = []
1233 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001234 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1235 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001236 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001237
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001238 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001239 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1240 self.calls = [
1241 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001242 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001243 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001244 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001245 remote_url='https://chromium.googlesource.com/chromium/src',
1246 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001247 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001248
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001249 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001250 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001251 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001252 def fake_temporary_directory(**kwargs):
1253 yield tempdir
1254 self.mock(git_cl.gclient_utils, 'temporary_directory',
1255 fake_temporary_directory)
1256 self._test_GitNumbererState_valid_configs_inner(tempdir)
1257
1258 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001259 self.calls = [
1260 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001261 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001262 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1263 '''
1264 [plugin "git-numberer"]
1265 validate-enabled-refglob = refs/else/*
1266 validate-enabled-refglob = refs/heads/*
1267 validate-disabled-refglob = refs/heads/disabled
1268 validate-disabled-refglob = refs/branch-heads/*
1269 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001270 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1271 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001272 'refs/else/*\n'
1273 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001274 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1275 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001276 'refs/heads/disabled\n'
1277 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001278 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001279
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001280 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001281 remote_url='https://chromium.googlesource.com/chromium/src',
1282 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001283 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001284
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001285 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001286 remote_url='https://chromium.googlesource.com/chromium/src',
1287 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001288 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001289
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001290 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001291 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001292 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001293 remote_url='https://chromium.googlesource.com/chromium/src',
1294 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001295 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001296
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001297 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001298 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001299 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001300 if skip_auth_check:
1301 return [((cmd, ), 'true')]
1302
tandrii5d48c322016-08-18 16:19:37 -07001303 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001304 if issue:
1305 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001306 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001307 ])
1308 calls.extend([
1309 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1310 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1311 ((['git', 'config', 'remote.origin.url'],),
1312 'https://chromium.googlesource.com/my/repo'),
1313 ((['git', 'config', 'remote.origin.url'],),
1314 'https://chromium.googlesource.com/my/repo'),
1315 ])
1316 return calls
1317
1318 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001319 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001320 fetched_status=None, other_cl_owner=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001321 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001322 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001323 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001324 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001325 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001326 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1327 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001328 ]
1329 calls += cls._is_gerrit_calls(True)
1330 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001331 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001332 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1333 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001334 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001335 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001336 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001337 ((['get_or_create_merge_base', 'master',
1338 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001339 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001340 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001341 ]
1342 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1343
1344 if issue:
1345 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001346 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001347 '123456',
1348 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001349 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001350 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001351 'change_id': '123456789',
1352 'current_revision': 'sha1_of_current_revision',
1353 'revisions': { 'sha1_of_current_revision': {
1354 'commit': {'message': fetched_description},
1355 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001356 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001357 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001358 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001359 if fetched_status == 'ABANDONED':
1360 calls += [
1361 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1362 '123456 has been abandoned, new uploads are not '
1363 'allowed'), SystemExitMock()),
1364 ]
1365 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001366 if other_cl_owner:
1367 calls += [
1368 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1369 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001370
1371 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1372 get_remote_branch=False)
1373 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001374 ((['git', 'rev-parse', '--show-cdup'],), ''),
1375 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001376
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001377 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001378 'diff', '--name-status', '--no-renames', '-r',
1379 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001380 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001381 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001382 ]
1383
1384 if not issue:
1385 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001386 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001387 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001388 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001389 ]
1390
1391 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001392 ((['git', 'config', 'user.email'],), 'me@example.com'),
1393 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001394 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1395 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001396 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001397 ]
1398 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001399
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001400 @classmethod
1401 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001402 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001403 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001404 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001405 post_amend_description=None, issue=None, cc=None,
1406 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001407 if post_amend_description is None:
1408 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001409 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001410 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001411
tandriia60502f2016-06-20 02:01:53 -07001412 if squash_mode == 'default':
1413 calls.extend([
1414 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1415 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1416 ])
1417 elif squash_mode in ('override_squash', 'override_nosquash'):
1418 calls.extend([
1419 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1420 'true' if squash_mode == 'override_squash' else 'false'),
1421 ])
1422 else:
1423 assert squash_mode in ('squash', 'nosquash')
1424
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001425 # If issue is given, then description is fetched from Gerrit instead.
1426 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001427 calls += [
1428 ((['git', 'log', '--pretty=format:%s\n\n%b',
1429 'fake_ancestor_sha..HEAD'],),
1430 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001431 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001432 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001433 else:
1434 if not title:
1435 calls += [
1436 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001437 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001438 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001439 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001440 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001441 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001442 # DownloadGerritHook(False)
1443 ((False, ),
1444 ''),
1445 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001446 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001447 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001448 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001449 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001450 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001451 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001452 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001453 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001454 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001455 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001456 if not issue:
1457 # Prompting to edit description on first upload.
1458 calls += [
1459 ((['git', 'config', 'core.editor'],), ''),
1460 ((['RunEditor'],), description),
1461 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001462 ref_to_push = 'abcdef0123456789'
1463 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001464 ((['git', 'config', 'branch.master.merge'],),
1465 'refs/heads/master'),
1466 ((['git', 'config', 'branch.master.remote'],),
1467 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001468 ((['get_or_create_merge_base', 'master',
1469 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001470 'origin/master'),
1471 ((['git', 'rev-parse', 'HEAD:'],),
1472 '0123456789abcdef'),
1473 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001474 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001475 ref_to_push),
1476 ]
1477 else:
1478 ref_to_push = 'HEAD'
1479
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001480 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001481 ((['git', 'rev-list',
1482 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001483 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001484
Aaron Gable9b713dd2016-12-14 16:04:21 -08001485 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001486 if ref_suffix:
1487 ref_suffix += ',m=' + title
1488 else:
1489 ref_suffix = '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001490
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001491 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1492 if ref_suffix:
1493 ref_suffix += ',' + notify_suffix
1494 else:
1495 ref_suffix = '%' + notify_suffix
1496
1497 if reviewers:
1498 ref_suffix += ',' + ','.join('r=%s' % email
1499 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001500
1501 if git_mirror is None:
1502 calls += [
1503 ((['git', 'config', 'remote.origin.url'],),
1504 'https://chromium.googlesource.com/yyy/zzz'),
1505 ]
1506 else:
1507 calls += [
1508 ((['git', 'config', 'remote.origin.url'],),
1509 '/cache/this-dir-exists'),
1510 (('os.path.isdir', '/cache/this-dir-exists'),
1511 True),
1512 # Runs in /cache/this-dir-exists.
1513 ((['git', 'config', 'remote.origin.url'],),
1514 'https://chromium.googlesource.com/yyy/zzz'),
1515 ]
1516
ukai@chromium.orge8077812012-02-03 03:41:46 +00001517 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001518 ((['git', 'push',
1519 'https://chromium.googlesource.com/yyy/zzz',
1520 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001521 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001522 'remote: Processing changes: (\)\n'
1523 'remote: Processing changes: (|)\n'
1524 'remote: Processing changes: (/)\n'
1525 'remote: Processing changes: (-)\n'
1526 'remote: Processing changes: new: 1 (/)\n'
1527 'remote: Processing changes: new: 1, done\n'
1528 'remote:\n'
1529 'remote: New Changes:\n'
1530 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1531 'remote:\n'
1532 'To https://chromium.googlesource.com/yyy/zzz\n'
1533 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001534 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001535 if squash:
1536 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001537 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001538 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001539 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001540 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001541 ((['git', 'config', 'branch.master.gerritsquashhash',
1542 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001543 ]
tandrii88189772016-09-29 04:29:57 -07001544 calls += [
1545 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001546 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001547 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001548 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001549 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001550 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001551 return calls
1552
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001553 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001554 self,
1555 upload_args,
1556 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001557 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001558 squash=True,
1559 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001560 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001561 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001562 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001563 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001564 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001565 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001566 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001567 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001568 fetched_status=None,
1569 other_cl_owner=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001570 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001571 if squash_mode is None:
1572 if '--no-squash' in upload_args:
1573 squash_mode = 'nosquash'
1574 elif '--squash' in upload_args:
1575 squash_mode = 'squash'
1576 else:
1577 squash_mode = 'default'
1578
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001579 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001580 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001581 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001582 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001583 CookiesAuthenticatorMockFactory(
1584 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001585 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1586 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001587 self.mock(git_cl.gclient_utils, 'RunEditor',
1588 lambda *_, **__: self._mocked_call(['RunEditor']))
1589 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1590
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001591 original_os_path_isdir = os.path.isdir
1592 def selective_os_path_isdir_mock(path):
1593 if path == '/cache/this-dir-exists':
1594 return self._mocked_call('os.path.isdir', path)
1595 return original_os_path_isdir(path)
1596 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1597
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001598 self.calls = self._gerrit_base_calls(
1599 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001600 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001601 fetched_status=fetched_status,
1602 other_cl_owner=other_cl_owner)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001603 if fetched_status != 'ABANDONED':
1604 self.calls += self._gerrit_upload_calls(
1605 description, reviewers, squash,
1606 squash_mode=squash_mode,
1607 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001608 ref_suffix=ref_suffix, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001609 post_amend_description=post_amend_description,
1610 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001611 # Uncomment when debugging.
1612 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001613 git_cl.main(['upload'] + upload_args)
1614
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001615 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001616 self._run_gerrit_upload_test(
1617 ['--no-squash'],
1618 'desc\n\nBUG=\n',
1619 [],
1620 squash=False,
1621 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1622
1623 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001624 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001625 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001626 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001627 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001628 [],
tandriia60502f2016-06-20 02:01:53 -07001629 squash=False,
1630 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001631 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001632
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001633 def test_gerrit_no_reviewer(self):
1634 self._run_gerrit_upload_test(
1635 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001636 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001637 [],
1638 squash=False,
1639 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001640
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001641 def test_gerrit_patch_bad_chars(self):
1642 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1643 self._run_gerrit_upload_test(
1644 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1645 'desc\n\nBUG=\n\nChange-Id: I123456789',
1646 squash=False,
1647 squash_mode='override_nosquash',
1648 title='Dont_put_bad_chars')
1649 self.assertIn(
1650 'WARNING: Patchset title may only contain alphanumeric chars '
1651 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1652 'Cleaned up title: Dont put bad chars\n',
1653 git_cl.sys.stdout.getvalue())
1654
ukai@chromium.orge8077812012-02-03 03:41:46 +00001655 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001656 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001657 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001658 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001659 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001660 squash=False,
1661 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001662 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001663
1664 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001665 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001666 [],
bradnelsond975b302016-10-23 12:20:23 -07001667 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1668 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001669 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001670 ['reviewer@example.com', 'another@example.com'],
1671 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001672 squash_mode='override_nosquash',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001673 ref_suffix='%l=Code-Review+1',
bradnelsond975b302016-10-23 12:20:23 -07001674 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001675
1676 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001677 self._run_gerrit_upload_test(
1678 [],
1679 'desc\nBUG=\n\nChange-Id: 123456789',
1680 [],
1681 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001682
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001683 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001684 self._run_gerrit_upload_test(
1685 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001686 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001687 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001688 squash=True,
1689 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001690
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001691 def test_gerrit_upload_squash_first_with_mirror(self):
1692 self._run_gerrit_upload_test(
1693 ['--squash'],
1694 'desc\nBUG=\n\nChange-Id: 123456789',
1695 [],
1696 squash=True,
1697 expected_upstream_ref='origin/master',
1698 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1699
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001700 def test_gerrit_upload_squash_reupload(self):
1701 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001702 self._run_gerrit_upload_test(
1703 ['--squash'],
1704 description,
1705 [],
1706 squash=True,
1707 expected_upstream_ref='origin/master',
1708 issue=123456)
1709
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001710 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1711 self.mock(git_cl, 'DieWithError',
1712 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1713 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1714 with self.assertRaises(SystemExitMock):
1715 self._run_gerrit_upload_test(
1716 ['--squash'],
1717 description,
1718 [],
1719 squash=True,
1720 expected_upstream_ref='origin/master',
1721 issue=123456,
1722 fetched_status='ABANDONED')
1723
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001724 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1725 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1726 lambda *_, **__: {'email': 'yet-another@example.com'})
1727 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1728 self._run_gerrit_upload_test(
1729 ['--squash'],
1730 description,
1731 [],
1732 squash=True,
1733 expected_upstream_ref='origin/master',
1734 issue=123456,
1735 other_cl_owner='other@example.com')
1736 self.assertIn(
1737 'WARNING: change 123456 is owned by other@example.com, but you '
1738 'authenticate to Gerrit as yet-another@example.com.\n'
1739 'Uploading may fail due to lack of permissions',
1740 git_cl.sys.stdout.getvalue())
1741
rmistry@google.com2dd99862015-06-22 12:22:18 +00001742 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001743 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001744 def mock_run_git(*args, **_kwargs):
1745 if args[0] == ['for-each-ref',
1746 '--format=%(refname:short) %(upstream:short)',
1747 'refs/heads']:
1748 # Create a local branch dependency tree that looks like this:
1749 # test1 -> test2 -> test3 -> test4 -> test5
1750 # -> test3.1
1751 # test6 -> test0
1752 branch_deps = [
1753 'test2 test1', # test1 -> test2
1754 'test3 test2', # test2 -> test3
1755 'test3.1 test2', # test2 -> test3.1
1756 'test4 test3', # test3 -> test4
1757 'test5 test4', # test4 -> test5
1758 'test6 test0', # test0 -> test6
1759 'test7', # test7
1760 ]
1761 return '\n'.join(branch_deps)
1762 self.mock(git_cl, 'RunGit', mock_run_git)
1763
1764 class RecordCalls:
1765 times_called = 0
1766 record_calls = RecordCalls()
1767 def mock_CMDupload(*args, **_kwargs):
1768 record_calls.times_called += 1
1769 return 0
1770 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1771
1772 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001773 (('ask_for_data', 'This command will checkout all dependent branches '
1774 'and run "git cl upload". Press Enter to continue, '
1775 'or Ctrl+C to abort'), ''),
1776 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001777
1778 class MockChangelist():
1779 def __init__(self):
1780 pass
1781 def GetBranch(self):
1782 return 'test1'
1783 def GetIssue(self):
1784 return '123'
1785 def GetPatchset(self):
1786 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001787 def IsGerrit(self):
1788 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001789
1790 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1791 # CMDupload should have been called 5 times because of 5 dependent branches.
1792 self.assertEquals(5, record_calls.times_called)
1793 self.assertEquals(0, ret)
1794
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001795 def test_gerrit_change_id(self):
1796 self.calls = [
1797 ((['git', 'write-tree'], ),
1798 'hashtree'),
1799 ((['git', 'rev-parse', 'HEAD~0'], ),
1800 'branch-parent'),
1801 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1802 'A B <a@b.org> 1456848326 +0100'),
1803 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1804 'C D <c@d.org> 1456858326 +0100'),
1805 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1806 'hashchange'),
1807 ]
1808 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1809 self.assertEqual(change_id, 'Ihashchange')
1810
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001811 def test_desecription_append_footer(self):
1812 for init_desc, footer_line, expected_desc in [
1813 # Use unique desc first lines for easy test failure identification.
1814 ('foo', 'R=one', 'foo\n\nR=one'),
1815 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1816 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1817 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1818 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1819 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1820 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1821 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1822 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1823 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1824 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1825 ]:
1826 desc = git_cl.ChangeDescription(init_desc)
1827 desc.append_footer(footer_line)
1828 self.assertEqual(desc.description, expected_desc)
1829
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001830 def test_update_reviewers(self):
1831 data = [
1832 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001833 ('foo\nR=xx', [], 'foo\nR=xx'),
1834 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001835 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001836 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1837 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1838 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001839 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001840 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001841 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001842 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1843 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1844 # Same as the line before, but full of whitespaces.
1845 (
1846 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1847 'foo\nBar\n\nR=c@c\n BUG =',
1848 ),
1849 # Whitespaces aren't interpreted as new lines.
1850 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001851 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001852 expected = [i[2] for i in data]
1853 actual = []
1854 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001855 obj = git_cl.ChangeDescription(orig)
1856 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001857 actual.append(obj.description)
1858 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001859
wittman@chromium.org455dc922015-01-26 20:15:50 +00001860 def test_get_target_ref(self):
1861 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001862 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001863 self.assertEqual(None, git_cl.GetTargetRef(None,
1864 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001865 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001866
wittman@chromium.org455dc922015-01-26 20:15:50 +00001867 # Check default target refs for branches.
1868 self.assertEqual('refs/heads/master',
1869 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001870 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001871 self.assertEqual('refs/heads/master',
1872 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001873 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001874 self.assertEqual('refs/heads/master',
1875 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001876 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001877 self.assertEqual('refs/branch-heads/123',
1878 git_cl.GetTargetRef('origin',
1879 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001880 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001881 self.assertEqual('refs/diff/test',
1882 git_cl.GetTargetRef('origin',
1883 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001884 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001885 self.assertEqual('refs/heads/chrome/m42',
1886 git_cl.GetTargetRef('origin',
1887 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001888 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001889
1890 # Check target refs for user-specified target branch.
1891 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1892 'refs/remotes/branch-heads/123'):
1893 self.assertEqual('refs/branch-heads/123',
1894 git_cl.GetTargetRef('origin',
1895 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001896 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001897 for branch in ('origin/master', 'remotes/origin/master',
1898 'refs/remotes/origin/master'):
1899 self.assertEqual('refs/heads/master',
1900 git_cl.GetTargetRef('origin',
1901 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001902 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001903 for branch in ('master', 'heads/master', 'refs/heads/master'):
1904 self.assertEqual('refs/heads/master',
1905 git_cl.GetTargetRef('origin',
1906 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001907 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001908
wychen@chromium.orga872e752015-04-28 23:42:18 +00001909 def test_patch_when_dirty(self):
1910 # Patch when local tree is dirty
1911 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1912 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1913
1914 def test_diff_when_dirty(self):
1915 # Do 'git cl diff' when local tree is dirty
1916 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1917 self.assertNotEqual(git_cl.main(['diff']), 0)
1918
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001919 @staticmethod
1920 def _get_gerrit_codereview_server_calls(branch, value=None,
1921 git_short_host='host',
1922 detect_branch=True):
1923 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1924
1925 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1926 """
1927 calls = []
1928 if detect_branch:
1929 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1930 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1931 CERR1 if value is None else value))
1932 if value is None:
1933 calls += [
1934 ((['git', 'config', 'branch.' + branch + '.merge'],),
1935 'refs/heads' + branch),
1936 ((['git', 'config', 'branch.' + branch + '.remote'],),
1937 'origin'),
1938 ((['git', 'config', 'remote.origin.url'],),
1939 'https://%s.googlesource.com/my/repo' % git_short_host),
1940 ]
1941 return calls
1942
tandriidf09a462016-08-18 16:23:55 -07001943 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001944 new_branch=False, git_short_host='host',
1945 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001946 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001947 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1948 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001949 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001950 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001951 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1952
tandriidf09a462016-08-18 16:23:55 -07001953 if new_branch:
1954 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1955 else:
1956 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001957
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001958 if not force_codereview:
1959 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001960 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001961 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001962 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1963 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001964 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001965 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001966
1967 if is_gerrit:
1968 if not force_codereview:
1969 self.calls += [
1970 ((['git', 'config', 'gerrit.host'],), 'true'),
1971 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001972 if detect_gerrit_server:
1973 self.calls += self._get_gerrit_codereview_server_calls(
1974 'master', git_short_host=git_short_host,
1975 detect_branch=not new_branch and force_codereview)
1976
1977 self.calls += [
1978 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001979 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001980 {
1981 'current_revision': '7777777777',
1982 'revisions': {
1983 '1111111111': {
1984 '_number': 1,
1985 'fetch': {'http': {
1986 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1987 'ref': 'refs/changes/56/123456/1',
1988 }},
1989 },
1990 '7777777777': {
1991 '_number': 7,
1992 'fetch': {'http': {
1993 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1994 'ref': 'refs/changes/56/123456/7',
1995 }},
1996 },
1997 },
1998 }),
1999 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002000 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07002002 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002003 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07002004 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002005 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002006 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002007
tandriidf09a462016-08-18 16:23:55 -07002008 def _common_patch_successful(self, new_branch=False):
2009 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002010 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002011 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002012 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002013 ((['git', 'config', 'branch.master.rietveldserver',
2014 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002015 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002016 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002017 ((['git', 'commit', '-m',
2018 'Description\n\n' +
2019 'patch from issue 123456 at patchset 60001 ' +
2020 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002021 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002022
2023 def test_patch_successful(self):
2024 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00002025 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2026
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002027 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07002028 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002029 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2030
wychen@chromium.orga872e752015-04-28 23:42:18 +00002031 def test_patch_conflict(self):
2032 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07002033 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002034 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002035
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002036 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002037 self._patch_common(is_gerrit=True, git_short_host='chromium',
2038 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002039 self.calls += [
2040 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2041 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002042 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002043 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002044 ((['git', 'config', 'branch.master.gerritserver',
2045 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002046 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002047 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002048 ]
2049 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2050
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002051 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002052 self._patch_common(is_gerrit=True, force_codereview=True,
2053 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002054 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002055 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002056 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002057 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002058 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002059 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002060 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002061 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002062 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002063 ]
2064 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2065
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002066 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002067 self._patch_common(is_gerrit=True, git_short_host='else',
2068 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002069 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002070 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002071 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002072 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002073 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002074 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002075 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002076 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002077 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002078 ]
2079 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002080 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002081
2082 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002083 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
2084 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002085 self.calls += [
2086 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2087 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002088 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2089 ''),
2090 ((['git', 'config', 'branch.master.gerritserver',
2091 'https://chromium-review.googlesource.com'],), ''),
2092 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002093 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2094 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2095 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002096 ]
2097 with self.assertRaises(SystemExitMock):
2098 git_cl.main(['patch',
2099 'https://chromium-review.googlesource.com/#/c/123456/1'])
2100
tandriic2405f52016-10-10 08:13:15 -07002101 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002102 def notExists(_issue, *_, **kwargs):
2103 self.assertFalse(kwargs['ignore_404'])
2104 raise git_cl.gerrit_util.GerritError(404, '')
2105 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2106
tandriic2405f52016-10-10 08:13:15 -07002107 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07002108 self.calls = [
2109 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2110 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2111 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2112 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2113 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2114 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08002115 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07002116 'or you have no access to it'],), SystemExitMock()),
2117 ]
2118 with self.assertRaises(SystemExitMock):
2119 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
2120
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002121 def _checkout_calls(self):
2122 return [
2123 ((['git', 'config', '--local', '--get-regexp',
2124 'branch\\..*\\.rietveldissue'], ),
2125 ('branch.retrying.rietveldissue 1111111111\n'
2126 'branch.some-fix.rietveldissue 2222222222\n')),
2127 ((['git', 'config', '--local', '--get-regexp',
2128 'branch\\..*\\.gerritissue'], ),
2129 ('branch.ger-branch.gerritissue 123456\n'
2130 'branch.gbranch654.gerritissue 654321\n')),
2131 ]
2132
2133 def test_checkout_gerrit(self):
2134 """Tests git cl checkout <issue>."""
2135 self.calls = self._checkout_calls()
2136 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2137 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2138
2139 def test_checkout_rietveld(self):
2140 """Tests git cl checkout <issue>."""
2141 self.calls = self._checkout_calls()
2142 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2143 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2144
2145 def test_checkout_not_found(self):
2146 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002147 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002148 self.calls = self._checkout_calls()
2149 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2150
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002151 def test_checkout_no_branch_issues(self):
2152 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002153 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002154 self.calls = [
2155 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002156 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002157 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002158 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002159 ]
2160 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2161
tandrii@chromium.org28253532016-04-14 13:46:56 +00002162 def _test_gerrit_ensure_authenticated_common(self, auth,
2163 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002164 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2165 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2166 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002167 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002168 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002169 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002170 cl.branch = 'master'
2171 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002172 cl.lookedup_issue = True
2173 return cl
2174
2175 def test_gerrit_ensure_authenticated_missing(self):
2176 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002177 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002178 })
2179 self.calls.append(
2180 ((['DieWithError',
2181 'Credentials for the following hosts are required:\n'
2182 ' chromium-review.googlesource.com\n'
2183 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002184 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002185 'https://chromium-review.googlesource.com/new-password'],), ''),)
2186 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2187
2188 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002189 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002190 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002191 'chromium.googlesource.com':
2192 ('git-one.example.com', None, 'secret1'),
2193 'chromium-review.googlesource.com':
2194 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002195 })
2196 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002197 (('ask_for_data', 'If you know what you are doing '
2198 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002199 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2200
2201 def test_gerrit_ensure_authenticated_ok(self):
2202 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002203 'chromium.googlesource.com':
2204 ('git-same.example.com', None, 'secret'),
2205 'chromium-review.googlesource.com':
2206 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002207 })
2208 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2209
tandrii@chromium.org28253532016-04-14 13:46:56 +00002210 def test_gerrit_ensure_authenticated_skipped(self):
2211 cl = self._test_gerrit_ensure_authenticated_common(
2212 auth={}, skip_auth_check=True)
2213 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2214
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002215 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002216 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2217 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002218 self.calls = [
2219 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002220 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002221 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2222 ((['git', 'config', 'rietveld.server'],), ''),
2223 ((['git', 'config', 'rietveld.server'],), ''),
2224 ((['git', 'config', 'branch.feature.rietveldserver'],),
2225 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002226 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002227 ]
2228 self.assertEqual(0, git_cl.main(['set-commit']))
2229
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002230 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002231 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002232 lambda h, i, labels, notify=None:
2233 self._mocked_call(['SetReview', h, i, labels, notify]))
2234
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002235 self.calls = [
2236 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002237 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2238 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002239 ((['git', 'config', 'branch.feature.gerritserver'],),
2240 'https://chromium-review.googlesource.com'),
2241 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002242 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002243 ]
tandriid9e5ce52016-07-13 02:32:59 -07002244
2245 def test_cmd_set_commit_gerrit_clear(self):
2246 self._cmd_set_commit_gerrit_common(0)
2247 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2248
2249 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002250 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002251 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2252
tandriid9e5ce52016-07-13 02:32:59 -07002253 def test_cmd_set_commit_gerrit(self):
2254 self._cmd_set_commit_gerrit_common(2)
2255 self.assertEqual(0, git_cl.main(['set-commit']))
2256
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002257 def test_description_display(self):
2258 out = StringIO.StringIO()
2259 self.mock(git_cl.sys, 'stdout', out)
2260
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002261 self.mock(git_cl, 'Changelist', ChangelistMock)
2262 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002263
2264 self.assertEqual(0, git_cl.main(['description', '-d']))
2265 self.assertEqual('foo\n', out.getvalue())
2266
2267 def test_description_rietveld(self):
2268 out = StringIO.StringIO()
2269 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002270 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002271
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002272 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002273 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002274 self.assertEqual('foobar\n', out.getvalue())
2275
iannucci3c972b92016-08-17 13:24:10 -07002276 def test_StatusFieldOverrideIssueMissingArgs(self):
2277 out = StringIO.StringIO()
2278 self.mock(git_cl.sys, 'stderr', out)
2279
2280 try:
2281 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2282 except SystemExit as ex:
2283 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002284 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002285
2286 out = StringIO.StringIO()
2287 self.mock(git_cl.sys, 'stderr', out)
2288
2289 try:
2290 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2291 except SystemExit as ex:
2292 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002293 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002294
2295 def test_StatusFieldOverrideIssue(self):
2296 out = StringIO.StringIO()
2297 self.mock(git_cl.sys, 'stdout', out)
2298
2299 def assertIssue(cl_self, *_args):
2300 self.assertEquals(cl_self.issue, 1)
2301 return 'foobar'
2302
2303 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2304 self.calls = [
2305 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2306 ((['git', 'config', 'rietveld.server'],), ''),
2307 ((['git', 'config', 'rietveld.server'],), ''),
2308 ]
iannuccie53c9352016-08-17 14:40:40 -07002309 self.assertEqual(
2310 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2311 0)
iannucci3c972b92016-08-17 13:24:10 -07002312 self.assertEqual(out.getvalue(), 'foobar\n')
2313
iannuccie53c9352016-08-17 14:40:40 -07002314 def test_SetCloseOverrideIssue(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, 'CloseIssue', lambda *_: None)
2321 self.calls = [
2322 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2323 ((['git', 'config', 'rietveld.server'],), ''),
2324 ((['git', 'config', 'rietveld.server'],), ''),
2325 ]
2326 self.assertEqual(
2327 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2328
2329 def test_SetCommitOverrideIssue(self):
2330 def assertIssue(cl_self, *_args):
2331 self.assertEquals(cl_self.issue, 1)
2332 return 'foobar'
2333
2334 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2335 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2336 self.calls = [
2337 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2338 ((['git', 'config', 'rietveld.server'],), ''),
2339 ((['git', 'config', 'rietveld.server'],), ''),
2340 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2341 ((['git', 'config', 'rietveld.server'],), ''),
2342 ((['git', 'config', 'rietveld.server'],), ''),
2343 ]
2344 self.assertEqual(
2345 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2346
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002347 def test_description_gerrit(self):
2348 out = StringIO.StringIO()
2349 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002350 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002351 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002352 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2353 {
2354 'current_revision': 'sha1',
2355 'revisions': {'sha1': {
2356 'commit': {'message': 'foobar'},
2357 }},
2358 }),
2359 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002360 self.assertEqual(0, git_cl.main([
2361 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2362 self.assertEqual('foobar\n', out.getvalue())
2363
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002364 def test_description_set_raw(self):
2365 out = StringIO.StringIO()
2366 self.mock(git_cl.sys, 'stdout', out)
2367
2368 self.mock(git_cl, 'Changelist', ChangelistMock)
2369 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2370
2371 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2372 self.assertEqual('hihi', ChangelistMock.desc)
2373
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002374 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002375 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002376
2377 def RunEditor(desc, _, **kwargs):
2378 self.assertEquals(
2379 '# Enter a description of the change.\n'
2380 '# This will be displayed on the codereview site.\n'
2381 '# The first line will also be used as the subject of the review.\n'
2382 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002383 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002384 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002385 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002386 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002387 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002388
dsansomee2d6fd92016-09-08 00:10:47 -07002389 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002390 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002391
2392 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2393 self.mock(git_cl.Changelist, 'GetDescription',
2394 lambda *args: current_desc)
2395 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2396 UpdateDescriptionRemote)
2397 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2398
2399 self.calls = [
2400 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002401 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002402 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2403 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002404 ((['git', 'config', 'core.editor'],), 'vi'),
2405 ]
2406 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2407
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002408 def test_description_set_stdin(self):
2409 out = StringIO.StringIO()
2410 self.mock(git_cl.sys, 'stdout', out)
2411
2412 self.mock(git_cl, 'Changelist', ChangelistMock)
2413 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2414
2415 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2416 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2417
kmarshall3bff56b2016-06-06 18:31:47 -07002418 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002419 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2420
kmarshall3bff56b2016-06-06 18:31:47 -07002421 self.calls = \
2422 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2423 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002424 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002425 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2426 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002427 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2428 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2429 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002430 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2431 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2432 ((['git', 'branch', '-D', 'foo'],), '')]
2433
kmarshall3bff56b2016-06-06 18:31:47 -07002434 self.mock(git_cl, 'get_cl_statuses',
2435 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002436 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2437 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2438 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002439
2440 self.assertEqual(0, git_cl.main(['archive', '-f']))
2441
2442 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002443 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002444 self.calls = \
2445 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2446 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002447 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002448 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2449 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002450 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2451
kmarshall9249e012016-08-23 12:02:16 -07002452 self.mock(git_cl, 'get_cl_statuses',
2453 lambda branches, fine_grained, max_processes:
2454 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2455
2456 self.assertEqual(1, git_cl.main(['archive', '-f']))
2457
2458 def test_archive_dry_run(self):
2459 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2460
2461 self.calls = \
2462 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2463 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2464 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2465 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2466 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2467 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2468 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2469 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2470 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002471
2472 self.mock(git_cl, 'get_cl_statuses',
2473 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002474 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2475 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2476 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002477
kmarshall9249e012016-08-23 12:02:16 -07002478 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2479
2480 def test_archive_no_tags(self):
2481 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2482
2483 self.calls = \
2484 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2485 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2486 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2487 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2488 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2489 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2490 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2491 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2492 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2493 ((['git', 'branch', '-D', 'foo'],), '')]
2494
2495 self.mock(git_cl, 'get_cl_statuses',
2496 lambda branches, fine_grained, max_processes:
2497 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2498 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2499 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2500
2501 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002502
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002503 def test_cmd_issue_erase_existing(self):
2504 out = StringIO.StringIO()
2505 self.mock(git_cl.sys, 'stdout', out)
2506 self.calls = [
2507 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002508 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2509 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002510 # Let this command raise exception (retcode=1) - it should be ignored.
2511 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002512 CERR1),
2513 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2514 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002515 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2516 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2517 ''),
2518 ]
2519 self.assertEqual(0, git_cl.main(['issue', '0']))
2520
phajdan.jre328cf92016-08-22 04:12:17 -07002521 def test_cmd_issue_json(self):
2522 out = StringIO.StringIO()
2523 self.mock(git_cl.sys, 'stdout', out)
2524 self.calls = [
2525 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002526 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002527 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2528 ((['git', 'config', 'rietveld.server'],),
2529 'https://codereview.chromium.org'),
2530 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2531 (('write_json', 'output.json',
2532 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2533 ''),
2534 ]
2535 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2536
tandriide281ae2016-10-12 06:02:30 -07002537 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002538 self.mock(git_cl.Changelist, 'GetChange',
2539 lambda _, *a: (
2540 self._mocked_call(['GetChange']+list(a))))
2541 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2542 lambda *_, **__: (
2543 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002544 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2545 lambda _, s: self._mocked_call(['SetCQState', s]))
2546 self.calls = [
2547 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002548 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002549 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2550 ((['git', 'config', 'rietveld.server'],),
2551 'https://codereview.chromium.org'),
2552 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2553 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2554 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2555 ((['get_or_create_merge_base', 'feature', 'feature'],),
2556 'fake_ancestor_sha'),
2557 ((['GetChange', 'fake_ancestor_sha', None], ),
2558 git_cl.presubmit_support.GitChange(
2559 '', '', '', '', '', '', '', '')),
2560 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2561 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002562 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2563 ]
2564 out = StringIO.StringIO()
2565 self.mock(git_cl.sys, 'stdout', out)
2566 self.assertEqual(0, git_cl.main(['try']))
2567 self.assertEqual(
2568 out.getvalue(),
2569 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2570
tandrii8c5a3532016-11-04 07:52:02 -07002571 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2572 self.mock(git_cl.Changelist, 'GetChange',
2573 lambda _, *a: (
2574 self._mocked_call(['GetChange']+list(a))))
2575 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2576 lambda *_, **__: (
2577 self._mocked_call(['DoGetTryMasters'])))
2578 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2579 lambda _, s: self._mocked_call(['SetCQState', s]))
2580
tandrii8c5a3532016-11-04 07:52:02 -07002581 self.calls = [
2582 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2583 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2584 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2585 ((['git', 'config', 'branch.feature.gerritserver'],),
2586 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002587 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2588 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2589 'project': 'depot_tools',
2590 'status': 'OPEN',
2591 'owner': {'email': 'owner@e.mail'},
2592 'revisions': {
2593 'deadbeaf': {
2594 '_number': 6,
2595 },
2596 'beeeeeef': {
2597 '_number': 7,
2598 'fetch': {'http': {
2599 'url': 'https://chromium.googlesource.com/depot_tools',
2600 'ref': 'refs/changes/56/123456/7'
2601 }},
2602 },
2603 },
2604 }),
tandrii8c5a3532016-11-04 07:52:02 -07002605 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2606 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2607 ((['get_or_create_merge_base', 'feature', 'feature'],),
2608 'fake_ancestor_sha'),
2609 ((['GetChange', 'fake_ancestor_sha', None], ),
2610 git_cl.presubmit_support.GitChange(
2611 '', '', '', '', '', '', '', '')),
2612 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2613 ((['DoGetTryMasters'], ), None),
2614 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2615 ]
2616 out = StringIO.StringIO()
2617 self.mock(git_cl.sys, 'stdout', out)
2618 self.assertEqual(0, git_cl.main(['try']))
2619 self.assertEqual(
2620 out.getvalue(),
2621 'scheduled CQ Dry Run on '
2622 'https://chromium-review.googlesource.com/123456\n')
2623
2624 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2625 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2626 lambda _: {
2627 'owner_email': 'owner@e.mail',
2628 'private': False,
2629 'closed': False,
2630 'project': 'depot_tools',
2631 'patchsets': [20001],
2632 })
tandriide281ae2016-10-12 06:02:30 -07002633 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2634 self.calls = [
2635 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2636 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2637 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2638 ((['git', 'config', 'rietveld.server'],),
2639 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002640 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002641 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002642 ]
2643
2644 def _buildbucket_retry(*_, **kw):
2645 # self.maxDiff = 10000
2646 body = json.loads(kw['body'])
2647 self.assertEqual(len(body['builds']), 1)
2648 build = body['builds'][0]
2649 params = json.loads(build.pop('parameters_json'))
2650 self.assertEqual(params, {
2651 u'builder_name': u'win',
2652 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2653 u'revision': None}],
2654 u'properties': {
2655 u'category': u'git_cl_try',
2656 u'issue': 123,
2657 u'key': u'val',
2658 u'json': [{u'a': 1}, None],
2659 u'master': u'tryserver.chromium',
2660 u'patch_project': u'depot_tools',
2661 u'patch_storage': u'rietveld',
2662 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002663 u'rietveld': u'https://codereview.chromium.org',
2664 }
2665 })
2666 self.assertEqual(build, {
2667 u'bucket': u'master.tryserver.chromium',
2668 u'client_operation_id': u'uuid4',
2669 u'tags': [u'builder:win',
2670 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002671 u'user_agent:git_cl_try',
2672 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002673 })
2674
2675 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2676
2677 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2678 self.assertEqual(0, git_cl.main([
2679 'try', '-m', 'tryserver.chromium', '-b', 'win',
2680 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2681 self.assertRegexpMatches(
2682 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002683 'Tried jobs on:\nBucket: master.tryserver.chromium')
2684
tandrii8c5a3532016-11-04 07:52:02 -07002685 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2686 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2687 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2688
tandrii8c5a3532016-11-04 07:52:02 -07002689 self.calls = [
2690 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2691 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2692 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2693 ((['git', 'config', 'branch.feature.gerritserver'],),
2694 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002695 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002696 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002697 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002698 'status': 'OPEN',
2699 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002700 'revisions': {
2701 'deadbeaf': {
2702 '_number': 6,
2703 },
2704 'beeeeeef': {
2705 '_number': 7,
2706 'fetch': {'http': {
2707 'url': 'https://chromium.googlesource.com/depot_tools',
2708 'ref': 'refs/changes/56/123456/7'
2709 }},
2710 },
2711 },
2712 }),
2713 ]
2714
2715 def _buildbucket_retry(*_, **kw):
2716 # self.maxDiff = 10000
2717 body = json.loads(kw['body'])
2718 self.assertEqual(len(body['builds']), 1)
2719 build = body['builds'][0]
2720 params = json.loads(build.pop('parameters_json'))
2721 self.assertEqual(params, {
2722 u'builder_name': u'win',
2723 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2724 u'revision': None}],
2725 u'properties': {
2726 u'category': u'git_cl_try',
2727 u'key': u'val',
2728 u'json': [{u'a': 1}, None],
2729 u'master': u'tryserver.chromium',
2730
2731 u'patch_gerrit_url':
2732 u'https://chromium-review.googlesource.com',
2733 u'patch_issue': 123456,
2734 u'patch_project': u'depot_tools',
2735 u'patch_ref': u'refs/changes/56/123456/7',
2736 u'patch_repository_url':
2737 u'https://chromium.googlesource.com/depot_tools',
2738 u'patch_set': 7,
2739 u'patch_storage': u'gerrit',
2740 }
2741 })
2742 self.assertEqual(build, {
2743 u'bucket': u'master.tryserver.chromium',
2744 u'client_operation_id': u'uuid4',
2745 u'tags': [
2746 u'builder:win',
2747 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2748 u'user_agent:git_cl_try',
2749 u'master:tryserver.chromium'],
2750 })
2751
2752 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2753
2754 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2755 self.assertEqual(0, git_cl.main([
2756 'try', '-m', 'tryserver.chromium', '-b', 'win',
2757 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2758 self.assertRegexpMatches(
2759 git_cl.sys.stdout.getvalue(),
2760 'Tried jobs on:\nBucket: master.tryserver.chromium')
2761
borenet6c0efe62016-10-19 08:13:29 -07002762 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002763 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2764 lambda _: {
2765 'owner_email': 'owner@e.mail',
2766 'private': False,
2767 'closed': False,
2768 'project': 'depot_tools',
2769 'patchsets': [20001],
2770 })
borenet6c0efe62016-10-19 08:13:29 -07002771 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2772 self.calls = [
2773 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2774 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2775 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2776 ((['git', 'config', 'rietveld.server'],),
2777 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002778 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002779 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002780 ]
2781
2782 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002783 body = json.loads(kw['body'])
2784 self.assertEqual(len(body['builds']), 1)
2785 build = body['builds'][0]
2786 params = json.loads(build.pop('parameters_json'))
2787 self.assertEqual(params, {
2788 u'builder_name': u'win',
2789 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2790 u'revision': None}],
2791 u'properties': {
2792 u'category': u'git_cl_try',
2793 u'issue': 123,
2794 u'patch_project': u'depot_tools',
2795 u'patch_storage': u'rietveld',
2796 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002797 u'rietveld': u'https://codereview.chromium.org',
2798 }
2799 })
2800 self.assertEqual(build, {
2801 u'bucket': u'test.bucket',
2802 u'client_operation_id': u'uuid4',
2803 u'tags': [u'builder:win',
2804 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2805 u'user_agent:git_cl_try'],
2806 })
2807
2808 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2809
2810 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2811 self.assertEqual(0, git_cl.main([
2812 'try', '-B', 'test.bucket', '-b', 'win']))
2813 self.assertRegexpMatches(
2814 git_cl.sys.stdout.getvalue(),
2815 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002816
qyearsley123a4682016-10-26 09:12:17 -07002817 def test_git_cl_try_bots_on_multiple_masters(self):
2818 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2819 self.calls = [
2820 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2821 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2822 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2823 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002824 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002825 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2826 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2827 ]
2828
2829 def _buildbucket_retry(*_, **kw):
2830 body = json.loads(kw['body'])
2831 self.assertEqual(len(body['builds']), 2)
2832
2833 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2834 self.assertEqual(first_build_params['builder_name'], 'builder1')
2835 self.assertEqual(first_build_params['properties']['master'], 'master1')
2836
2837 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2838 self.assertEqual(first_build_params['builder_name'], 'builder2')
2839 self.assertEqual(first_build_params['properties']['master'], 'master2')
2840
2841 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2842
2843 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2844 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2845
2846 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2847 self.assertEqual(
2848 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2849 self.assertEqual(
2850 git_cl.sys.stdout.getvalue(),
2851 'Tried jobs on:\n'
2852 'Bucket: master.master1\n'
2853 ' builder1: []\n'
2854 'Bucket: master.master2\n'
2855 ' builder2: []\n'
2856 'To see results here, run: git cl try-results\n'
2857 'To see results in browser, run: git cl web\n')
2858
tandrii16e0b4e2016-06-07 10:34:28 -07002859 def _common_GerritCommitMsgHookCheck(self):
2860 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2861 self.mock(git_cl.os.path, 'abspath',
2862 lambda path: self._mocked_call(['abspath', path]))
2863 self.mock(git_cl.os.path, 'exists',
2864 lambda path: self._mocked_call(['exists', path]))
2865 self.mock(git_cl.gclient_utils, 'FileRead',
2866 lambda path: self._mocked_call(['FileRead', path]))
2867 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2868 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2869 self.calls = [
2870 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2871 ((['abspath', '../'],), '/abs/git_repo_root'),
2872 ]
2873 return git_cl.Changelist(codereview='gerrit', issue=123)
2874
2875 def test_GerritCommitMsgHookCheck_custom_hook(self):
2876 cl = self._common_GerritCommitMsgHookCheck()
2877 self.calls += [
2878 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2879 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2880 '#!/bin/sh\necho "custom hook"')
2881 ]
2882 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2883
2884 def test_GerritCommitMsgHookCheck_not_exists(self):
2885 cl = self._common_GerritCommitMsgHookCheck()
2886 self.calls += [
2887 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2888 ]
2889 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2890
2891 def test_GerritCommitMsgHookCheck(self):
2892 cl = self._common_GerritCommitMsgHookCheck()
2893 self.calls += [
2894 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2895 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2896 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002897 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002898 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2899 ''),
2900 ]
2901 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2902
tandriic4344b52016-08-29 06:04:54 -07002903 def test_GerritCmdLand(self):
2904 self.calls += [
2905 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2906 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2907 'deadbeaf'),
2908 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2909 ((['git', 'config', 'branch.feature.gerritserver'],),
2910 'chromium-review.googlesource.com'),
2911 ]
2912 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2913 cl._codereview_impl._GetChangeDetail = lambda _: {
2914 'labels': {},
2915 'current_revision': 'deadbeaf',
2916 }
agable32978d92016-11-01 12:55:02 -07002917 cl._codereview_impl._GetChangeCommit = lambda: {
2918 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002919 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002920 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2921 }
tandriic4344b52016-08-29 06:04:54 -07002922 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002923 out = StringIO.StringIO()
2924 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002925 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002926 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002927 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002928
tandrii221ab252016-10-06 08:12:04 -07002929 BUILDBUCKET_BUILDS_MAP = {
2930 '9000': {
2931 'id': '9000',
2932 'status': 'STARTED',
2933 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2934 'result_details_json': '{"properties": {}}',
2935 'bucket': 'master.x.y',
2936 'created_by': 'user:someone@chromium.org',
2937 'created_ts': '147200002222000',
2938 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2939 },
2940 '8000': {
2941 'id': '8000',
2942 'status': 'COMPLETED',
2943 'result': 'FAILURE',
2944 'failure_reason': 'BUILD_FAILURE',
2945 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2946 'result_details_json': '{"properties": {}}',
2947 'bucket': 'master.x.y',
2948 'created_by': 'user:someone@chromium.org',
2949 'created_ts': '147200001111000',
2950 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2951 },
2952 }
2953
2954 def test_write_try_results_json(self):
2955 expected_output = [
2956 {
2957 'buildbucket_id': '8000',
2958 'bucket': 'master.x.y',
2959 'builder_name': 'my-builder',
2960 'status': 'COMPLETED',
2961 'result': 'FAILURE',
2962 'failure_reason': 'BUILD_FAILURE',
2963 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2964 },
2965 {
2966 'buildbucket_id': '9000',
2967 'bucket': 'master.x.y',
2968 'builder_name': 'my-builder',
2969 'status': 'STARTED',
2970 'result': None,
2971 'failure_reason': None,
2972 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2973 }
2974 ]
2975 self.calls = [(('write_json', 'output.json', expected_output), '')]
2976 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2977
tandrii45b2a582016-10-11 03:14:16 -07002978 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002979 out = StringIO.StringIO()
2980 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002981 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2982 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002983 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2984 self._mocked_call(['get_authenticator_for_host', host]))
2985 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2986 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002987
2988 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2989 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002990 self.calls += [
2991 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2992 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2993 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2994 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2995 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2996 ((['git', 'config', 'branch.feature.rietveldserver'],),
2997 'codereview.example.com'),
2998 ((['get_authenticator_for_host', 'codereview.example.com'],),
2999 AuthenticatorMock()),
3000 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3001
3002 def test_fetch_try_jobs_none_rietveld(self):
3003 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003004 # Simulate that user isn't logged in.
3005 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003006 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003007 self.assertRegexpMatches(sys.stdout.getvalue(),
3008 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003009 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3010
3011 def test_fetch_try_jobs_some_rietveld(self):
3012 self._setup_fetch_try_jobs_rietveld({
3013 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3014 })
3015 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003016 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3017 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3018 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3019
3020 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3021 self._setup_fetch_try_jobs(most_recent_patchset=13)
3022 self.calls += [
3023 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3024 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3025 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003026 # TODO(tandrii): Uncomment the below if we decide to support checking
3027 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003028 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003029 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003030 ((['git', 'config', 'branch.feature.gerritserver'],),
3031 'https://x-review.googlesource.com'),
3032 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3033 AuthenticatorMock()),
3034 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3035
3036 def test_fetch_try_jobs_none_gerrit(self):
3037 self._setup_fetch_try_jobs_gerrit({})
3038 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003039 # TODO(tandrii): Uncomment the below if we decide to support checking
3040 # patchsets for Gerrit.
3041 # self.assertRegexpMatches(
3042 # sys.stdout.getvalue(),
3043 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003044 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3045
3046 def test_fetch_try_jobs_some_gerrit(self):
3047 self._setup_fetch_try_jobs_gerrit({
3048 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3049 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003050 # TODO(tandrii): Uncomment the below if we decide to support checking
3051 # patchsets for Gerrit.
3052 # self.calls.remove(
3053 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003054 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3055
3056 # ... and doesn't result in warning.
3057 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3058 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003059 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3060 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3061
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003062 def _mock_gerrit_changes_for_detail_cache(self):
3063 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003064
3065 def test_gerrit_change_detail_cache_normalize(self):
3066 self._mock_gerrit_changes_for_detail_cache()
3067 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003068 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003069 ]
3070 cl = git_cl.Changelist(codereview='gerrit')
3071 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3072 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3073 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3074 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3075
3076 def test_gerrit_change_detail_cache_simple(self):
3077 self._mock_gerrit_changes_for_detail_cache()
3078 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003079 (('GetChangeDetail', 'host', '1', []), 'a'),
3080 (('GetChangeDetail', 'host', '2', []), 'b'),
3081 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003082 ]
3083 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3084 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3085 self.assertEqual(cl._GetChangeDetail(), 'a')
3086 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003087 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003088 self.assertEqual(cl._GetChangeDetail(), 'a')
3089 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3090
3091 def test_gerrit_change_detail_cache_options(self):
3092 self._mock_gerrit_changes_for_detail_cache()
3093 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003094 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3095 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3096 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3097 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003098 ]
3099 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3100 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3101 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3102 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3103 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3104 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3105 self.assertEqual(cl._GetChangeDetail(), 'cab')
3106
3107 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3108 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3109 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3110 self.assertEqual(cl._GetChangeDetail(), 'cab')
3111
3112 # Finally, no_cache should invalidate all caches for given change.
3113 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3114 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3115
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003116 def test_gerrit_description_caching(self):
3117 def gen_detail(rev, desc):
3118 return {
3119 'current_revision': rev,
3120 'revisions': {rev: {'commit': {'message': desc}}}
3121 }
3122 self.calls = [
3123 (('GetChangeDetail', 'host', '1',
3124 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3125 gen_detail('rev1', 'desc1')),
3126 (('GetChangeDetail', 'host', '1',
3127 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3128 gen_detail('rev2', 'desc2')),
3129 ]
3130
3131 self._mock_gerrit_changes_for_detail_cache()
3132 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3133 self.assertEqual(cl.GetDescription(), 'desc1')
3134 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3135 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003136
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003137 def test_print_current_creds(self):
3138 class CookiesAuthenticatorMock(object):
3139 def __init__(self):
3140 self.gitcookies = {
3141 'host.googlesource.com': ('user', 'pass'),
3142 'host-review.googlesource.com': ('user', 'pass'),
3143 }
3144 self.netrc = self
3145 self.netrc.hosts = {
3146 'github.com': ('user2', None, 'pass2'),
3147 'host2.googlesource.com': ('user3', None, 'pass'),
3148 }
3149 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3150 CookiesAuthenticatorMock)
3151 self.mock(sys, 'stdout', StringIO.StringIO())
3152 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3153 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3154 ' Host\t User\t Which file',
3155 '============================\t=====\t===========',
3156 'host-review.googlesource.com\t user\t.gitcookies',
3157 ' host.googlesource.com\t user\t.gitcookies',
3158 ' host2.googlesource.com\tuser3\t .netrc',
3159 ])
3160 sys.stdout.buf = ''
3161 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3162 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3163 ' Host\tUser\t Which file',
3164 '============================\t====\t===========',
3165 'host-review.googlesource.com\tuser\t.gitcookies',
3166 ' host.googlesource.com\tuser\t.gitcookies',
3167 ])
3168
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003169 def _common_creds_check_mocks(self):
3170 def exists_mock(path):
3171 dirname = os.path.dirname(path)
3172 if dirname == os.path.expanduser('~'):
3173 dirname = '~'
3174 base = os.path.basename(path)
3175 if base in ('.netrc', '.gitcookies'):
3176 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3177 # git cl also checks for existence other files not relevant to this test.
3178 return None
3179 self.mock(os.path, 'exists', exists_mock)
3180 self.mock(sys, 'stdout', StringIO.StringIO())
3181
3182 def test_creds_check_gitcookies_not_configured(self):
3183 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003184 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003185 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003186 self.calls = [
3187 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3188 (('os.path.exists', '~/.netrc'), True),
3189 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3190 'or Ctrl+C to abort'), ''),
3191 ((['git', 'config', '--global', 'http.cookiefile',
3192 os.path.expanduser('~/.gitcookies')], ), ''),
3193 ]
3194 self.assertEqual(0, git_cl.main(['creds-check']))
3195 self.assertRegexpMatches(
3196 sys.stdout.getvalue(),
3197 '^You seem to be using outdated .netrc for git credentials:')
3198 self.assertRegexpMatches(
3199 sys.stdout.getvalue(),
3200 '\nConfigured git to use .gitcookies from')
3201
3202 def test_creds_check_gitcookies_configured_custom_broken(self):
3203 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003204 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003205 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003206 self.calls = [
3207 ((['git', 'config', '--global', 'http.cookiefile'],),
3208 '/custom/.gitcookies'),
3209 (('os.path.exists', '/custom/.gitcookies'), False),
3210 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3211 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3212 ((['git', 'config', '--global', 'http.cookiefile',
3213 os.path.expanduser('~/.gitcookies')], ), ''),
3214 ]
3215 self.assertEqual(0, git_cl.main(['creds-check']))
3216 self.assertRegexpMatches(
3217 sys.stdout.getvalue(),
3218 'WARNING: you have configured custom path to .gitcookies: ')
3219 self.assertRegexpMatches(
3220 sys.stdout.getvalue(),
3221 'However, your configured .gitcookies file is missing.')
3222
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003223 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003224 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3225 lambda _, message: self._mocked_call('AddComment', message))
3226 self.calls = [
3227 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3228 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3229 (('AddComment', 'msg'), ''),
3230 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003231 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3232 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003233
3234 def test_git_cl_comment_add_gerrit(self):
3235 self.mock(git_cl.gerrit_util, 'SetReview',
3236 lambda host, change, msg:
3237 self._mocked_call('SetReview', host, change, msg))
3238 self.calls = [
3239 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3240 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3241 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3242 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3243 'origin/master'),
3244 ((['git', 'config', 'remote.origin.url'],),
3245 'https://chromium.googlesource.com/infra/infra'),
3246 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3247 ]
3248 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3249 '-a', 'msg']))
3250
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003251 def test_git_cl_comments_fetch_rietveld(self):
3252 self.mock(sys, 'stdout', StringIO.StringIO())
3253 self.calls = [
3254 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3255 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3256 ] * 2
3257 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3258 'messages': [
3259 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3260 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3261 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3262 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3263 # Intentionally wrong order here.
3264 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3265 'disapproval': False, 'approval': False,
3266 'sender': 'owner@example.com'},
3267 ],
3268 'owner_email': 'owner@example.com',
3269 })
3270 expected_comments_summary = [
3271 git_cl._CommentSummary(
3272 message='lgtm',
3273 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3274 disapproval=False, approval=True, sender='r@example.com'),
3275 git_cl._CommentSummary(
3276 message='not lgtm',
3277 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3278 disapproval=True, approval=False, sender='r2@example.com'),
3279 # Note: same order as in whatever Rietveld returns.
3280 git_cl._CommentSummary(
3281 message='PTAL',
3282 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3283 disapproval=False, approval=False, sender='owner@example.com'),
3284 ]
3285 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3286 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3287
3288 with git_cl.gclient_utils.temporary_directory() as tempdir:
3289 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3290 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3291 '-j', out_file]))
3292 with open(out_file) as f:
3293 read = json.load(f)
3294 self.assertEqual(len(read), 3)
3295 self.assertEqual(read[0], {
3296 'date': '2000-03-13 20:49:34.515270',
3297 'message': 'PTAL',
3298 'approval': False,
3299 'disapproval': False,
3300 'sender': 'owner@example.com'})
3301 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3302 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3303
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003304 def test_git_cl_comments_fetch_gerrit(self):
3305 self.mock(sys, 'stdout', StringIO.StringIO())
3306 self.calls = [
3307 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3308 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3309 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3310 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3311 'origin/master'),
3312 ((['git', 'config', 'remote.origin.url'],),
3313 'https://chromium.googlesource.com/infra/infra'),
3314 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3315 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3316 'owner': {'email': 'owner@example.com'},
3317 'messages': [
3318 {
3319 u'_revision_number': 1,
3320 u'author': {
3321 u'_account_id': 1111084,
3322 u'email': u'commit-bot@chromium.org',
3323 u'name': u'Commit Bot'
3324 },
3325 u'date': u'2017-03-15 20:08:45.000000000',
3326 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3327 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3328 u'tag': u'autogenerated:cq:dry-run'
3329 },
3330 {
3331 u'_revision_number': 2,
3332 u'author': {
3333 u'_account_id': 11151243,
3334 u'email': u'owner@example.com',
3335 u'name': u'owner'
3336 },
3337 u'date': u'2017-03-16 20:00:41.000000000',
3338 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3339 u'message': u'PTAL',
3340 },
3341 {
3342 u'_revision_number': 2,
3343 u'author': {
3344 u'_account_id': 148512 ,
3345 u'email': u'reviewer@example.com',
3346 u'name': u'reviewer'
3347 },
3348 u'date': u'2017-03-17 05:19:37.500000000',
3349 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3350 u'message': u'Patch Set 2: Code-Review+1',
3351 },
3352 ]
3353 })
3354 ] * 2
3355 expected_comments_summary = [
3356 git_cl._CommentSummary(
3357 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3358 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3359 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3360 git_cl._CommentSummary(
3361 message=u'PTAL',
3362 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3363 disapproval=False, approval=False, sender=u'owner@example.com'),
3364 git_cl._CommentSummary(
3365 message=u'Patch Set 2: Code-Review+1',
3366 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3367 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3368 ]
3369 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3370 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3371
3372 with git_cl.gclient_utils.temporary_directory() as tempdir:
3373 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3374 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3375 '-j', out_file]))
3376 with open(out_file) as f:
3377 read = json.load(f)
3378 self.assertEqual(len(read), 3)
3379 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3380 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3381 self.assertEqual(read[2], {
3382 u'date': u'2017-03-17 05:19:37.500000',
3383 u'message': u'Patch Set 2: Code-Review+1',
3384 u'approval': False,
3385 u'disapproval': False,
3386 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003387
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003388if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003389 logging.basicConfig(
3390 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003391 unittest.main()