blob: f5cbb72130eb0eac066aac07a791f29148311983 [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
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000222 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
223 parsed = urlparse.urlparse(url)
224 result = func(parsed)
225 if fail:
226 self.assertIsNone(result)
227 return None
228 self.assertIsNotNone(result)
229 self.assertEqual(result.issue, issue)
230 self.assertEqual(result.patchset, patchset)
231 self.assertEqual(result.hostname, hostname)
232 return result
233
234 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700235 def test(url, issue=None, patchset=None, hostname=None, fail=None):
236 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000237 git_cl._RietveldChangelistImpl.ParseIssueURL,
238 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000239
240 test('http://codereview.chromium.org/123',
241 123, None, 'codereview.chromium.org')
242 test('https://codereview.chromium.org/123',
243 123, None, 'codereview.chromium.org')
244 test('https://codereview.chromium.org/123/',
245 123, None, 'codereview.chromium.org')
246 test('https://codereview.chromium.org/123/whatever',
247 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700248 test('https://codereview.chromium.org/123/#ps20001',
249 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000250 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700251 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000252 # This looks like bad Gerrit, but is actually valid Rietveld.
253 test('https://chrome-review.source.com/123/4/',
254 123, None, 'chrome-review.source.com')
255
256 test('https://codereview.chromium.org/deadbeaf', fail=True)
257 test('https://codereview.chromium.org/api/123', fail=True)
258 test('bad://codereview.chromium.org/123', fail=True)
259 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
260
261 def test_ParseIssueURL_gerrit(self):
262 def test(url, issue=None, patchset=None, hostname=None, fail=None):
263 self._test_ParseIssueUrl(
264 git_cl._GerritChangelistImpl.ParseIssueURL,
265 url, issue, patchset, hostname, fail)
266
267 test('http://chrome-review.source.com/c/123',
268 123, None, 'chrome-review.source.com')
269 test('https://chrome-review.source.com/c/123/',
270 123, None, 'chrome-review.source.com')
271 test('https://chrome-review.source.com/c/123/4',
272 123, 4, 'chrome-review.source.com')
273 test('https://chrome-review.source.com/#/c/123/4',
274 123, 4, 'chrome-review.source.com')
275 test('https://chrome-review.source.com/c/123/4',
276 123, 4, 'chrome-review.source.com')
277 test('https://chrome-review.source.com/123',
278 123, None, 'chrome-review.source.com')
279 test('https://chrome-review.source.com/123/4',
280 123, 4, 'chrome-review.source.com')
281
282 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
283 test('https://chrome-review.source.com/c/abc/', fail=True)
284 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
285
286 def test_ParseIssueNumberArgument(self):
287 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
288 result = git_cl.ParseIssueNumberArgument(arg)
289 self.assertIsNotNone(result)
290 if fail:
291 self.assertFalse(result.valid)
292 else:
293 self.assertEqual(result.issue, issue)
294 self.assertEqual(result.patchset, patchset)
295 self.assertEqual(result.hostname, hostname)
296
297 test('123', 123)
298 test('', fail=True)
299 test('abc', fail=True)
300 test('123/1', fail=True)
301 test('123a', fail=True)
302 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
303 # Rietveld.
304 test('https://codereview.source.com/123',
305 123, None, 'codereview.source.com')
306 test('https://codereview.source.com/www123', fail=True)
307 # Gerrrit.
308 test('https://chrome-review.source.com/c/123/4',
309 123, 4, 'chrome-review.source.com')
310 test('https://chrome-review.source.com/bad/123/4', fail=True)
311
tandriif9aefb72016-07-01 09:06:51 -0700312 def test_get_bug_line_values(self):
313 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
314 self.assertEqual(f('', ''), [])
315 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
316 self.assertEqual(f('v8', '456'), ['v8:456'])
317 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
318 # Not nice, but not worth carying.
319 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
320 ['v8:456', 'chromium:123', 'v8:123'])
321
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100322 def _test_git_number(self, parent_msg, dest_ref, child_msg,
323 parent_hash='parenthash'):
324 desc = git_cl.ChangeDescription(child_msg)
325 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
326 return desc.description
327
328 def assertEqualByLine(self, actual, expected):
329 self.assertEqual(actual.splitlines(), expected.splitlines())
330
331 def test_git_number_bad_parent(self):
332 with self.assertRaises(ValueError):
333 self._test_git_number('Parent', 'refs/heads/master', 'Child')
334
335 def test_git_number_bad_parent_footer(self):
336 with self.assertRaises(AssertionError):
337 self._test_git_number(
338 'Parent\n'
339 '\n'
340 'Cr-Commit-Position: wrong',
341 'refs/heads/master', 'Child')
342
343 def test_git_number_bad_lineage_ignored(self):
344 actual = self._test_git_number(
345 'Parent\n'
346 '\n'
347 'Cr-Commit-Position: refs/heads/master@{#1}\n'
348 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
349 'refs/heads/master', 'Child')
350 self.assertEqualByLine(
351 actual,
352 'Child\n'
353 '\n'
354 'Cr-Commit-Position: refs/heads/master@{#2}\n'
355 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
356
357 def test_git_number_same_branch(self):
358 actual = self._test_git_number(
359 'Parent\n'
360 '\n'
361 'Cr-Commit-Position: refs/heads/master@{#12}',
362 dest_ref='refs/heads/master',
363 child_msg='Child')
364 self.assertEqualByLine(
365 actual,
366 'Child\n'
367 '\n'
368 'Cr-Commit-Position: refs/heads/master@{#13}')
369
370 def test_git_number_same_branch_with_originals(self):
371 actual = self._test_git_number(
372 'Parent\n'
373 '\n'
374 'Cr-Commit-Position: refs/heads/master@{#12}',
375 dest_ref='refs/heads/master',
376 child_msg='Child\n'
377 '\n'
378 'Some users are smart and insert their own footers\n'
379 '\n'
380 'Cr-Whatever: value\n'
381 'Cr-Commit-Position: refs/copy/paste@{#22}')
382 self.assertEqualByLine(
383 actual,
384 'Child\n'
385 '\n'
386 'Some users are smart and insert their own footers\n'
387 '\n'
388 'Cr-Original-Whatever: value\n'
389 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
390 'Cr-Commit-Position: refs/heads/master@{#13}')
391
392 def test_git_number_new_branch(self):
393 actual = self._test_git_number(
394 'Parent\n'
395 '\n'
396 'Cr-Commit-Position: refs/heads/master@{#12}',
397 dest_ref='refs/heads/branch',
398 child_msg='Child')
399 self.assertEqualByLine(
400 actual,
401 'Child\n'
402 '\n'
403 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
404 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
405
406 def test_git_number_lineage(self):
407 actual = self._test_git_number(
408 'Parent\n'
409 '\n'
410 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
411 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
412 dest_ref='refs/heads/branch',
413 child_msg='Child')
414 self.assertEqualByLine(
415 actual,
416 'Child\n'
417 '\n'
418 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
419 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
420
421 def test_git_number_moooooooore_lineage(self):
422 actual = self._test_git_number(
423 'Parent\n'
424 '\n'
425 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
426 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
427 dest_ref='refs/heads/mooore',
428 child_msg='Child')
429 self.assertEqualByLine(
430 actual,
431 'Child\n'
432 '\n'
433 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
434 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
435 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
436
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100437 def test_git_number_ever_moooooooore_lineage(self):
438 self.maxDiff = 10000
439 actual = self._test_git_number(
440 'CQ commit on fresh new branch + numbering.\n'
441 '\n'
442 'NOTRY=True\n'
443 'NOPRESUBMIT=True\n'
444 'BUG=\n'
445 '\n'
446 'Review-Url: https://codereview.chromium.org/2577703003\n'
447 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
448 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
449 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
450 dest_ref='refs/heads/gnumb-test/cl',
451 child_msg='git cl on fresh new branch + numbering.\n'
452 '\n'
453 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
454 self.assertEqualByLine(
455 actual,
456 'git cl on fresh new branch + numbering.\n'
457 '\n'
458 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
459 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
460 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
461 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
462 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100463
464 def test_git_number_cherry_pick(self):
465 actual = self._test_git_number(
466 'Parent\n'
467 '\n'
468 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
469 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
470 dest_ref='refs/heads/branch',
471 child_msg='Child, which is cherry-pick from master\n'
472 '\n'
473 'Cr-Commit-Position: refs/heads/master@{#100}\n'
474 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
475 self.assertEqualByLine(
476 actual,
477 'Child, which is cherry-pick from master\n'
478 '\n'
479 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
480 '\n'
481 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
482 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
483 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
484
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000485
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100486class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100487 def setUp(self):
488 super(GitCookiesCheckerTest, self).setUp()
489 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100490 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100491
492 def mock_hosts_creds(self, subhost_identity_pairs):
493 def ensure_googlesource(h):
494 if not h.endswith(self.c._GOOGLESOURCE):
495 assert not h.endswith('.')
496 return h + '.' + self.c._GOOGLESOURCE
497 return h
498 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
499 for h, i in subhost_identity_pairs]
500
501 def test_analysis_nothing(self):
502 self.c._all_hosts = []
503 self.assertFalse(self.c.has_generic_host())
504 self.assertEqual(set(), self.c.get_conflicting_hosts())
505 self.assertEqual(set(), self.c.get_duplicated_hosts())
506 self.assertEqual(set(), self.c.get_partially_configured_hosts())
507 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
508
509 def test_analysis(self):
510 self.mock_hosts_creds([
511 ('.googlesource.com', 'git-example.chromium.org'),
512
513 ('chromium', 'git-example.google.com'),
514 ('chromium-review', 'git-example.google.com'),
515 ('chrome-internal', 'git-example.chromium.org'),
516 ('chrome-internal-review', 'git-example.chromium.org'),
517 ('conflict', 'git-example.google.com'),
518 ('conflict-review', 'git-example.chromium.org'),
519 ('dup', 'git-example.google.com'),
520 ('dup', 'git-example.google.com'),
521 ('dup-review', 'git-example.google.com'),
522 ('partial', 'git-example.google.com'),
523 ])
524 self.assertTrue(self.c.has_generic_host())
525 self.assertEqual(set(['conflict.googlesource.com']),
526 self.c.get_conflicting_hosts())
527 self.assertEqual(set(['dup.googlesource.com']),
528 self.c.get_duplicated_hosts())
529 self.assertEqual(set(['partial.googlesource.com']),
530 self.c.get_partially_configured_hosts())
531 self.assertEqual(set(['chromium.googlesource.com',
532 'chrome-internal.googlesource.com']),
533 self.c.get_hosts_with_wrong_identities())
534
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100535 def test_report_no_problems(self):
536 self.test_analysis_nothing()
537 self.mock(sys, 'stdout', StringIO.StringIO())
538 self.assertFalse(self.c.find_and_report_problems())
539 self.assertEqual(sys.stdout.getvalue(), '')
540
541 def test_report(self):
542 self.test_analysis()
543 self.mock(sys, 'stdout', StringIO.StringIO())
544 self.assertTrue(self.c.find_and_report_problems())
545 with open(os.path.join(os.path.dirname(__file__),
546 'git_cl_creds_check_report.txt')) as f:
547 expected = f.read()
548 def by_line(text):
549 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200550 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100551
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000552class TestGitCl(TestCase):
553 def setUp(self):
554 super(TestGitCl, self).setUp()
555 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700556 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000557 self.mock(subprocess2, 'call', self._mocked_call)
558 self.mock(subprocess2, 'check_call', self._mocked_call)
559 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700560 self.mock(subprocess2, 'communicate',
561 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000562 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000563 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000564 self.mock(git_common, 'get_or_create_merge_base',
565 lambda *a: (
566 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000567 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000568 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100569 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
570 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700571 self.mock(git_cl, 'write_json', lambda path, contents:
572 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000573 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000574 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000575 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700576 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
577 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000578 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000579 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000580 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100581 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
582 lambda *args, **kwargs: self._mocked_call(
583 'GetChangeDetail', *args, **kwargs))
584 self.mock(git_cl.gerrit_util, 'AddReviewers',
585 lambda h, i, add, is_reviewer, notify: self._mocked_call(
586 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000587 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
588 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700589 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100590 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000591 # It's important to reset settings to not have inter-tests interference.
592 git_cl.settings = None
593
594 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000595 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100596 self.assertEquals([], self.calls)
597 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000598 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100599 raise
600 # Sadly, has_failed() returns True if this OR any other tests before this
601 # one have failed.
602 git_cl.logging.exception(
603 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
604 'There are un-consumed self.calls after this test has finished.\n'
605 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700606 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100607 '\n'
608 'If you are already running just this single test, then **first** '
609 'fix the problem whose exception is emitted below by unittest '
610 'runner.\n'
611 '\n'
612 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700613 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100614 'and follow instructions above.\n' +
615 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000616 finally:
617 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000618
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000619 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000620 self.assertTrue(
621 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700622 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000623 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000624 expected_args, result = top
625
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000626 # Also logs otherwise it could get caught in a try/finally and be hard to
627 # diagnose.
628 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700629 N = 5
630 prior_calls = '\n '.join(
631 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
632 for i, c in enumerate(self._calls_done[-N:]))
633 following_calls = '\n '.join(
634 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
635 for i, c in enumerate(self.calls[:N]))
636 extended_msg = (
637 'A few prior calls:\n %s\n\n'
638 'This (expected):\n @%d: %r\n'
639 'This (actual):\n @%d: %r\n\n'
640 'A few following expected calls:\n %s' %
641 (prior_calls, len(self._calls_done), expected_args,
642 len(self._calls_done), args, following_calls))
643 git_cl.logging.error(extended_msg)
644
tandrii99a72f22016-08-17 14:33:24 -0700645 self.fail('@%d\n'
646 ' Expected: %r\n'
647 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700648 len(self._calls_done), expected_args, args))
649
650 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700651 if isinstance(result, Exception):
652 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000653 return result
654
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100655 def test_ask_for_explicit_yes_true(self):
656 self.calls = [
657 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
658 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
659 ]
660 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
661
662 def test_ask_for_explicit_yes_true(self):
663 self.calls = [
664 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
665 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
666 ]
667 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
668
tandrii48df5812016-10-17 03:55:37 -0700669 def test_LoadCodereviewSettingsFromFile_gerrit(self):
670 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
671 self.calls = [
672 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
673 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
674 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
675 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
676 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
677 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700678 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
679 CERR1),
680 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700681 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
682 CERR1),
683 ((['git', 'config', 'gerrit.host', 'true'],), ''),
684 ]
685 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
686
maruel@chromium.orga3353652011-11-30 14:26:57 +0000687 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000688 def _is_gerrit_calls(cls, gerrit=False):
689 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
690 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
691
692 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000693 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000694 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000695 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000696
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000697 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000698 def _upload_no_rev_calls(cls, similarity, find_copies):
699 return (cls._git_base_calls(similarity, find_copies) +
700 cls._git_upload_no_rev_calls())
701
702 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000703 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000704 if similarity is None:
705 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700706 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700707 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000708 else:
tandrii33a46ff2016-08-23 05:53:40 -0700709 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700710 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000711
712 if find_copies is None:
713 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700714 find_copies_call = ((['git', 'config', '--bool',
715 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000716 else:
tandrii5d48c322016-08-18 16:19:37 -0700717 val = str(find_copies).lower()
718 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000719 'branch.master.git-find-copies', val],), '')
720
721 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000722 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800723 '-l100000', '-C'+similarity,
724 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000725 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000726 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000727 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000728
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000729 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000730 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000731 similarity_call,
732 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
733 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000734 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000735 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700736 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
737 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000738 ((['git', 'config', 'rietveld.server'],),
739 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000740 ((['git', 'config', 'branch.master.merge'],), 'master'),
741 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000742 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000743 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000744 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000745 ((['git', 'rev-parse', '--show-cdup'],), ''),
746 ((['git', 'rev-parse', 'HEAD'],), '12345'),
747 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000748 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000749 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700750 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000751 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000752 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000753 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000755 stat_call,
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..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000758 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700759 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000760 ]
761
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000762 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000763 def _git_upload_no_rev_calls(cls):
764 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000765 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000766 ]
767
768 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000769 def _git_upload_calls(cls, private):
770 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000771 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000772 private_call = []
773 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000774 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000775 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000776 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000777
maruel@chromium.orga3353652011-11-30 14:26:57 +0000778 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000779 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000780 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000781 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800782 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000783 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700784 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000786 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000787 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700788 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000789 ] + cls._git_post_upload_calls()
790
791 @classmethod
792 def _git_post_upload_calls(cls):
793 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
795 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
796 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000797 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000798 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000799 ]
800
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000801 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000802 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000803 fake_ancestor = 'fake_ancestor'
804 fake_cl = 'fake_cl_for_patch'
805 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000806 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000807 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000808 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000809 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000810 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000811 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000812 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000813 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700814 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000815 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000816 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000817 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000818 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000819 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000820 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000821 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000822 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000823 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000824 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000825 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000826
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000827 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700828 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000829 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000830 return [
831 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000832 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000833 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000834 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700835 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000836 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000837 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100838 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000839 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000840 ]
841
842 def _run_reviewer_test(
843 self,
844 upload_args,
845 expected_description,
846 returned_description,
847 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000848 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700849 private=False,
850 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000851 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000852 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000853 try:
854 similarity = upload_args[upload_args.index('--similarity')+1]
855 except ValueError:
856 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000857
858 if '--find-copies' in upload_args:
859 find_copies = True
860 elif '--no-find-copies' in upload_args:
861 find_copies = False
862 else:
863 find_copies = None
864
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000865 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700866 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000867
868 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000869
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000870 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000871 self.assertEquals(
872 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000873 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000874 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000875 '#--------------------This line is 72 characters long'
876 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000877 expected_description,
878 desc)
879 return returned_description
880 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000881
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000882 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000883 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700884 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000885 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000886 return 1, 2
887 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000888
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000889 git_cl.main(['upload'] + upload_args)
890
891 def test_no_reviewer(self):
892 self._run_reviewer_test(
893 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000894 'desc\n\nBUG=',
895 '# Blah blah comment.\ndesc\n\nBUG=',
896 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897 [])
898
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000899 def test_keep_similarity(self):
900 self._run_reviewer_test(
901 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000902 'desc\n\nBUG=',
903 '# Blah blah comment.\ndesc\n\nBUG=',
904 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000905 [])
906
iannucci@chromium.org79540052012-10-19 23:15:26 +0000907 def test_keep_find_copies(self):
908 self._run_reviewer_test(
909 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000910 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000911 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000912 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000913 [])
914
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000915 def test_private(self):
916 self._run_reviewer_test(
917 ['--private'],
918 'desc\n\nBUG=',
919 '# Blah blah comment.\ndesc\n\nBUG=\n',
920 'desc\n\nBUG=',
921 [])
922
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000923 def test_reviewers_cmd_line(self):
924 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000925 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000926 self._run_reviewer_test(
927 ['-r' 'foo@example.com'],
928 description,
929 '\n%s\n' % description,
930 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000931 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000932
933 def test_reviewer_tbr_overriden(self):
934 # Reviewer is overriden with TBR
935 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000936 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000937 self._run_reviewer_test(
938 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000939 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000940 description.strip('\n'),
941 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000942 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000943
944 def test_reviewer_multiple(self):
945 # Handles multiple R= or TBR= lines.
946 description = (
bradnelsond975b302016-10-23 12:20:23 -0700947 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
948 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000949 self._run_reviewer_test(
950 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000951 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000952 description,
953 description,
bradnelsond975b302016-10-23 12:20:23 -0700954 ['--reviewers=another@example.com,reviewer@example.com'],
955 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956
maruel@chromium.orga3353652011-11-30 14:26:57 +0000957 def test_reviewer_send_mail(self):
958 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000959 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000960 self._run_reviewer_test(
961 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000962 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000963 description.strip('\n'),
964 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000965 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000966
967 def test_reviewer_send_mail_no_rev(self):
968 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000969 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700970 self.calls = self._upload_no_rev_calls(None, None) + [
971 ((['DieWithError', 'Must specify reviewers to send email.'],),
972 SystemExitMock())
973 ]
974
975 def RunEditor(desc, _, **kwargs):
976 return desc
977 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
978 self.mock(sys, 'stdout', stdout)
979 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000980 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700981 self.assertEqual(
982 'Using 50% similarity for rename/copy detection. Override with '
983 '--similarity.\n',
984 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000985
tandriif9aefb72016-07-01 09:06:51 -0700986 def test_bug_on_cmd(self):
987 self._run_reviewer_test(
988 ['--bug=500658,proj:123'],
989 'desc\n\nBUG=500658\nBUG=proj:123',
990 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
991 'desc\n\nBUG=500658\nBUG=proj:1234',
992 [])
993
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100994 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
995 parent_msg=None,
996 new_msg=None,
997 fail_after_parent_msg=False,
998 fail_cherry_pick=False,
999 fail_push_count=0,
1000 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001001 if debug:
1002 # Very useful due to finally clause in git cl land raising exceptions and
1003 # shadowing real cause of failure.
1004 self.mock(git_cl, '_IS_BEING_TESTED', True)
1005 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001006 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001007
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001008 if git_numberer_enabled:
1009 # Special mocks to check validity of timestamp.
1010 original_git_amend_head = git_cl._git_amend_head
1011 def _git_amend_head_mock(msg, tstamp):
1012 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1013 return original_git_amend_head(msg, tstamp)
1014 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1015
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001016 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1017 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001018 self.mock(RietveldMock, 'update_description', staticmethod(
1019 lambda i, d: self._mocked_call(['update_description', i, d])))
1020 self.mock(RietveldMock, 'add_comment', staticmethod(
1021 lambda i, c: self._mocked_call(['add_comment', i, c])))
1022 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001023 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1024 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1025 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1026 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1027 CERR1),
1028 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1029 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001030 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001031 ((['git', 'config', 'rietveld.server'],),
1032 'https://codereview.chromium.org'),
1033 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1034 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1035 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1036 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001037 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1038 ''), # No commits to rebase, according to local view of origin.
1039 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1040 'fake_ancestor_sha'),
1041 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1042 ((['git', 'rev-parse', '--show-cdup'],), ''),
1043 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1044 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1045 'fake_ancestor_sha...', '.'],),
1046 'M\tfile1.cpp'),
1047 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1048 ((['git', 'config', 'branch.feature.rietveldserver'],),
1049 'https://codereview.chromium.org'),
1050 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1051 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1052 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1053 'fake_ancestor_sha', 'feature'],),
1054 # This command just prints smth like this:
1055 # file1.cpp | 53 ++++++--
1056 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1057 ''),
1058 ((['git', 'show-ref', '--quiet', '--verify',
1059 'refs/heads/git-cl-commit'],),
1060 ''), # 0 return code means branch exists.
1061 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1062 ((['git', 'show-ref', '--quiet', '--verify',
1063 'refs/heads/git-cl-cherry-pick'],),
1064 CERR1), # This means git-cl-cherry-pick branch does not exist.
1065 ((['git', 'rev-parse', '--show-cdup'],), ''),
1066 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1067 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1068 ((['git', 'commit', '-m',
1069 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001070 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001071 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1072 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1073 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001074 repo_url),
1075
1076 ((['git', 'config', 'remote.origin.url'],), repo_url),
1077 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1078 git_numberer_enabled),
1079
1080 # Auto-rebase init.
1081 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1082 ]
1083 # Auto-rebase loops.
1084 for attempt in xrange(fail_push_count + 1):
1085 self.calls += [
1086 # Auto-rebase loop start.
1087 ((['git', 'retry', 'fetch', 'origin',
1088 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1089 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1090 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1091 # different in each loop iteration for truly realistic test.
1092 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1093 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1094 callError(1, 'failed to cherry pick') if fail_cherry_pick
1095 else ''),
1096 ]
1097 if fail_cherry_pick:
1098 return
1099
1100 if git_numberer_enabled:
1101 assert parent_msg
1102 self.calls += [
1103 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1104 parent_msg),
1105 ]
1106 if fail_after_parent_msg:
1107 return
1108 assert new_msg
1109 self.calls += [
1110 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1111 '1480022355'), # Committer's unix timestamp.
1112 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1113 '1480024000'),
1114 ((['git_amend_head committer timestamp', 1480024000],), ''),
1115 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1116 ]
1117 self.calls += [
1118 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1119 CERR1 if attempt < fail_push_count else ''),
1120 ]
1121 # End of autorebase + push.
1122
1123 self.calls += [
1124 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1125 ]
1126 if git_numberer_enabled:
1127 self.calls += [
1128 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1129 ]
1130
1131 # Cleanup calls.
1132 self.calls += [
1133 ((['git', 'checkout', '-q', 'feature'],), ''),
1134 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1135 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001136 ]
1137
1138 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001139 self._land_rietveld_calls(
1140 repo_url='https://chromium.googlesource.com/infra/infra',
1141 git_numberer_enabled=False,
1142 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001143 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001144 ((['git', 'config', 'rietveld.viewvc-url'],),
1145 'https://chromium.googlesource.com/infra/infra/+/'),
1146 ((['update_description', 123,
1147 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001148 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001149 ''),
1150 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001151 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001152 ]
1153 git_cl.main(['land'])
1154
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001155 def test_land_rietveld_fail_cherry_pick(self):
1156 self._land_rietveld_calls(
1157 repo_url='https://chromium.googlesource.com/infra/infra',
1158 git_numberer_enabled=False,
1159 fail_cherry_pick=True,
1160 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001161 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001162 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1163 'U path/file1\n'
1164 'U file2.cpp\n'),
1165 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001166 ((['git', 'checkout', '-q', 'feature'],), ''),
1167 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001168 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1169 ]
1170 git_cl.main(['land'])
1171
1172 def test_land_rietveld_git_numberer_fail_1_push(self):
1173 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1174
1175 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1176 self._land_rietveld_calls(
1177 repo_url='https://chromium.googlesource.com/chromium/src',
1178 git_numberer_enabled=True,
1179 parent_msg=('This is parent commit.\n'
1180 '\n'
1181 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1182 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1183 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1184 '\n'
1185 'Review-Url: https://codereview.chromium.org/123 .\n'
1186 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1187 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1188 fail_push_count=fail_push_count,
1189 debug=False)
1190
1191 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001192 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001193 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001194 ((['update_description', 123,
1195 'Issue: 123\n\nR=john@chromium.org\n'
1196 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001197 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001198 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1199 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1200 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001201 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001202 ''),
1203 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001204 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001205 ]
1206 git_cl.main(['land'])
1207
1208 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001209 self._land_rietveld_calls(
1210 repo_url='https://chromium.googlesource.com/v8/v8',
1211 git_numberer_enabled=True,
1212 parent_msg='This is parent commit with no footer.',
1213 fail_after_parent_msg=True,
1214 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001215 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001216 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001217 ((['git', 'checkout', '-q', 'feature'],), ''),
1218 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001219 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001220 ]
1221 with self.assertRaises(ValueError) as cm:
1222 git_cl.main(['land'])
1223 self.assertEqual(cm.exception.message,
1224 'Unable to infer commit position from footers')
1225
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001226 def test_git_numberer_not_whitelisted_repo(self):
1227 self.calls = []
1228 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001229 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1230 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001231 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001232
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001233 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001234 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1235 self.calls = [
1236 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001237 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001238 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001239 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001240 remote_url='https://chromium.googlesource.com/chromium/src',
1241 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001242 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001243
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001244 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001245 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001246 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001247 def fake_temporary_directory(**kwargs):
1248 yield tempdir
1249 self.mock(git_cl.gclient_utils, 'temporary_directory',
1250 fake_temporary_directory)
1251 self._test_GitNumbererState_valid_configs_inner(tempdir)
1252
1253 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001254 self.calls = [
1255 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001256 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001257 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1258 '''
1259 [plugin "git-numberer"]
1260 validate-enabled-refglob = refs/else/*
1261 validate-enabled-refglob = refs/heads/*
1262 validate-disabled-refglob = refs/heads/disabled
1263 validate-disabled-refglob = refs/branch-heads/*
1264 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001265 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1266 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001267 'refs/else/*\n'
1268 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001269 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1270 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001271 'refs/heads/disabled\n'
1272 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001273 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001274
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001275 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001276 remote_url='https://chromium.googlesource.com/chromium/src',
1277 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001278 self.assertEqual(res, True)
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/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001283 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001284
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001285 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001286 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001287 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001288 remote_url='https://chromium.googlesource.com/chromium/src',
1289 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001290 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001291
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001292 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001293 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001294 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001295 if skip_auth_check:
1296 return [((cmd, ), 'true')]
1297
tandrii5d48c322016-08-18 16:19:37 -07001298 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001299 if issue:
1300 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001301 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001302 ])
1303 calls.extend([
1304 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1305 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1306 ((['git', 'config', 'remote.origin.url'],),
1307 'https://chromium.googlesource.com/my/repo'),
1308 ((['git', 'config', 'remote.origin.url'],),
1309 'https://chromium.googlesource.com/my/repo'),
1310 ])
1311 return calls
1312
1313 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001314 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001315 fetched_status=None, other_cl_owner=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001316 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001317 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001318 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001319 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001320 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001321 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1322 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001323 ]
1324 calls += cls._is_gerrit_calls(True)
1325 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001326 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001327 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1328 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001329 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001330 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001331 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001332 ((['get_or_create_merge_base', 'master',
1333 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001334 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001335 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001336 ]
1337 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1338
1339 if issue:
1340 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001341 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001342 '123456',
1343 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001344 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001345 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001346 'change_id': '123456789',
1347 'current_revision': 'sha1_of_current_revision',
1348 'revisions': { 'sha1_of_current_revision': {
1349 'commit': {'message': fetched_description},
1350 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001351 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001352 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001353 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001354 if fetched_status == 'ABANDONED':
1355 calls += [
1356 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1357 '123456 has been abandoned, new uploads are not '
1358 'allowed'), SystemExitMock()),
1359 ]
1360 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001361 if other_cl_owner:
1362 calls += [
1363 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1364 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001365
1366 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1367 get_remote_branch=False)
1368 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001369 ((['git', 'rev-parse', '--show-cdup'],), ''),
1370 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001371
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001372 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001373 'diff', '--name-status', '--no-renames', '-r',
1374 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001375 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001376 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001377 ]
1378
1379 if not issue:
1380 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001381 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001382 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001383 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001384 ]
1385
1386 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001387 ((['git', 'config', 'user.email'],), 'me@example.com'),
1388 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001389 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1390 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001391 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001392 ]
1393 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001394
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001395 @classmethod
1396 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001397 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001398 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001399 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001400 post_amend_description=None, issue=None, cc=None,
1401 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001402 if post_amend_description is None:
1403 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001404 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001405 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001406
tandriia60502f2016-06-20 02:01:53 -07001407 if squash_mode == 'default':
1408 calls.extend([
1409 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1410 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1411 ])
1412 elif squash_mode in ('override_squash', 'override_nosquash'):
1413 calls.extend([
1414 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1415 'true' if squash_mode == 'override_squash' else 'false'),
1416 ])
1417 else:
1418 assert squash_mode in ('squash', 'nosquash')
1419
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001420 # If issue is given, then description is fetched from Gerrit instead.
1421 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001422 calls += [
1423 ((['git', 'log', '--pretty=format:%s\n\n%b',
1424 'fake_ancestor_sha..HEAD'],),
1425 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001426 if squash:
1427 title = 'Initial_upload'
1428 else:
1429 if not title:
1430 calls += [
1431 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001432 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001433 ]
1434 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001435 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001436 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001437 # DownloadGerritHook(False)
1438 ((False, ),
1439 ''),
1440 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001441 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001442 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001443 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001444 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001445 ''),
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'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001448 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001449 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001450 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001451 if not issue:
1452 # Prompting to edit description on first upload.
1453 calls += [
1454 ((['git', 'config', 'core.editor'],), ''),
1455 ((['RunEditor'],), description),
1456 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001457 ref_to_push = 'abcdef0123456789'
1458 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001459 ((['git', 'config', 'branch.master.merge'],),
1460 'refs/heads/master'),
1461 ((['git', 'config', 'branch.master.remote'],),
1462 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001463 ((['get_or_create_merge_base', 'master',
1464 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001465 'origin/master'),
1466 ((['git', 'rev-parse', 'HEAD:'],),
1467 '0123456789abcdef'),
1468 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001469 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001470 ref_to_push),
1471 ]
1472 else:
1473 ref_to_push = 'HEAD'
1474
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001475 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001476 ((['git', 'rev-list',
1477 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001478 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001479
Aaron Gable9b713dd2016-12-14 16:04:21 -08001480 if title:
1481 if ref_suffix:
1482 ref_suffix += ',m=' + title
1483 else:
1484 ref_suffix = '%m=' + title
1485
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001486 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1487 if ref_suffix:
1488 ref_suffix += ',' + notify_suffix
1489 else:
1490 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001491
ukai@chromium.orge8077812012-02-03 03:41:46 +00001492 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001493 ref_suffix += ',' + ','.join('r=%s' % email
1494 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001495
1496 if git_mirror is None:
1497 calls += [
1498 ((['git', 'config', 'remote.origin.url'],),
1499 'https://chromium.googlesource.com/yyy/zzz'),
1500 ]
1501 else:
1502 calls += [
1503 ((['git', 'config', 'remote.origin.url'],),
1504 '/cache/this-dir-exists'),
1505 (('os.path.isdir', '/cache/this-dir-exists'),
1506 True),
1507 # Runs in /cache/this-dir-exists.
1508 ((['git', 'config', 'remote.origin.url'],),
1509 'https://chromium.googlesource.com/yyy/zzz'),
1510 ]
1511
ukai@chromium.orge8077812012-02-03 03:41:46 +00001512 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001513 ((['git', 'push',
1514 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001515 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001516 ('remote:\n'
1517 'remote: Processing changes: (\)\n'
1518 'remote: Processing changes: (|)\n'
1519 'remote: Processing changes: (/)\n'
1520 'remote: Processing changes: (-)\n'
1521 'remote: Processing changes: new: 1 (/)\n'
1522 'remote: Processing changes: new: 1, done\n'
1523 'remote:\n'
1524 'remote: New Changes:\n'
1525 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1526 'remote:\n'
1527 'To https://chromium.googlesource.com/yyy/zzz\n'
1528 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001529 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001530 if squash:
1531 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001532 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001533 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001534 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001535 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001536 ((['git', 'config', 'branch.master.gerritsquashhash',
1537 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001538 ]
tandrii88189772016-09-29 04:29:57 -07001539 calls += [
1540 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001541 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001542 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001543 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001544 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001545 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001546 return calls
1547
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001548 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001549 self,
1550 upload_args,
1551 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001552 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001553 squash=True,
1554 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001555 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001556 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001557 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001558 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001559 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001560 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001561 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001562 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001563 fetched_status=None,
1564 other_cl_owner=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001565 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001566 if squash_mode is None:
1567 if '--no-squash' in upload_args:
1568 squash_mode = 'nosquash'
1569 elif '--squash' in upload_args:
1570 squash_mode = 'squash'
1571 else:
1572 squash_mode = 'default'
1573
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001574 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001575 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001576 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001577 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001578 CookiesAuthenticatorMockFactory(
1579 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001580 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1581 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001582 self.mock(git_cl.gclient_utils, 'RunEditor',
1583 lambda *_, **__: self._mocked_call(['RunEditor']))
1584 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1585
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001586 original_os_path_isdir = os.path.isdir
1587 def selective_os_path_isdir_mock(path):
1588 if path == '/cache/this-dir-exists':
1589 return self._mocked_call('os.path.isdir', path)
1590 return original_os_path_isdir(path)
1591 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1592
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001593 self.calls = self._gerrit_base_calls(
1594 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001595 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001596 fetched_status=fetched_status,
1597 other_cl_owner=other_cl_owner)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001598 if fetched_status != 'ABANDONED':
1599 self.calls += self._gerrit_upload_calls(
1600 description, reviewers, squash,
1601 squash_mode=squash_mode,
1602 expected_upstream_ref=expected_upstream_ref,
1603 ref_suffix=ref_suffix, title=title, notify=notify,
1604 post_amend_description=post_amend_description,
1605 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001606 # Uncomment when debugging.
1607 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001608 git_cl.main(['upload'] + upload_args)
1609
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001610 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001611 self._run_gerrit_upload_test(
1612 ['--no-squash'],
1613 'desc\n\nBUG=\n',
1614 [],
1615 squash=False,
1616 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1617
1618 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001619 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001620 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001621 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001622 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001623 [],
tandriia60502f2016-06-20 02:01:53 -07001624 squash=False,
1625 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001626 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001627
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001628 def test_gerrit_no_reviewer(self):
1629 self._run_gerrit_upload_test(
1630 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001631 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001632 [],
1633 squash=False,
1634 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001635
tandriieefe8322016-08-17 10:12:24 -07001636 def test_gerrit_patch_bad_chars(self):
1637 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001638 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001639 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001640 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001641 squash=False,
1642 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001643 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001644 self.assertIn(
1645 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001646 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1647 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001648 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001649
ukai@chromium.orge8077812012-02-03 03:41:46 +00001650 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001651 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001652 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001653 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001654 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001655 squash=False,
1656 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001657 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001658
1659 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001660 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001661 [],
bradnelsond975b302016-10-23 12:20:23 -07001662 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1663 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001664 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001665 ['reviewer@example.com', 'another@example.com'],
1666 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001667 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001668 ref_suffix='%l=Code-Review+1',
1669 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001670
1671 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001672 self._run_gerrit_upload_test(
1673 [],
1674 'desc\nBUG=\n\nChange-Id: 123456789',
1675 [],
1676 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001677
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001678 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001679 self._run_gerrit_upload_test(
1680 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001681 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001682 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001683 squash=True,
1684 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001685
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001686 def test_gerrit_upload_squash_first_with_mirror(self):
1687 self._run_gerrit_upload_test(
1688 ['--squash'],
1689 'desc\nBUG=\n\nChange-Id: 123456789',
1690 [],
1691 squash=True,
1692 expected_upstream_ref='origin/master',
1693 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1694
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001695 def test_gerrit_upload_squash_reupload(self):
1696 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001697 self._run_gerrit_upload_test(
1698 ['--squash'],
1699 description,
1700 [],
1701 squash=True,
1702 expected_upstream_ref='origin/master',
1703 issue=123456)
1704
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001705 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1706 self.mock(git_cl, 'DieWithError',
1707 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1708 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1709 with self.assertRaises(SystemExitMock):
1710 self._run_gerrit_upload_test(
1711 ['--squash'],
1712 description,
1713 [],
1714 squash=True,
1715 expected_upstream_ref='origin/master',
1716 issue=123456,
1717 fetched_status='ABANDONED')
1718
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001719 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1720 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1721 lambda *_, **__: {'email': 'yet-another@example.com'})
1722 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1723 self._run_gerrit_upload_test(
1724 ['--squash'],
1725 description,
1726 [],
1727 squash=True,
1728 expected_upstream_ref='origin/master',
1729 issue=123456,
1730 other_cl_owner='other@example.com')
1731 self.assertIn(
1732 'WARNING: change 123456 is owned by other@example.com, but you '
1733 'authenticate to Gerrit as yet-another@example.com.\n'
1734 'Uploading may fail due to lack of permissions',
1735 git_cl.sys.stdout.getvalue())
1736
rmistry@google.com2dd99862015-06-22 12:22:18 +00001737 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001738 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001739 def mock_run_git(*args, **_kwargs):
1740 if args[0] == ['for-each-ref',
1741 '--format=%(refname:short) %(upstream:short)',
1742 'refs/heads']:
1743 # Create a local branch dependency tree that looks like this:
1744 # test1 -> test2 -> test3 -> test4 -> test5
1745 # -> test3.1
1746 # test6 -> test0
1747 branch_deps = [
1748 'test2 test1', # test1 -> test2
1749 'test3 test2', # test2 -> test3
1750 'test3.1 test2', # test2 -> test3.1
1751 'test4 test3', # test3 -> test4
1752 'test5 test4', # test4 -> test5
1753 'test6 test0', # test0 -> test6
1754 'test7', # test7
1755 ]
1756 return '\n'.join(branch_deps)
1757 self.mock(git_cl, 'RunGit', mock_run_git)
1758
1759 class RecordCalls:
1760 times_called = 0
1761 record_calls = RecordCalls()
1762 def mock_CMDupload(*args, **_kwargs):
1763 record_calls.times_called += 1
1764 return 0
1765 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1766
1767 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001768 (('ask_for_data', 'This command will checkout all dependent branches '
1769 'and run "git cl upload". Press Enter to continue, '
1770 'or Ctrl+C to abort'), ''),
1771 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001772
1773 class MockChangelist():
1774 def __init__(self):
1775 pass
1776 def GetBranch(self):
1777 return 'test1'
1778 def GetIssue(self):
1779 return '123'
1780 def GetPatchset(self):
1781 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001782 def IsGerrit(self):
1783 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001784
1785 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1786 # CMDupload should have been called 5 times because of 5 dependent branches.
1787 self.assertEquals(5, record_calls.times_called)
1788 self.assertEquals(0, ret)
1789
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001790 def test_gerrit_change_id(self):
1791 self.calls = [
1792 ((['git', 'write-tree'], ),
1793 'hashtree'),
1794 ((['git', 'rev-parse', 'HEAD~0'], ),
1795 'branch-parent'),
1796 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1797 'A B <a@b.org> 1456848326 +0100'),
1798 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1799 'C D <c@d.org> 1456858326 +0100'),
1800 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1801 'hashchange'),
1802 ]
1803 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1804 self.assertEqual(change_id, 'Ihashchange')
1805
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001806 def test_desecription_append_footer(self):
1807 for init_desc, footer_line, expected_desc in [
1808 # Use unique desc first lines for easy test failure identification.
1809 ('foo', 'R=one', 'foo\n\nR=one'),
1810 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1811 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1812 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1813 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1814 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1815 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1816 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1817 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1818 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1819 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1820 ]:
1821 desc = git_cl.ChangeDescription(init_desc)
1822 desc.append_footer(footer_line)
1823 self.assertEqual(desc.description, expected_desc)
1824
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001825 def test_update_reviewers(self):
1826 data = [
1827 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001828 ('foo\nR=xx', [], 'foo\nR=xx'),
1829 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001830 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001831 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1832 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1833 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001834 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001835 ('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 +00001836 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001837 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1838 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1839 # Same as the line before, but full of whitespaces.
1840 (
1841 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1842 'foo\nBar\n\nR=c@c\n BUG =',
1843 ),
1844 # Whitespaces aren't interpreted as new lines.
1845 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001846 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001847 expected = [i[2] for i in data]
1848 actual = []
1849 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001850 obj = git_cl.ChangeDescription(orig)
1851 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001852 actual.append(obj.description)
1853 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001854
wittman@chromium.org455dc922015-01-26 20:15:50 +00001855 def test_get_target_ref(self):
1856 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001857 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001858 self.assertEqual(None, git_cl.GetTargetRef(None,
1859 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001860 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001861
wittman@chromium.org455dc922015-01-26 20:15:50 +00001862 # Check default target refs for branches.
1863 self.assertEqual('refs/heads/master',
1864 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001865 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001866 self.assertEqual('refs/heads/master',
1867 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001868 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001869 self.assertEqual('refs/heads/master',
1870 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001871 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001872 self.assertEqual('refs/branch-heads/123',
1873 git_cl.GetTargetRef('origin',
1874 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001875 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001876 self.assertEqual('refs/diff/test',
1877 git_cl.GetTargetRef('origin',
1878 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001879 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001880 self.assertEqual('refs/heads/chrome/m42',
1881 git_cl.GetTargetRef('origin',
1882 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001883 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001884
1885 # Check target refs for user-specified target branch.
1886 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1887 'refs/remotes/branch-heads/123'):
1888 self.assertEqual('refs/branch-heads/123',
1889 git_cl.GetTargetRef('origin',
1890 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001891 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001892 for branch in ('origin/master', 'remotes/origin/master',
1893 'refs/remotes/origin/master'):
1894 self.assertEqual('refs/heads/master',
1895 git_cl.GetTargetRef('origin',
1896 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001897 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001898 for branch in ('master', 'heads/master', 'refs/heads/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
wychen@chromium.orga872e752015-04-28 23:42:18 +00001904 def test_patch_when_dirty(self):
1905 # Patch when local tree is dirty
1906 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1907 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1908
1909 def test_diff_when_dirty(self):
1910 # Do 'git cl diff' when local tree is dirty
1911 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1912 self.assertNotEqual(git_cl.main(['diff']), 0)
1913
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001914 @staticmethod
1915 def _get_gerrit_codereview_server_calls(branch, value=None,
1916 git_short_host='host',
1917 detect_branch=True):
1918 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1919
1920 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1921 """
1922 calls = []
1923 if detect_branch:
1924 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1925 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1926 CERR1 if value is None else value))
1927 if value is None:
1928 calls += [
1929 ((['git', 'config', 'branch.' + branch + '.merge'],),
1930 'refs/heads' + branch),
1931 ((['git', 'config', 'branch.' + branch + '.remote'],),
1932 'origin'),
1933 ((['git', 'config', 'remote.origin.url'],),
1934 'https://%s.googlesource.com/my/repo' % git_short_host),
1935 ]
1936 return calls
1937
tandriidf09a462016-08-18 16:23:55 -07001938 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001939 new_branch=False, git_short_host='host',
1940 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001941 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001942 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1943 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001944 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001945 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001946 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1947
tandriidf09a462016-08-18 16:23:55 -07001948 if new_branch:
1949 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1950 else:
1951 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001952
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001953 if not force_codereview:
1954 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001955 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001956 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001957 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1958 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001959 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001960 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001961
1962 if is_gerrit:
1963 if not force_codereview:
1964 self.calls += [
1965 ((['git', 'config', 'gerrit.host'],), 'true'),
1966 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001967 if detect_gerrit_server:
1968 self.calls += self._get_gerrit_codereview_server_calls(
1969 'master', git_short_host=git_short_host,
1970 detect_branch=not new_branch and force_codereview)
1971
1972 self.calls += [
1973 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001974 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001975 {
1976 'current_revision': '7777777777',
1977 'revisions': {
1978 '1111111111': {
1979 '_number': 1,
1980 'fetch': {'http': {
1981 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1982 'ref': 'refs/changes/56/123456/1',
1983 }},
1984 },
1985 '7777777777': {
1986 '_number': 7,
1987 'fetch': {'http': {
1988 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1989 'ref': 'refs/changes/56/123456/7',
1990 }},
1991 },
1992 },
1993 }),
1994 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001995 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001996 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001997 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001998 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001999 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002000 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002002
tandriidf09a462016-08-18 16:23:55 -07002003 def _common_patch_successful(self, new_branch=False):
2004 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002005 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002006 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002007 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002008 ((['git', 'config', 'branch.master.rietveldserver',
2009 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002010 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002011 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002012 ((['git', 'commit', '-m',
2013 'Description\n\n' +
2014 'patch from issue 123456 at patchset 60001 ' +
2015 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002016 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002017
2018 def test_patch_successful(self):
2019 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00002020 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2021
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002022 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07002023 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002024 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2025
wychen@chromium.orga872e752015-04-28 23:42:18 +00002026 def test_patch_conflict(self):
2027 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07002028 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002029 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002030
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002031 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002032 self._patch_common(is_gerrit=True, git_short_host='chromium',
2033 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002034 self.calls += [
2035 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2036 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002037 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002038 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002039 ((['git', 'config', 'branch.master.gerritserver',
2040 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002041 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002042 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002043 ]
2044 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2045
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002046 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002047 self._patch_common(is_gerrit=True, force_codereview=True,
2048 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002049 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002050 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002051 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002052 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002053 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002054 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002055 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002056 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002057 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002058 ]
2059 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2060
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002061 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002062 self._patch_common(is_gerrit=True, git_short_host='else',
2063 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002064 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002065 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002066 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002067 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002068 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002069 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002070 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002071 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002072 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002073 ]
2074 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002075 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002076
2077 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002078 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
2079 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002080 self.calls += [
2081 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2082 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002083 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2084 ''),
2085 ((['git', 'config', 'branch.master.gerritserver',
2086 'https://chromium-review.googlesource.com'],), ''),
2087 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002088 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2089 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2090 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002091 ]
2092 with self.assertRaises(SystemExitMock):
2093 git_cl.main(['patch',
2094 'https://chromium-review.googlesource.com/#/c/123456/1'])
2095
tandriic2405f52016-10-10 08:13:15 -07002096 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002097 def notExists(_issue, *_, **kwargs):
2098 self.assertFalse(kwargs['ignore_404'])
2099 raise git_cl.gerrit_util.GerritError(404, '')
2100 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2101
tandriic2405f52016-10-10 08:13:15 -07002102 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07002103 self.calls = [
2104 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2105 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2106 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2107 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2108 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2109 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08002110 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07002111 'or you have no access to it'],), SystemExitMock()),
2112 ]
2113 with self.assertRaises(SystemExitMock):
2114 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
2115
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002116 def _checkout_calls(self):
2117 return [
2118 ((['git', 'config', '--local', '--get-regexp',
2119 'branch\\..*\\.rietveldissue'], ),
2120 ('branch.retrying.rietveldissue 1111111111\n'
2121 'branch.some-fix.rietveldissue 2222222222\n')),
2122 ((['git', 'config', '--local', '--get-regexp',
2123 'branch\\..*\\.gerritissue'], ),
2124 ('branch.ger-branch.gerritissue 123456\n'
2125 'branch.gbranch654.gerritissue 654321\n')),
2126 ]
2127
2128 def test_checkout_gerrit(self):
2129 """Tests git cl checkout <issue>."""
2130 self.calls = self._checkout_calls()
2131 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2132 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2133
2134 def test_checkout_rietveld(self):
2135 """Tests git cl checkout <issue>."""
2136 self.calls = self._checkout_calls()
2137 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2138 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2139
2140 def test_checkout_not_found(self):
2141 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002142 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002143 self.calls = self._checkout_calls()
2144 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2145
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002146 def test_checkout_no_branch_issues(self):
2147 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002148 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002149 self.calls = [
2150 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002151 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002152 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002153 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002154 ]
2155 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2156
tandrii@chromium.org28253532016-04-14 13:46:56 +00002157 def _test_gerrit_ensure_authenticated_common(self, auth,
2158 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002159 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2160 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2161 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002162 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002163 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002164 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002165 cl.branch = 'master'
2166 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002167 cl.lookedup_issue = True
2168 return cl
2169
2170 def test_gerrit_ensure_authenticated_missing(self):
2171 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002172 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002173 })
2174 self.calls.append(
2175 ((['DieWithError',
2176 'Credentials for the following hosts are required:\n'
2177 ' chromium-review.googlesource.com\n'
2178 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002179 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002180 'https://chromium-review.googlesource.com/new-password'],), ''),)
2181 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2182
2183 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002184 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002185 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002186 'chromium.googlesource.com':
2187 ('git-one.example.com', None, 'secret1'),
2188 'chromium-review.googlesource.com':
2189 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002190 })
2191 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002192 (('ask_for_data', 'If you know what you are doing '
2193 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002194 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2195
2196 def test_gerrit_ensure_authenticated_ok(self):
2197 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002198 'chromium.googlesource.com':
2199 ('git-same.example.com', None, 'secret'),
2200 'chromium-review.googlesource.com':
2201 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002202 })
2203 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2204
tandrii@chromium.org28253532016-04-14 13:46:56 +00002205 def test_gerrit_ensure_authenticated_skipped(self):
2206 cl = self._test_gerrit_ensure_authenticated_common(
2207 auth={}, skip_auth_check=True)
2208 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2209
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002210 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002211 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2212 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002213 self.calls = [
2214 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002215 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002216 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2217 ((['git', 'config', 'rietveld.server'],), ''),
2218 ((['git', 'config', 'rietveld.server'],), ''),
2219 ((['git', 'config', 'branch.feature.rietveldserver'],),
2220 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002221 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002222 ]
2223 self.assertEqual(0, git_cl.main(['set-commit']))
2224
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002225 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002226 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002227 lambda h, i, labels, notify=None:
2228 self._mocked_call(['SetReview', h, i, labels, notify]))
2229
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002230 self.calls = [
2231 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002232 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2233 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002234 ((['git', 'config', 'branch.feature.gerritserver'],),
2235 'https://chromium-review.googlesource.com'),
2236 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002237 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002238 ]
tandriid9e5ce52016-07-13 02:32:59 -07002239
2240 def test_cmd_set_commit_gerrit_clear(self):
2241 self._cmd_set_commit_gerrit_common(0)
2242 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2243
2244 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002245 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002246 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2247
tandriid9e5ce52016-07-13 02:32:59 -07002248 def test_cmd_set_commit_gerrit(self):
2249 self._cmd_set_commit_gerrit_common(2)
2250 self.assertEqual(0, git_cl.main(['set-commit']))
2251
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002252 def test_description_display(self):
2253 out = StringIO.StringIO()
2254 self.mock(git_cl.sys, 'stdout', out)
2255
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002256 self.mock(git_cl, 'Changelist', ChangelistMock)
2257 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002258
2259 self.assertEqual(0, git_cl.main(['description', '-d']))
2260 self.assertEqual('foo\n', out.getvalue())
2261
2262 def test_description_rietveld(self):
2263 out = StringIO.StringIO()
2264 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002265 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002266
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002267 self.assertEqual(0, git_cl.main([
2268 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2269 self.assertEqual('foobar\n', out.getvalue())
2270
iannucci3c972b92016-08-17 13:24:10 -07002271 def test_StatusFieldOverrideIssueMissingArgs(self):
2272 out = StringIO.StringIO()
2273 self.mock(git_cl.sys, 'stderr', out)
2274
2275 try:
2276 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2277 except SystemExit as ex:
2278 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002279 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002280
2281 out = StringIO.StringIO()
2282 self.mock(git_cl.sys, 'stderr', out)
2283
2284 try:
2285 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2286 except SystemExit as ex:
2287 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002288 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002289
2290 def test_StatusFieldOverrideIssue(self):
2291 out = StringIO.StringIO()
2292 self.mock(git_cl.sys, 'stdout', out)
2293
2294 def assertIssue(cl_self, *_args):
2295 self.assertEquals(cl_self.issue, 1)
2296 return 'foobar'
2297
2298 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2299 self.calls = [
2300 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2301 ((['git', 'config', 'rietveld.server'],), ''),
2302 ((['git', 'config', 'rietveld.server'],), ''),
2303 ]
iannuccie53c9352016-08-17 14:40:40 -07002304 self.assertEqual(
2305 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2306 0)
iannucci3c972b92016-08-17 13:24:10 -07002307 self.assertEqual(out.getvalue(), 'foobar\n')
2308
iannuccie53c9352016-08-17 14:40:40 -07002309 def test_SetCloseOverrideIssue(self):
2310 def assertIssue(cl_self, *_args):
2311 self.assertEquals(cl_self.issue, 1)
2312 return 'foobar'
2313
2314 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2315 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2316 self.calls = [
2317 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2318 ((['git', 'config', 'rietveld.server'],), ''),
2319 ((['git', 'config', 'rietveld.server'],), ''),
2320 ]
2321 self.assertEqual(
2322 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2323
2324 def test_SetCommitOverrideIssue(self):
2325 def assertIssue(cl_self, *_args):
2326 self.assertEquals(cl_self.issue, 1)
2327 return 'foobar'
2328
2329 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2330 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2331 self.calls = [
2332 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2333 ((['git', 'config', 'rietveld.server'],), ''),
2334 ((['git', 'config', 'rietveld.server'],), ''),
2335 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2336 ((['git', 'config', 'rietveld.server'],), ''),
2337 ((['git', 'config', 'rietveld.server'],), ''),
2338 ]
2339 self.assertEqual(
2340 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2341
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002342 def test_description_gerrit(self):
2343 out = StringIO.StringIO()
2344 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002345 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002346 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002347 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2348 {
2349 'current_revision': 'sha1',
2350 'revisions': {'sha1': {
2351 'commit': {'message': 'foobar'},
2352 }},
2353 }),
2354 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002355 self.assertEqual(0, git_cl.main([
2356 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2357 self.assertEqual('foobar\n', out.getvalue())
2358
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002359 def test_description_set_raw(self):
2360 out = StringIO.StringIO()
2361 self.mock(git_cl.sys, 'stdout', out)
2362
2363 self.mock(git_cl, 'Changelist', ChangelistMock)
2364 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2365
2366 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2367 self.assertEqual('hihi', ChangelistMock.desc)
2368
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002369 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002370 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002371
2372 def RunEditor(desc, _, **kwargs):
2373 self.assertEquals(
2374 '# Enter a description of the change.\n'
2375 '# This will be displayed on the codereview site.\n'
2376 '# The first line will also be used as the subject of the review.\n'
2377 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002378 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002379 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002380 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002381 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002382 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002383
dsansomee2d6fd92016-09-08 00:10:47 -07002384 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002385 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002386
2387 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2388 self.mock(git_cl.Changelist, 'GetDescription',
2389 lambda *args: current_desc)
2390 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2391 UpdateDescriptionRemote)
2392 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2393
2394 self.calls = [
2395 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002396 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002397 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2398 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002399 ((['git', 'config', 'core.editor'],), 'vi'),
2400 ]
2401 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2402
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002403 def test_description_set_stdin(self):
2404 out = StringIO.StringIO()
2405 self.mock(git_cl.sys, 'stdout', out)
2406
2407 self.mock(git_cl, 'Changelist', ChangelistMock)
2408 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2409
2410 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2411 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2412
kmarshall3bff56b2016-06-06 18:31:47 -07002413 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002414 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2415
kmarshall3bff56b2016-06-06 18:31:47 -07002416 self.calls = \
2417 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2418 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002419 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002420 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2421 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002422 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2423 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2424 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002425 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2426 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2427 ((['git', 'branch', '-D', 'foo'],), '')]
2428
kmarshall3bff56b2016-06-06 18:31:47 -07002429 self.mock(git_cl, 'get_cl_statuses',
2430 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002431 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2432 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2433 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002434
2435 self.assertEqual(0, git_cl.main(['archive', '-f']))
2436
2437 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002438 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002439 self.calls = \
2440 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2441 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002442 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002443 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2444 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002445 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2446
kmarshall9249e012016-08-23 12:02:16 -07002447 self.mock(git_cl, 'get_cl_statuses',
2448 lambda branches, fine_grained, max_processes:
2449 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2450
2451 self.assertEqual(1, git_cl.main(['archive', '-f']))
2452
2453 def test_archive_dry_run(self):
2454 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2455
2456 self.calls = \
2457 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2458 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2459 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2460 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2461 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2462 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2463 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2464 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2465 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002466
2467 self.mock(git_cl, 'get_cl_statuses',
2468 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002469 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2470 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2471 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002472
kmarshall9249e012016-08-23 12:02:16 -07002473 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2474
2475 def test_archive_no_tags(self):
2476 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2477
2478 self.calls = \
2479 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2480 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2481 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2482 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2483 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2484 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2485 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2486 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2487 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2488 ((['git', 'branch', '-D', 'foo'],), '')]
2489
2490 self.mock(git_cl, 'get_cl_statuses',
2491 lambda branches, fine_grained, max_processes:
2492 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2493 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2494 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2495
2496 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002497
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002498 def test_cmd_issue_erase_existing(self):
2499 out = StringIO.StringIO()
2500 self.mock(git_cl.sys, 'stdout', out)
2501 self.calls = [
2502 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002503 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2504 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002505 # Let this command raise exception (retcode=1) - it should be ignored.
2506 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002507 CERR1),
2508 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2509 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002510 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2511 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2512 ''),
2513 ]
2514 self.assertEqual(0, git_cl.main(['issue', '0']))
2515
phajdan.jre328cf92016-08-22 04:12:17 -07002516 def test_cmd_issue_json(self):
2517 out = StringIO.StringIO()
2518 self.mock(git_cl.sys, 'stdout', out)
2519 self.calls = [
2520 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002521 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002522 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2523 ((['git', 'config', 'rietveld.server'],),
2524 'https://codereview.chromium.org'),
2525 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2526 (('write_json', 'output.json',
2527 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2528 ''),
2529 ]
2530 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2531
tandriide281ae2016-10-12 06:02:30 -07002532 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002533 self.mock(git_cl.Changelist, 'GetChange',
2534 lambda _, *a: (
2535 self._mocked_call(['GetChange']+list(a))))
2536 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2537 lambda *_, **__: (
2538 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002539 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2540 lambda _, s: self._mocked_call(['SetCQState', s]))
2541 self.calls = [
2542 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002543 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002544 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2545 ((['git', 'config', 'rietveld.server'],),
2546 'https://codereview.chromium.org'),
2547 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2548 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2549 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2550 ((['get_or_create_merge_base', 'feature', 'feature'],),
2551 'fake_ancestor_sha'),
2552 ((['GetChange', 'fake_ancestor_sha', None], ),
2553 git_cl.presubmit_support.GitChange(
2554 '', '', '', '', '', '', '', '')),
2555 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2556 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002557 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2558 ]
2559 out = StringIO.StringIO()
2560 self.mock(git_cl.sys, 'stdout', out)
2561 self.assertEqual(0, git_cl.main(['try']))
2562 self.assertEqual(
2563 out.getvalue(),
2564 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2565
tandrii8c5a3532016-11-04 07:52:02 -07002566 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2567 self.mock(git_cl.Changelist, 'GetChange',
2568 lambda _, *a: (
2569 self._mocked_call(['GetChange']+list(a))))
2570 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2571 lambda *_, **__: (
2572 self._mocked_call(['DoGetTryMasters'])))
2573 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2574 lambda _, s: self._mocked_call(['SetCQState', s]))
2575
tandrii8c5a3532016-11-04 07:52:02 -07002576 self.calls = [
2577 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2578 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2579 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2580 ((['git', 'config', 'branch.feature.gerritserver'],),
2581 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002582 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2583 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2584 'project': 'depot_tools',
2585 'status': 'OPEN',
2586 'owner': {'email': 'owner@e.mail'},
2587 'revisions': {
2588 'deadbeaf': {
2589 '_number': 6,
2590 },
2591 'beeeeeef': {
2592 '_number': 7,
2593 'fetch': {'http': {
2594 'url': 'https://chromium.googlesource.com/depot_tools',
2595 'ref': 'refs/changes/56/123456/7'
2596 }},
2597 },
2598 },
2599 }),
tandrii8c5a3532016-11-04 07:52:02 -07002600 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2601 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2602 ((['get_or_create_merge_base', 'feature', 'feature'],),
2603 'fake_ancestor_sha'),
2604 ((['GetChange', 'fake_ancestor_sha', None], ),
2605 git_cl.presubmit_support.GitChange(
2606 '', '', '', '', '', '', '', '')),
2607 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2608 ((['DoGetTryMasters'], ), None),
2609 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2610 ]
2611 out = StringIO.StringIO()
2612 self.mock(git_cl.sys, 'stdout', out)
2613 self.assertEqual(0, git_cl.main(['try']))
2614 self.assertEqual(
2615 out.getvalue(),
2616 'scheduled CQ Dry Run on '
2617 'https://chromium-review.googlesource.com/123456\n')
2618
2619 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2620 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2621 lambda _: {
2622 'owner_email': 'owner@e.mail',
2623 'private': False,
2624 'closed': False,
2625 'project': 'depot_tools',
2626 'patchsets': [20001],
2627 })
tandriide281ae2016-10-12 06:02:30 -07002628 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2629 self.calls = [
2630 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2631 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2632 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2633 ((['git', 'config', 'rietveld.server'],),
2634 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002635 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002636 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002637 ]
2638
2639 def _buildbucket_retry(*_, **kw):
2640 # self.maxDiff = 10000
2641 body = json.loads(kw['body'])
2642 self.assertEqual(len(body['builds']), 1)
2643 build = body['builds'][0]
2644 params = json.loads(build.pop('parameters_json'))
2645 self.assertEqual(params, {
2646 u'builder_name': u'win',
2647 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2648 u'revision': None}],
2649 u'properties': {
2650 u'category': u'git_cl_try',
2651 u'issue': 123,
2652 u'key': u'val',
2653 u'json': [{u'a': 1}, None],
2654 u'master': u'tryserver.chromium',
2655 u'patch_project': u'depot_tools',
2656 u'patch_storage': u'rietveld',
2657 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002658 u'rietveld': u'https://codereview.chromium.org',
2659 }
2660 })
2661 self.assertEqual(build, {
2662 u'bucket': u'master.tryserver.chromium',
2663 u'client_operation_id': u'uuid4',
2664 u'tags': [u'builder:win',
2665 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002666 u'user_agent:git_cl_try',
2667 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002668 })
2669
2670 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2671
2672 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2673 self.assertEqual(0, git_cl.main([
2674 'try', '-m', 'tryserver.chromium', '-b', 'win',
2675 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2676 self.assertRegexpMatches(
2677 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002678 'Tried jobs on:\nBucket: master.tryserver.chromium')
2679
tandrii8c5a3532016-11-04 07:52:02 -07002680 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2681 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2682 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2683
tandrii8c5a3532016-11-04 07:52:02 -07002684 self.calls = [
2685 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2686 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2687 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2688 ((['git', 'config', 'branch.feature.gerritserver'],),
2689 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002690 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002691 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002692 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002693 'status': 'OPEN',
2694 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002695 'revisions': {
2696 'deadbeaf': {
2697 '_number': 6,
2698 },
2699 'beeeeeef': {
2700 '_number': 7,
2701 'fetch': {'http': {
2702 'url': 'https://chromium.googlesource.com/depot_tools',
2703 'ref': 'refs/changes/56/123456/7'
2704 }},
2705 },
2706 },
2707 }),
2708 ]
2709
2710 def _buildbucket_retry(*_, **kw):
2711 # self.maxDiff = 10000
2712 body = json.loads(kw['body'])
2713 self.assertEqual(len(body['builds']), 1)
2714 build = body['builds'][0]
2715 params = json.loads(build.pop('parameters_json'))
2716 self.assertEqual(params, {
2717 u'builder_name': u'win',
2718 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2719 u'revision': None}],
2720 u'properties': {
2721 u'category': u'git_cl_try',
2722 u'key': u'val',
2723 u'json': [{u'a': 1}, None],
2724 u'master': u'tryserver.chromium',
2725
2726 u'patch_gerrit_url':
2727 u'https://chromium-review.googlesource.com',
2728 u'patch_issue': 123456,
2729 u'patch_project': u'depot_tools',
2730 u'patch_ref': u'refs/changes/56/123456/7',
2731 u'patch_repository_url':
2732 u'https://chromium.googlesource.com/depot_tools',
2733 u'patch_set': 7,
2734 u'patch_storage': u'gerrit',
2735 }
2736 })
2737 self.assertEqual(build, {
2738 u'bucket': u'master.tryserver.chromium',
2739 u'client_operation_id': u'uuid4',
2740 u'tags': [
2741 u'builder:win',
2742 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2743 u'user_agent:git_cl_try',
2744 u'master:tryserver.chromium'],
2745 })
2746
2747 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2748
2749 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2750 self.assertEqual(0, git_cl.main([
2751 'try', '-m', 'tryserver.chromium', '-b', 'win',
2752 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2753 self.assertRegexpMatches(
2754 git_cl.sys.stdout.getvalue(),
2755 'Tried jobs on:\nBucket: master.tryserver.chromium')
2756
borenet6c0efe62016-10-19 08:13:29 -07002757 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002758 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2759 lambda _: {
2760 'owner_email': 'owner@e.mail',
2761 'private': False,
2762 'closed': False,
2763 'project': 'depot_tools',
2764 'patchsets': [20001],
2765 })
borenet6c0efe62016-10-19 08:13:29 -07002766 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2767 self.calls = [
2768 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2769 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2770 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2771 ((['git', 'config', 'rietveld.server'],),
2772 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002773 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002774 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002775 ]
2776
2777 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002778 body = json.loads(kw['body'])
2779 self.assertEqual(len(body['builds']), 1)
2780 build = body['builds'][0]
2781 params = json.loads(build.pop('parameters_json'))
2782 self.assertEqual(params, {
2783 u'builder_name': u'win',
2784 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2785 u'revision': None}],
2786 u'properties': {
2787 u'category': u'git_cl_try',
2788 u'issue': 123,
2789 u'patch_project': u'depot_tools',
2790 u'patch_storage': u'rietveld',
2791 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002792 u'rietveld': u'https://codereview.chromium.org',
2793 }
2794 })
2795 self.assertEqual(build, {
2796 u'bucket': u'test.bucket',
2797 u'client_operation_id': u'uuid4',
2798 u'tags': [u'builder:win',
2799 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2800 u'user_agent:git_cl_try'],
2801 })
2802
2803 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2804
2805 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2806 self.assertEqual(0, git_cl.main([
2807 'try', '-B', 'test.bucket', '-b', 'win']))
2808 self.assertRegexpMatches(
2809 git_cl.sys.stdout.getvalue(),
2810 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002811
qyearsley123a4682016-10-26 09:12:17 -07002812 def test_git_cl_try_bots_on_multiple_masters(self):
2813 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2814 self.calls = [
2815 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2816 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2817 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2818 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002819 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002820 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2821 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2822 ]
2823
2824 def _buildbucket_retry(*_, **kw):
2825 body = json.loads(kw['body'])
2826 self.assertEqual(len(body['builds']), 2)
2827
2828 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2829 self.assertEqual(first_build_params['builder_name'], 'builder1')
2830 self.assertEqual(first_build_params['properties']['master'], 'master1')
2831
2832 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2833 self.assertEqual(first_build_params['builder_name'], 'builder2')
2834 self.assertEqual(first_build_params['properties']['master'], 'master2')
2835
2836 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2837
2838 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2839 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2840
2841 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2842 self.assertEqual(
2843 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2844 self.assertEqual(
2845 git_cl.sys.stdout.getvalue(),
2846 'Tried jobs on:\n'
2847 'Bucket: master.master1\n'
2848 ' builder1: []\n'
2849 'Bucket: master.master2\n'
2850 ' builder2: []\n'
2851 'To see results here, run: git cl try-results\n'
2852 'To see results in browser, run: git cl web\n')
2853
tandrii16e0b4e2016-06-07 10:34:28 -07002854 def _common_GerritCommitMsgHookCheck(self):
2855 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2856 self.mock(git_cl.os.path, 'abspath',
2857 lambda path: self._mocked_call(['abspath', path]))
2858 self.mock(git_cl.os.path, 'exists',
2859 lambda path: self._mocked_call(['exists', path]))
2860 self.mock(git_cl.gclient_utils, 'FileRead',
2861 lambda path: self._mocked_call(['FileRead', path]))
2862 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2863 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2864 self.calls = [
2865 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2866 ((['abspath', '../'],), '/abs/git_repo_root'),
2867 ]
2868 return git_cl.Changelist(codereview='gerrit', issue=123)
2869
2870 def test_GerritCommitMsgHookCheck_custom_hook(self):
2871 cl = self._common_GerritCommitMsgHookCheck()
2872 self.calls += [
2873 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2874 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2875 '#!/bin/sh\necho "custom hook"')
2876 ]
2877 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2878
2879 def test_GerritCommitMsgHookCheck_not_exists(self):
2880 cl = self._common_GerritCommitMsgHookCheck()
2881 self.calls += [
2882 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2883 ]
2884 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2885
2886 def test_GerritCommitMsgHookCheck(self):
2887 cl = self._common_GerritCommitMsgHookCheck()
2888 self.calls += [
2889 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2890 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2891 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002892 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002893 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2894 ''),
2895 ]
2896 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2897
tandriic4344b52016-08-29 06:04:54 -07002898 def test_GerritCmdLand(self):
2899 self.calls += [
2900 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2901 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2902 'deadbeaf'),
2903 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2904 ((['git', 'config', 'branch.feature.gerritserver'],),
2905 'chromium-review.googlesource.com'),
2906 ]
2907 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2908 cl._codereview_impl._GetChangeDetail = lambda _: {
2909 'labels': {},
2910 'current_revision': 'deadbeaf',
2911 }
agable32978d92016-11-01 12:55:02 -07002912 cl._codereview_impl._GetChangeCommit = lambda: {
2913 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002914 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002915 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2916 }
tandriic4344b52016-08-29 06:04:54 -07002917 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002918 out = StringIO.StringIO()
2919 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002920 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002921 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002922 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002923
tandrii221ab252016-10-06 08:12:04 -07002924 BUILDBUCKET_BUILDS_MAP = {
2925 '9000': {
2926 'id': '9000',
2927 'status': 'STARTED',
2928 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2929 'result_details_json': '{"properties": {}}',
2930 'bucket': 'master.x.y',
2931 'created_by': 'user:someone@chromium.org',
2932 'created_ts': '147200002222000',
2933 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2934 },
2935 '8000': {
2936 'id': '8000',
2937 'status': 'COMPLETED',
2938 'result': 'FAILURE',
2939 'failure_reason': 'BUILD_FAILURE',
2940 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2941 'result_details_json': '{"properties": {}}',
2942 'bucket': 'master.x.y',
2943 'created_by': 'user:someone@chromium.org',
2944 'created_ts': '147200001111000',
2945 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2946 },
2947 }
2948
2949 def test_write_try_results_json(self):
2950 expected_output = [
2951 {
2952 'buildbucket_id': '8000',
2953 'bucket': 'master.x.y',
2954 'builder_name': 'my-builder',
2955 'status': 'COMPLETED',
2956 'result': 'FAILURE',
2957 'failure_reason': 'BUILD_FAILURE',
2958 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2959 },
2960 {
2961 'buildbucket_id': '9000',
2962 'bucket': 'master.x.y',
2963 'builder_name': 'my-builder',
2964 'status': 'STARTED',
2965 'result': None,
2966 'failure_reason': None,
2967 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2968 }
2969 ]
2970 self.calls = [(('write_json', 'output.json', expected_output), '')]
2971 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2972
tandrii45b2a582016-10-11 03:14:16 -07002973 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002974 out = StringIO.StringIO()
2975 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002976 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2977 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002978 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2979 self._mocked_call(['get_authenticator_for_host', host]))
2980 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2981 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002982
2983 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2984 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002985 self.calls += [
2986 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2987 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2988 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2989 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2990 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2991 ((['git', 'config', 'branch.feature.rietveldserver'],),
2992 'codereview.example.com'),
2993 ((['get_authenticator_for_host', 'codereview.example.com'],),
2994 AuthenticatorMock()),
2995 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2996
2997 def test_fetch_try_jobs_none_rietveld(self):
2998 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002999 # Simulate that user isn't logged in.
3000 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003001 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003002 self.assertRegexpMatches(sys.stdout.getvalue(),
3003 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003004 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3005
3006 def test_fetch_try_jobs_some_rietveld(self):
3007 self._setup_fetch_try_jobs_rietveld({
3008 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3009 })
3010 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003011 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3012 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3013 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3014
3015 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3016 self._setup_fetch_try_jobs(most_recent_patchset=13)
3017 self.calls += [
3018 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3019 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3020 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003021 # TODO(tandrii): Uncomment the below if we decide to support checking
3022 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003023 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003024 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003025 ((['git', 'config', 'branch.feature.gerritserver'],),
3026 'https://x-review.googlesource.com'),
3027 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3028 AuthenticatorMock()),
3029 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3030
3031 def test_fetch_try_jobs_none_gerrit(self):
3032 self._setup_fetch_try_jobs_gerrit({})
3033 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003034 # TODO(tandrii): Uncomment the below if we decide to support checking
3035 # patchsets for Gerrit.
3036 # self.assertRegexpMatches(
3037 # sys.stdout.getvalue(),
3038 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003039 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3040
3041 def test_fetch_try_jobs_some_gerrit(self):
3042 self._setup_fetch_try_jobs_gerrit({
3043 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3044 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003045 # TODO(tandrii): Uncomment the below if we decide to support checking
3046 # patchsets for Gerrit.
3047 # self.calls.remove(
3048 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003049 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3050
3051 # ... and doesn't result in warning.
3052 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3053 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003054 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3055 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3056
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003057 def _mock_gerrit_changes_for_detail_cache(self):
3058 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003059
3060 def test_gerrit_change_detail_cache_normalize(self):
3061 self._mock_gerrit_changes_for_detail_cache()
3062 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003063 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003064 ]
3065 cl = git_cl.Changelist(codereview='gerrit')
3066 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3067 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3068 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3069 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3070
3071 def test_gerrit_change_detail_cache_simple(self):
3072 self._mock_gerrit_changes_for_detail_cache()
3073 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003074 (('GetChangeDetail', 'host', '1', []), 'a'),
3075 (('GetChangeDetail', 'host', '2', []), 'b'),
3076 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003077 ]
3078 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3079 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3080 self.assertEqual(cl._GetChangeDetail(), 'a')
3081 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003082 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003083 self.assertEqual(cl._GetChangeDetail(), 'a')
3084 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3085
3086 def test_gerrit_change_detail_cache_options(self):
3087 self._mock_gerrit_changes_for_detail_cache()
3088 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003089 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3090 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3091 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3092 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003093 ]
3094 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3095 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3096 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3097 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3098 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3099 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3100 self.assertEqual(cl._GetChangeDetail(), 'cab')
3101
3102 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3103 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3104 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3105 self.assertEqual(cl._GetChangeDetail(), 'cab')
3106
3107 # Finally, no_cache should invalidate all caches for given change.
3108 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3109 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3110
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003111 def test_gerrit_description_caching(self):
3112 def gen_detail(rev, desc):
3113 return {
3114 'current_revision': rev,
3115 'revisions': {rev: {'commit': {'message': desc}}}
3116 }
3117 self.calls = [
3118 (('GetChangeDetail', 'host', '1',
3119 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3120 gen_detail('rev1', 'desc1')),
3121 (('GetChangeDetail', 'host', '1',
3122 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3123 gen_detail('rev2', 'desc2')),
3124 ]
3125
3126 self._mock_gerrit_changes_for_detail_cache()
3127 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3128 self.assertEqual(cl.GetDescription(), 'desc1')
3129 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3130 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003131
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003132 def test_print_current_creds(self):
3133 class CookiesAuthenticatorMock(object):
3134 def __init__(self):
3135 self.gitcookies = {
3136 'host.googlesource.com': ('user', 'pass'),
3137 'host-review.googlesource.com': ('user', 'pass'),
3138 }
3139 self.netrc = self
3140 self.netrc.hosts = {
3141 'github.com': ('user2', None, 'pass2'),
3142 'host2.googlesource.com': ('user3', None, 'pass'),
3143 }
3144 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3145 CookiesAuthenticatorMock)
3146 self.mock(sys, 'stdout', StringIO.StringIO())
3147 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3148 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3149 ' Host\t User\t Which file',
3150 '============================\t=====\t===========',
3151 'host-review.googlesource.com\t user\t.gitcookies',
3152 ' host.googlesource.com\t user\t.gitcookies',
3153 ' host2.googlesource.com\tuser3\t .netrc',
3154 ])
3155 sys.stdout.buf = ''
3156 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3157 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3158 ' Host\tUser\t Which file',
3159 '============================\t====\t===========',
3160 'host-review.googlesource.com\tuser\t.gitcookies',
3161 ' host.googlesource.com\tuser\t.gitcookies',
3162 ])
3163
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003164 def _common_creds_check_mocks(self):
3165 def exists_mock(path):
3166 dirname = os.path.dirname(path)
3167 if dirname == os.path.expanduser('~'):
3168 dirname = '~'
3169 base = os.path.basename(path)
3170 if base in ('.netrc', '.gitcookies'):
3171 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3172 # git cl also checks for existence other files not relevant to this test.
3173 return None
3174 self.mock(os.path, 'exists', exists_mock)
3175 self.mock(sys, 'stdout', StringIO.StringIO())
3176
3177 def test_creds_check_gitcookies_not_configured(self):
3178 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003179 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003180 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003181 self.calls = [
3182 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3183 (('os.path.exists', '~/.netrc'), True),
3184 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3185 'or Ctrl+C to abort'), ''),
3186 ((['git', 'config', '--global', 'http.cookiefile',
3187 os.path.expanduser('~/.gitcookies')], ), ''),
3188 ]
3189 self.assertEqual(0, git_cl.main(['creds-check']))
3190 self.assertRegexpMatches(
3191 sys.stdout.getvalue(),
3192 '^You seem to be using outdated .netrc for git credentials:')
3193 self.assertRegexpMatches(
3194 sys.stdout.getvalue(),
3195 '\nConfigured git to use .gitcookies from')
3196
3197 def test_creds_check_gitcookies_configured_custom_broken(self):
3198 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003199 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003200 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003201 self.calls = [
3202 ((['git', 'config', '--global', 'http.cookiefile'],),
3203 '/custom/.gitcookies'),
3204 (('os.path.exists', '/custom/.gitcookies'), False),
3205 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3206 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3207 ((['git', 'config', '--global', 'http.cookiefile',
3208 os.path.expanduser('~/.gitcookies')], ), ''),
3209 ]
3210 self.assertEqual(0, git_cl.main(['creds-check']))
3211 self.assertRegexpMatches(
3212 sys.stdout.getvalue(),
3213 'WARNING: you have configured custom path to .gitcookies: ')
3214 self.assertRegexpMatches(
3215 sys.stdout.getvalue(),
3216 'However, your configured .gitcookies file is missing.')
3217
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003218 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003219 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3220 lambda _, message: self._mocked_call('AddComment', message))
3221 self.calls = [
3222 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3223 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3224 (('AddComment', 'msg'), ''),
3225 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003226 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3227 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003228
3229 def test_git_cl_comment_add_gerrit(self):
3230 self.mock(git_cl.gerrit_util, 'SetReview',
3231 lambda host, change, msg:
3232 self._mocked_call('SetReview', host, change, msg))
3233 self.calls = [
3234 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3235 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3236 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3237 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3238 'origin/master'),
3239 ((['git', 'config', 'remote.origin.url'],),
3240 'https://chromium.googlesource.com/infra/infra'),
3241 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3242 ]
3243 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3244 '-a', 'msg']))
3245
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003246 def test_git_cl_comments_fetch_rietveld(self):
3247 self.mock(sys, 'stdout', StringIO.StringIO())
3248 self.calls = [
3249 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3250 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3251 ] * 2
3252 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3253 'messages': [
3254 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3255 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3256 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3257 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3258 # Intentionally wrong order here.
3259 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3260 'disapproval': False, 'approval': False,
3261 'sender': 'owner@example.com'},
3262 ],
3263 'owner_email': 'owner@example.com',
3264 })
3265 expected_comments_summary = [
3266 git_cl._CommentSummary(
3267 message='lgtm',
3268 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3269 disapproval=False, approval=True, sender='r@example.com'),
3270 git_cl._CommentSummary(
3271 message='not lgtm',
3272 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3273 disapproval=True, approval=False, sender='r2@example.com'),
3274 # Note: same order as in whatever Rietveld returns.
3275 git_cl._CommentSummary(
3276 message='PTAL',
3277 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3278 disapproval=False, approval=False, sender='owner@example.com'),
3279 ]
3280 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3281 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3282
3283 with git_cl.gclient_utils.temporary_directory() as tempdir:
3284 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3285 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3286 '-j', out_file]))
3287 with open(out_file) as f:
3288 read = json.load(f)
3289 self.assertEqual(len(read), 3)
3290 self.assertEqual(read[0], {
3291 'date': '2000-03-13 20:49:34.515270',
3292 'message': 'PTAL',
3293 'approval': False,
3294 'disapproval': False,
3295 'sender': 'owner@example.com'})
3296 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3297 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3298
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003299 def test_git_cl_comments_fetch_gerrit(self):
3300 self.mock(sys, 'stdout', StringIO.StringIO())
3301 self.calls = [
3302 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3303 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3304 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3305 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3306 'origin/master'),
3307 ((['git', 'config', 'remote.origin.url'],),
3308 'https://chromium.googlesource.com/infra/infra'),
3309 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3310 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3311 'owner': {'email': 'owner@example.com'},
3312 'messages': [
3313 {
3314 u'_revision_number': 1,
3315 u'author': {
3316 u'_account_id': 1111084,
3317 u'email': u'commit-bot@chromium.org',
3318 u'name': u'Commit Bot'
3319 },
3320 u'date': u'2017-03-15 20:08:45.000000000',
3321 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3322 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3323 u'tag': u'autogenerated:cq:dry-run'
3324 },
3325 {
3326 u'_revision_number': 2,
3327 u'author': {
3328 u'_account_id': 11151243,
3329 u'email': u'owner@example.com',
3330 u'name': u'owner'
3331 },
3332 u'date': u'2017-03-16 20:00:41.000000000',
3333 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3334 u'message': u'PTAL',
3335 },
3336 {
3337 u'_revision_number': 2,
3338 u'author': {
3339 u'_account_id': 148512 ,
3340 u'email': u'reviewer@example.com',
3341 u'name': u'reviewer'
3342 },
3343 u'date': u'2017-03-17 05:19:37.500000000',
3344 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3345 u'message': u'Patch Set 2: Code-Review+1',
3346 },
3347 ]
3348 })
3349 ] * 2
3350 expected_comments_summary = [
3351 git_cl._CommentSummary(
3352 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3353 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3354 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3355 git_cl._CommentSummary(
3356 message=u'PTAL',
3357 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3358 disapproval=False, approval=False, sender=u'owner@example.com'),
3359 git_cl._CommentSummary(
3360 message=u'Patch Set 2: Code-Review+1',
3361 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3362 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3363 ]
3364 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3365 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3366
3367 with git_cl.gclient_utils.temporary_directory() as tempdir:
3368 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3369 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3370 '-j', out_file]))
3371 with open(out_file) as f:
3372 read = json.load(f)
3373 self.assertEqual(len(read), 3)
3374 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3375 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3376 self.assertEqual(read[2], {
3377 u'date': u'2017-03-17 05:19:37.500000',
3378 u'message': u'Patch Set 2: Code-Review+1',
3379 u'approval': False,
3380 u'disapproval': False,
3381 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003382
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003383if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003384 logging.basicConfig(
3385 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003386 unittest.main()