blob: 4ac7deeaf490970c18534e0d12bb96d21ebe37a5 [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.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +0200304 test('https://codereview.source.com/www123', fail=True)
305 # Matches both, but we take Rietveld now.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000306 test('https://codereview.source.com/123',
307 123, None, 'codereview.source.com')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000308 # Gerrrit.
309 test('https://chrome-review.source.com/c/123/4',
310 123, 4, 'chrome-review.source.com')
311 test('https://chrome-review.source.com/bad/123/4', fail=True)
312
tandriif9aefb72016-07-01 09:06:51 -0700313 def test_get_bug_line_values(self):
314 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
315 self.assertEqual(f('', ''), [])
316 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
317 self.assertEqual(f('v8', '456'), ['v8:456'])
318 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
319 # Not nice, but not worth carying.
320 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
321 ['v8:456', 'chromium:123', 'v8:123'])
322
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100323 def _test_git_number(self, parent_msg, dest_ref, child_msg,
324 parent_hash='parenthash'):
325 desc = git_cl.ChangeDescription(child_msg)
326 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
327 return desc.description
328
329 def assertEqualByLine(self, actual, expected):
330 self.assertEqual(actual.splitlines(), expected.splitlines())
331
332 def test_git_number_bad_parent(self):
333 with self.assertRaises(ValueError):
334 self._test_git_number('Parent', 'refs/heads/master', 'Child')
335
336 def test_git_number_bad_parent_footer(self):
337 with self.assertRaises(AssertionError):
338 self._test_git_number(
339 'Parent\n'
340 '\n'
341 'Cr-Commit-Position: wrong',
342 'refs/heads/master', 'Child')
343
344 def test_git_number_bad_lineage_ignored(self):
345 actual = self._test_git_number(
346 'Parent\n'
347 '\n'
348 'Cr-Commit-Position: refs/heads/master@{#1}\n'
349 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
350 'refs/heads/master', 'Child')
351 self.assertEqualByLine(
352 actual,
353 'Child\n'
354 '\n'
355 'Cr-Commit-Position: refs/heads/master@{#2}\n'
356 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
357
358 def test_git_number_same_branch(self):
359 actual = self._test_git_number(
360 'Parent\n'
361 '\n'
362 'Cr-Commit-Position: refs/heads/master@{#12}',
363 dest_ref='refs/heads/master',
364 child_msg='Child')
365 self.assertEqualByLine(
366 actual,
367 'Child\n'
368 '\n'
369 'Cr-Commit-Position: refs/heads/master@{#13}')
370
371 def test_git_number_same_branch_with_originals(self):
372 actual = self._test_git_number(
373 'Parent\n'
374 '\n'
375 'Cr-Commit-Position: refs/heads/master@{#12}',
376 dest_ref='refs/heads/master',
377 child_msg='Child\n'
378 '\n'
379 'Some users are smart and insert their own footers\n'
380 '\n'
381 'Cr-Whatever: value\n'
382 'Cr-Commit-Position: refs/copy/paste@{#22}')
383 self.assertEqualByLine(
384 actual,
385 'Child\n'
386 '\n'
387 'Some users are smart and insert their own footers\n'
388 '\n'
389 'Cr-Original-Whatever: value\n'
390 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
391 'Cr-Commit-Position: refs/heads/master@{#13}')
392
393 def test_git_number_new_branch(self):
394 actual = self._test_git_number(
395 'Parent\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/master@{#12}',
398 dest_ref='refs/heads/branch',
399 child_msg='Child')
400 self.assertEqualByLine(
401 actual,
402 'Child\n'
403 '\n'
404 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
405 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
406
407 def test_git_number_lineage(self):
408 actual = self._test_git_number(
409 'Parent\n'
410 '\n'
411 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
412 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
413 dest_ref='refs/heads/branch',
414 child_msg='Child')
415 self.assertEqualByLine(
416 actual,
417 'Child\n'
418 '\n'
419 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
420 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
421
422 def test_git_number_moooooooore_lineage(self):
423 actual = self._test_git_number(
424 'Parent\n'
425 '\n'
426 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
427 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
428 dest_ref='refs/heads/mooore',
429 child_msg='Child')
430 self.assertEqualByLine(
431 actual,
432 'Child\n'
433 '\n'
434 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
435 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
436 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
437
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100438 def test_git_number_ever_moooooooore_lineage(self):
439 self.maxDiff = 10000
440 actual = self._test_git_number(
441 'CQ commit on fresh new branch + numbering.\n'
442 '\n'
443 'NOTRY=True\n'
444 'NOPRESUBMIT=True\n'
445 'BUG=\n'
446 '\n'
447 'Review-Url: https://codereview.chromium.org/2577703003\n'
448 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
449 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
450 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
451 dest_ref='refs/heads/gnumb-test/cl',
452 child_msg='git cl on fresh new branch + numbering.\n'
453 '\n'
454 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
455 self.assertEqualByLine(
456 actual,
457 'git cl on fresh new branch + numbering.\n'
458 '\n'
459 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
460 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
461 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
462 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
463 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100464
465 def test_git_number_cherry_pick(self):
466 actual = self._test_git_number(
467 'Parent\n'
468 '\n'
469 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
470 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
471 dest_ref='refs/heads/branch',
472 child_msg='Child, which is cherry-pick from master\n'
473 '\n'
474 'Cr-Commit-Position: refs/heads/master@{#100}\n'
475 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
476 self.assertEqualByLine(
477 actual,
478 'Child, which is cherry-pick from master\n'
479 '\n'
480 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
481 '\n'
482 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
483 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
484 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
485
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000486
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100487class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100488 def setUp(self):
489 super(GitCookiesCheckerTest, self).setUp()
490 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100491 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100492
493 def mock_hosts_creds(self, subhost_identity_pairs):
494 def ensure_googlesource(h):
495 if not h.endswith(self.c._GOOGLESOURCE):
496 assert not h.endswith('.')
497 return h + '.' + self.c._GOOGLESOURCE
498 return h
499 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
500 for h, i in subhost_identity_pairs]
501
502 def test_analysis_nothing(self):
503 self.c._all_hosts = []
504 self.assertFalse(self.c.has_generic_host())
505 self.assertEqual(set(), self.c.get_conflicting_hosts())
506 self.assertEqual(set(), self.c.get_duplicated_hosts())
507 self.assertEqual(set(), self.c.get_partially_configured_hosts())
508 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
509
510 def test_analysis(self):
511 self.mock_hosts_creds([
512 ('.googlesource.com', 'git-example.chromium.org'),
513
514 ('chromium', 'git-example.google.com'),
515 ('chromium-review', 'git-example.google.com'),
516 ('chrome-internal', 'git-example.chromium.org'),
517 ('chrome-internal-review', 'git-example.chromium.org'),
518 ('conflict', 'git-example.google.com'),
519 ('conflict-review', 'git-example.chromium.org'),
520 ('dup', 'git-example.google.com'),
521 ('dup', 'git-example.google.com'),
522 ('dup-review', 'git-example.google.com'),
523 ('partial', 'git-example.google.com'),
524 ])
525 self.assertTrue(self.c.has_generic_host())
526 self.assertEqual(set(['conflict.googlesource.com']),
527 self.c.get_conflicting_hosts())
528 self.assertEqual(set(['dup.googlesource.com']),
529 self.c.get_duplicated_hosts())
530 self.assertEqual(set(['partial.googlesource.com']),
531 self.c.get_partially_configured_hosts())
532 self.assertEqual(set(['chromium.googlesource.com',
533 'chrome-internal.googlesource.com']),
534 self.c.get_hosts_with_wrong_identities())
535
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100536 def test_report_no_problems(self):
537 self.test_analysis_nothing()
538 self.mock(sys, 'stdout', StringIO.StringIO())
539 self.assertFalse(self.c.find_and_report_problems())
540 self.assertEqual(sys.stdout.getvalue(), '')
541
542 def test_report(self):
543 self.test_analysis()
544 self.mock(sys, 'stdout', StringIO.StringIO())
545 self.assertTrue(self.c.find_and_report_problems())
546 with open(os.path.join(os.path.dirname(__file__),
547 'git_cl_creds_check_report.txt')) as f:
548 expected = f.read()
549 def by_line(text):
550 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200551 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100552
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000553class TestGitCl(TestCase):
554 def setUp(self):
555 super(TestGitCl, self).setUp()
556 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700557 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000558 self.mock(subprocess2, 'call', self._mocked_call)
559 self.mock(subprocess2, 'check_call', self._mocked_call)
560 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700561 self.mock(subprocess2, 'communicate',
562 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000563 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000564 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000565 self.mock(git_common, 'get_or_create_merge_base',
566 lambda *a: (
567 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000568 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000569 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100570 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
571 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700572 self.mock(git_cl, 'write_json', lambda path, contents:
573 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000574 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000575 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000576 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700577 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
578 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000579 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000580 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000581 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100582 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
583 lambda *args, **kwargs: self._mocked_call(
584 'GetChangeDetail', *args, **kwargs))
585 self.mock(git_cl.gerrit_util, 'AddReviewers',
586 lambda h, i, add, is_reviewer, notify: self._mocked_call(
587 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000588 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
589 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700590 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100591 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000592 # It's important to reset settings to not have inter-tests interference.
593 git_cl.settings = None
594
595 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000596 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100597 self.assertEquals([], self.calls)
598 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000599 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100600 raise
601 # Sadly, has_failed() returns True if this OR any other tests before this
602 # one have failed.
603 git_cl.logging.exception(
604 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
605 'There are un-consumed self.calls after this test has finished.\n'
606 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700607 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100608 '\n'
609 'If you are already running just this single test, then **first** '
610 'fix the problem whose exception is emitted below by unittest '
611 'runner.\n'
612 '\n'
613 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700614 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100615 'and follow instructions above.\n' +
616 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000617 finally:
618 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000619
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000620 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000621 self.assertTrue(
622 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700623 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000624 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000625 expected_args, result = top
626
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000627 # Also logs otherwise it could get caught in a try/finally and be hard to
628 # diagnose.
629 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700630 N = 5
631 prior_calls = '\n '.join(
632 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
633 for i, c in enumerate(self._calls_done[-N:]))
634 following_calls = '\n '.join(
635 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
636 for i, c in enumerate(self.calls[:N]))
637 extended_msg = (
638 'A few prior calls:\n %s\n\n'
639 'This (expected):\n @%d: %r\n'
640 'This (actual):\n @%d: %r\n\n'
641 'A few following expected calls:\n %s' %
642 (prior_calls, len(self._calls_done), expected_args,
643 len(self._calls_done), args, following_calls))
644 git_cl.logging.error(extended_msg)
645
tandrii99a72f22016-08-17 14:33:24 -0700646 self.fail('@%d\n'
647 ' Expected: %r\n'
648 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700649 len(self._calls_done), expected_args, args))
650
651 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700652 if isinstance(result, Exception):
653 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000654 return result
655
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100656 def test_ask_for_explicit_yes_true(self):
657 self.calls = [
658 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
659 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
660 ]
661 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
662
663 def test_ask_for_explicit_yes_true(self):
664 self.calls = [
665 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
666 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
667 ]
668 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
669
tandrii48df5812016-10-17 03:55:37 -0700670 def test_LoadCodereviewSettingsFromFile_gerrit(self):
671 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
672 self.calls = [
673 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
674 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
675 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
676 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
677 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
678 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700679 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
680 CERR1),
681 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700682 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
683 CERR1),
684 ((['git', 'config', 'gerrit.host', 'true'],), ''),
685 ]
686 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
687
maruel@chromium.orga3353652011-11-30 14:26:57 +0000688 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000689 def _is_gerrit_calls(cls, gerrit=False):
690 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
691 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
692
693 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000694 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000695 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000696 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000697
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000698 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000699 def _upload_no_rev_calls(cls, similarity, find_copies):
700 return (cls._git_base_calls(similarity, find_copies) +
701 cls._git_upload_no_rev_calls())
702
703 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000704 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000705 if similarity is None:
706 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700707 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700708 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000709 else:
tandrii33a46ff2016-08-23 05:53:40 -0700710 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700711 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000712
713 if find_copies is None:
714 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700715 find_copies_call = ((['git', 'config', '--bool',
716 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000717 else:
tandrii5d48c322016-08-18 16:19:37 -0700718 val = str(find_copies).lower()
719 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000720 'branch.master.git-find-copies', val],), '')
721
722 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000723 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800724 '-l100000', '-C'+similarity,
725 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000726 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000727 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000728 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000729
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000730 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000731 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000732 similarity_call,
733 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
734 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000735 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000736 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700737 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
738 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000739 ((['git', 'config', 'rietveld.server'],),
740 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000741 ((['git', 'config', 'branch.master.merge'],), 'master'),
742 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000743 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000744 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000745 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000746 ((['git', 'rev-parse', '--show-cdup'],), ''),
747 ((['git', 'rev-parse', 'HEAD'],), '12345'),
748 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000749 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000750 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700751 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000752 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000753 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000754 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000755 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000756 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000757 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000758 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000759 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700760 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000761 ]
762
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000763 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000764 def _git_upload_no_rev_calls(cls):
765 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000766 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000767 ]
768
769 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000770 def _git_upload_calls(cls, private):
771 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000772 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000773 private_call = []
774 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000775 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000776 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000777 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000778
maruel@chromium.orga3353652011-11-30 14:26:57 +0000779 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000780 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000781 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000782 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800783 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000784 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700785 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000786 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000787 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700789 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000790 ] + cls._git_post_upload_calls()
791
792 @classmethod
793 def _git_post_upload_calls(cls):
794 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000795 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
796 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
797 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000798 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000799 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000800 ]
801
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000802 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000803 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000804 fake_ancestor = 'fake_ancestor'
805 fake_cl = 'fake_cl_for_patch'
806 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000807 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000808 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000809 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000810 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000811 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000812 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000813 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000814 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700815 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000816 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000817 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000819 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000820 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000821 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000822 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000823 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000825 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000826 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000827
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000828 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700829 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000830 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000831 return [
832 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000833 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000834 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000835 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700836 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000837 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000838 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100839 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000840 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000841 ]
842
843 def _run_reviewer_test(
844 self,
845 upload_args,
846 expected_description,
847 returned_description,
848 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000849 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700850 private=False,
851 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000852 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000853 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000854 try:
855 similarity = upload_args[upload_args.index('--similarity')+1]
856 except ValueError:
857 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000858
859 if '--find-copies' in upload_args:
860 find_copies = True
861 elif '--no-find-copies' in upload_args:
862 find_copies = False
863 else:
864 find_copies = None
865
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000866 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700867 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000868
869 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000870
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000871 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000872 self.assertEquals(
873 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000874 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000875 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000876 '#--------------------This line is 72 characters long'
877 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000878 expected_description,
879 desc)
880 return returned_description
881 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000882
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000883 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000884 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700885 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000886 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000887 return 1, 2
888 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000889
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000890 git_cl.main(['upload'] + upload_args)
891
892 def test_no_reviewer(self):
893 self._run_reviewer_test(
894 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000895 'desc\n\nBUG=',
896 '# Blah blah comment.\ndesc\n\nBUG=',
897 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000898 [])
899
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000900 def test_keep_similarity(self):
901 self._run_reviewer_test(
902 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000903 'desc\n\nBUG=',
904 '# Blah blah comment.\ndesc\n\nBUG=',
905 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000906 [])
907
iannucci@chromium.org79540052012-10-19 23:15:26 +0000908 def test_keep_find_copies(self):
909 self._run_reviewer_test(
910 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000911 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000912 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000913 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000914 [])
915
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000916 def test_private(self):
917 self._run_reviewer_test(
918 ['--private'],
919 'desc\n\nBUG=',
920 '# Blah blah comment.\ndesc\n\nBUG=\n',
921 'desc\n\nBUG=',
922 [])
923
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000924 def test_reviewers_cmd_line(self):
925 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000926 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000927 self._run_reviewer_test(
928 ['-r' 'foo@example.com'],
929 description,
930 '\n%s\n' % description,
931 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000932 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000933
934 def test_reviewer_tbr_overriden(self):
935 # Reviewer is overriden with TBR
936 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000937 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000938 self._run_reviewer_test(
939 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000940 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000941 description.strip('\n'),
942 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000943 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000944
945 def test_reviewer_multiple(self):
946 # Handles multiple R= or TBR= lines.
947 description = (
bradnelsond975b302016-10-23 12:20:23 -0700948 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
949 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950 self._run_reviewer_test(
951 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000952 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000953 description,
954 description,
bradnelsond975b302016-10-23 12:20:23 -0700955 ['--reviewers=another@example.com,reviewer@example.com'],
956 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000957
maruel@chromium.orga3353652011-11-30 14:26:57 +0000958 def test_reviewer_send_mail(self):
959 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000960 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000961 self._run_reviewer_test(
962 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000963 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000964 description.strip('\n'),
965 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000966 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000967
968 def test_reviewer_send_mail_no_rev(self):
969 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000970 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700971 self.calls = self._upload_no_rev_calls(None, None) + [
972 ((['DieWithError', 'Must specify reviewers to send email.'],),
973 SystemExitMock())
974 ]
975
976 def RunEditor(desc, _, **kwargs):
977 return desc
978 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
979 self.mock(sys, 'stdout', stdout)
980 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000981 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700982 self.assertEqual(
983 'Using 50% similarity for rename/copy detection. Override with '
984 '--similarity.\n',
985 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000986
tandriif9aefb72016-07-01 09:06:51 -0700987 def test_bug_on_cmd(self):
988 self._run_reviewer_test(
989 ['--bug=500658,proj:123'],
990 'desc\n\nBUG=500658\nBUG=proj:123',
991 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
992 'desc\n\nBUG=500658\nBUG=proj:1234',
993 [])
994
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100995 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
996 parent_msg=None,
997 new_msg=None,
998 fail_after_parent_msg=False,
999 fail_cherry_pick=False,
1000 fail_push_count=0,
1001 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001002 if debug:
1003 # Very useful due to finally clause in git cl land raising exceptions and
1004 # shadowing real cause of failure.
1005 self.mock(git_cl, '_IS_BEING_TESTED', True)
1006 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001007 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001008
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001009 if git_numberer_enabled:
1010 # Special mocks to check validity of timestamp.
1011 original_git_amend_head = git_cl._git_amend_head
1012 def _git_amend_head_mock(msg, tstamp):
1013 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1014 return original_git_amend_head(msg, tstamp)
1015 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1016
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001017 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1018 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001019 self.mock(RietveldMock, 'update_description', staticmethod(
1020 lambda i, d: self._mocked_call(['update_description', i, d])))
1021 self.mock(RietveldMock, 'add_comment', staticmethod(
1022 lambda i, c: self._mocked_call(['add_comment', i, c])))
1023 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001024 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1025 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1026 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1027 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1028 CERR1),
1029 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1030 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001031 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001032 ((['git', 'config', 'rietveld.server'],),
1033 'https://codereview.chromium.org'),
1034 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1035 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1036 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1037 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001038 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1039 ''), # No commits to rebase, according to local view of origin.
1040 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1041 'fake_ancestor_sha'),
1042 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1043 ((['git', 'rev-parse', '--show-cdup'],), ''),
1044 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1045 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1046 'fake_ancestor_sha...', '.'],),
1047 'M\tfile1.cpp'),
1048 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1049 ((['git', 'config', 'branch.feature.rietveldserver'],),
1050 'https://codereview.chromium.org'),
1051 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1052 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1053 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1054 'fake_ancestor_sha', 'feature'],),
1055 # This command just prints smth like this:
1056 # file1.cpp | 53 ++++++--
1057 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1058 ''),
1059 ((['git', 'show-ref', '--quiet', '--verify',
1060 'refs/heads/git-cl-commit'],),
1061 ''), # 0 return code means branch exists.
1062 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1063 ((['git', 'show-ref', '--quiet', '--verify',
1064 'refs/heads/git-cl-cherry-pick'],),
1065 CERR1), # This means git-cl-cherry-pick branch does not exist.
1066 ((['git', 'rev-parse', '--show-cdup'],), ''),
1067 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1068 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1069 ((['git', 'commit', '-m',
1070 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001071 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001072 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1073 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1074 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001075 repo_url),
1076
1077 ((['git', 'config', 'remote.origin.url'],), repo_url),
1078 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1079 git_numberer_enabled),
1080
1081 # Auto-rebase init.
1082 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1083 ]
1084 # Auto-rebase loops.
1085 for attempt in xrange(fail_push_count + 1):
1086 self.calls += [
1087 # Auto-rebase loop start.
1088 ((['git', 'retry', 'fetch', 'origin',
1089 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1090 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1091 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1092 # different in each loop iteration for truly realistic test.
1093 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1094 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1095 callError(1, 'failed to cherry pick') if fail_cherry_pick
1096 else ''),
1097 ]
1098 if fail_cherry_pick:
1099 return
1100
1101 if git_numberer_enabled:
1102 assert parent_msg
1103 self.calls += [
1104 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1105 parent_msg),
1106 ]
1107 if fail_after_parent_msg:
1108 return
1109 assert new_msg
1110 self.calls += [
1111 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1112 '1480022355'), # Committer's unix timestamp.
1113 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1114 '1480024000'),
1115 ((['git_amend_head committer timestamp', 1480024000],), ''),
1116 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1117 ]
1118 self.calls += [
1119 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1120 CERR1 if attempt < fail_push_count else ''),
1121 ]
1122 # End of autorebase + push.
1123
1124 self.calls += [
1125 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1126 ]
1127 if git_numberer_enabled:
1128 self.calls += [
1129 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1130 ]
1131
1132 # Cleanup calls.
1133 self.calls += [
1134 ((['git', 'checkout', '-q', 'feature'],), ''),
1135 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1136 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001137 ]
1138
1139 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001140 self._land_rietveld_calls(
1141 repo_url='https://chromium.googlesource.com/infra/infra',
1142 git_numberer_enabled=False,
1143 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001144 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001145 ((['git', 'config', 'rietveld.viewvc-url'],),
1146 'https://chromium.googlesource.com/infra/infra/+/'),
1147 ((['update_description', 123,
1148 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001149 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001150 ''),
1151 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001152 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001153 ]
1154 git_cl.main(['land'])
1155
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001156 def test_land_rietveld_fail_cherry_pick(self):
1157 self._land_rietveld_calls(
1158 repo_url='https://chromium.googlesource.com/infra/infra',
1159 git_numberer_enabled=False,
1160 fail_cherry_pick=True,
1161 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001162 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001163 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1164 'U path/file1\n'
1165 'U file2.cpp\n'),
1166 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001167 ((['git', 'checkout', '-q', 'feature'],), ''),
1168 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001169 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1170 ]
1171 git_cl.main(['land'])
1172
1173 def test_land_rietveld_git_numberer_fail_1_push(self):
1174 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1175
1176 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1177 self._land_rietveld_calls(
1178 repo_url='https://chromium.googlesource.com/chromium/src',
1179 git_numberer_enabled=True,
1180 parent_msg=('This is parent commit.\n'
1181 '\n'
1182 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1183 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1184 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1185 '\n'
1186 'Review-Url: https://codereview.chromium.org/123 .\n'
1187 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1188 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1189 fail_push_count=fail_push_count,
1190 debug=False)
1191
1192 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001193 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001194 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001195 ((['update_description', 123,
1196 'Issue: 123\n\nR=john@chromium.org\n'
1197 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001198 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001199 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1200 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1201 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001202 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001203 ''),
1204 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001205 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001206 ]
1207 git_cl.main(['land'])
1208
1209 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001210 self._land_rietveld_calls(
1211 repo_url='https://chromium.googlesource.com/v8/v8',
1212 git_numberer_enabled=True,
1213 parent_msg='This is parent commit with no footer.',
1214 fail_after_parent_msg=True,
1215 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001216 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001217 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001218 ((['git', 'checkout', '-q', 'feature'],), ''),
1219 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001220 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001221 ]
1222 with self.assertRaises(ValueError) as cm:
1223 git_cl.main(['land'])
1224 self.assertEqual(cm.exception.message,
1225 'Unable to infer commit position from footers')
1226
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001227 def test_git_numberer_not_whitelisted_repo(self):
1228 self.calls = []
1229 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001230 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1231 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001232 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001233
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001234 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001235 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1236 self.calls = [
1237 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001238 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001239 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001240 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001241 remote_url='https://chromium.googlesource.com/chromium/src',
1242 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001243 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001244
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001245 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001246 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001247 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001248 def fake_temporary_directory(**kwargs):
1249 yield tempdir
1250 self.mock(git_cl.gclient_utils, 'temporary_directory',
1251 fake_temporary_directory)
1252 self._test_GitNumbererState_valid_configs_inner(tempdir)
1253
1254 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001255 self.calls = [
1256 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001257 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001258 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1259 '''
1260 [plugin "git-numberer"]
1261 validate-enabled-refglob = refs/else/*
1262 validate-enabled-refglob = refs/heads/*
1263 validate-disabled-refglob = refs/heads/disabled
1264 validate-disabled-refglob = refs/branch-heads/*
1265 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001266 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1267 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001268 'refs/else/*\n'
1269 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001270 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1271 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001272 'refs/heads/disabled\n'
1273 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001274 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001275
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001276 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001277 remote_url='https://chromium.googlesource.com/chromium/src',
1278 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001279 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001280
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001281 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001282 remote_url='https://chromium.googlesource.com/chromium/src',
1283 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001284 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001285
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001286 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001287 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001288 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001289 remote_url='https://chromium.googlesource.com/chromium/src',
1290 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001291 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001292
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001293 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001294 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001295 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001296 if skip_auth_check:
1297 return [((cmd, ), 'true')]
1298
tandrii5d48c322016-08-18 16:19:37 -07001299 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001300 if issue:
1301 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001302 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001303 ])
1304 calls.extend([
1305 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1306 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1307 ((['git', 'config', 'remote.origin.url'],),
1308 'https://chromium.googlesource.com/my/repo'),
1309 ((['git', 'config', 'remote.origin.url'],),
1310 'https://chromium.googlesource.com/my/repo'),
1311 ])
1312 return calls
1313
1314 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001315 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001316 fetched_status=None, other_cl_owner=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001317 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001318 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001319 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001320 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001321 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001322 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1323 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001324 ]
1325 calls += cls._is_gerrit_calls(True)
1326 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001327 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001328 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1329 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001330 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001331 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001332 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001333 ((['get_or_create_merge_base', 'master',
1334 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001335 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001336 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001337 ]
1338 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1339
1340 if issue:
1341 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001342 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001343 '123456',
1344 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001345 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001346 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001347 'change_id': '123456789',
1348 'current_revision': 'sha1_of_current_revision',
1349 'revisions': { 'sha1_of_current_revision': {
1350 'commit': {'message': fetched_description},
1351 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001352 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001353 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001354 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001355 if fetched_status == 'ABANDONED':
1356 calls += [
1357 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1358 '123456 has been abandoned, new uploads are not '
1359 'allowed'), SystemExitMock()),
1360 ]
1361 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001362 if other_cl_owner:
1363 calls += [
1364 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1365 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001366
1367 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1368 get_remote_branch=False)
1369 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001370 ((['git', 'rev-parse', '--show-cdup'],), ''),
1371 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001372
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001373 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001374 'diff', '--name-status', '--no-renames', '-r',
1375 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001376 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001377 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001378 ]
1379
1380 if not issue:
1381 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001382 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001383 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001384 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001385 ]
1386
1387 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001388 ((['git', 'config', 'user.email'],), 'me@example.com'),
1389 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001390 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1391 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001392 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001393 ]
1394 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001395
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001396 @classmethod
1397 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001398 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001399 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001400 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001401 post_amend_description=None, issue=None, cc=None,
1402 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001403 if post_amend_description is None:
1404 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001405 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001406 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001407
tandriia60502f2016-06-20 02:01:53 -07001408 if squash_mode == 'default':
1409 calls.extend([
1410 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1411 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1412 ])
1413 elif squash_mode in ('override_squash', 'override_nosquash'):
1414 calls.extend([
1415 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1416 'true' if squash_mode == 'override_squash' else 'false'),
1417 ])
1418 else:
1419 assert squash_mode in ('squash', 'nosquash')
1420
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001421 # If issue is given, then description is fetched from Gerrit instead.
1422 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001423 calls += [
1424 ((['git', 'log', '--pretty=format:%s\n\n%b',
1425 'fake_ancestor_sha..HEAD'],),
1426 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001427 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001428 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001429 else:
1430 if not title:
1431 calls += [
1432 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001433 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001434 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001435 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001436 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001437 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001438 # DownloadGerritHook(False)
1439 ((False, ),
1440 ''),
1441 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001442 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001443 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001444 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001445 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001446 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001447 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001448 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001449 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001450 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001451 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001452 if not issue:
1453 # Prompting to edit description on first upload.
1454 calls += [
1455 ((['git', 'config', 'core.editor'],), ''),
1456 ((['RunEditor'],), description),
1457 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001458 ref_to_push = 'abcdef0123456789'
1459 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001460 ((['git', 'config', 'branch.master.merge'],),
1461 'refs/heads/master'),
1462 ((['git', 'config', 'branch.master.remote'],),
1463 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001464 ((['get_or_create_merge_base', 'master',
1465 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001466 'origin/master'),
1467 ((['git', 'rev-parse', 'HEAD:'],),
1468 '0123456789abcdef'),
1469 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001470 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001471 ref_to_push),
1472 ]
1473 else:
1474 ref_to_push = 'HEAD'
1475
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001476 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001477 ((['git', 'rev-list',
1478 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001479 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001480
Aaron Gable9b713dd2016-12-14 16:04:21 -08001481 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001482 if ref_suffix:
1483 ref_suffix += ',m=' + title
1484 else:
1485 ref_suffix = '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001486
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001487 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1488 if ref_suffix:
1489 ref_suffix += ',' + notify_suffix
1490 else:
1491 ref_suffix = '%' + notify_suffix
1492
1493 if reviewers:
1494 ref_suffix += ',' + ','.join('r=%s' % email
1495 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001496
1497 if git_mirror is None:
1498 calls += [
1499 ((['git', 'config', 'remote.origin.url'],),
1500 'https://chromium.googlesource.com/yyy/zzz'),
1501 ]
1502 else:
1503 calls += [
1504 ((['git', 'config', 'remote.origin.url'],),
1505 '/cache/this-dir-exists'),
1506 (('os.path.isdir', '/cache/this-dir-exists'),
1507 True),
1508 # Runs in /cache/this-dir-exists.
1509 ((['git', 'config', 'remote.origin.url'],),
1510 'https://chromium.googlesource.com/yyy/zzz'),
1511 ]
1512
ukai@chromium.orge8077812012-02-03 03:41:46 +00001513 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001514 ((['git', 'push',
1515 'https://chromium.googlesource.com/yyy/zzz',
1516 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001517 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001518 'remote: Processing changes: (\)\n'
1519 'remote: Processing changes: (|)\n'
1520 'remote: Processing changes: (/)\n'
1521 'remote: Processing changes: (-)\n'
1522 'remote: Processing changes: new: 1 (/)\n'
1523 'remote: Processing changes: new: 1, done\n'
1524 'remote:\n'
1525 'remote: New Changes:\n'
1526 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1527 'remote:\n'
1528 'To https://chromium.googlesource.com/yyy/zzz\n'
1529 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001530 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001531 if squash:
1532 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001533 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001534 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001535 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001536 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001537 ((['git', 'config', 'branch.master.gerritsquashhash',
1538 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001539 ]
tandrii88189772016-09-29 04:29:57 -07001540 calls += [
1541 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001542 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001543 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001544 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001545 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001546 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001547 return calls
1548
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001549 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001550 self,
1551 upload_args,
1552 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001553 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001554 squash=True,
1555 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001556 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001557 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001558 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001559 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001560 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001561 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001562 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001563 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001564 fetched_status=None,
1565 other_cl_owner=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001566 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001567 if squash_mode is None:
1568 if '--no-squash' in upload_args:
1569 squash_mode = 'nosquash'
1570 elif '--squash' in upload_args:
1571 squash_mode = 'squash'
1572 else:
1573 squash_mode = 'default'
1574
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001575 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001576 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001577 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001578 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001579 CookiesAuthenticatorMockFactory(
1580 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001581 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1582 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001583 self.mock(git_cl.gclient_utils, 'RunEditor',
1584 lambda *_, **__: self._mocked_call(['RunEditor']))
1585 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1586
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001587 original_os_path_isdir = os.path.isdir
1588 def selective_os_path_isdir_mock(path):
1589 if path == '/cache/this-dir-exists':
1590 return self._mocked_call('os.path.isdir', path)
1591 return original_os_path_isdir(path)
1592 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1593
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001594 self.calls = self._gerrit_base_calls(
1595 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001596 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001597 fetched_status=fetched_status,
1598 other_cl_owner=other_cl_owner)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001599 if fetched_status != 'ABANDONED':
1600 self.calls += self._gerrit_upload_calls(
1601 description, reviewers, squash,
1602 squash_mode=squash_mode,
1603 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001604 ref_suffix=ref_suffix, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001605 post_amend_description=post_amend_description,
1606 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001607 # Uncomment when debugging.
1608 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001609 git_cl.main(['upload'] + upload_args)
1610
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001611 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001612 self._run_gerrit_upload_test(
1613 ['--no-squash'],
1614 'desc\n\nBUG=\n',
1615 [],
1616 squash=False,
1617 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1618
1619 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001620 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001621 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001622 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001623 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001624 [],
tandriia60502f2016-06-20 02:01:53 -07001625 squash=False,
1626 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001627 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001628
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001629 def test_gerrit_no_reviewer(self):
1630 self._run_gerrit_upload_test(
1631 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001632 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001633 [],
1634 squash=False,
1635 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001636
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001637 def test_gerrit_patch_bad_chars(self):
1638 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1639 self._run_gerrit_upload_test(
1640 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1641 'desc\n\nBUG=\n\nChange-Id: I123456789',
1642 squash=False,
1643 squash_mode='override_nosquash',
1644 title='Dont_put_bad_chars')
1645 self.assertIn(
1646 'WARNING: Patchset title may only contain alphanumeric chars '
1647 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1648 'Cleaned up title: Dont put bad chars\n',
1649 git_cl.sys.stdout.getvalue())
1650
ukai@chromium.orge8077812012-02-03 03:41:46 +00001651 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001652 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001653 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001654 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001655 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001656 squash=False,
1657 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001658 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001659
1660 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001661 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001662 [],
bradnelsond975b302016-10-23 12:20:23 -07001663 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1664 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001665 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001666 ['reviewer@example.com', 'another@example.com'],
1667 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001668 squash_mode='override_nosquash',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001669 ref_suffix='%l=Code-Review+1',
bradnelsond975b302016-10-23 12:20:23 -07001670 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001671
1672 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001673 self._run_gerrit_upload_test(
1674 [],
1675 'desc\nBUG=\n\nChange-Id: 123456789',
1676 [],
1677 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001678
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001679 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001680 self._run_gerrit_upload_test(
1681 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001682 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001683 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001684 squash=True,
1685 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001686
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001687 def test_gerrit_upload_squash_first_with_mirror(self):
1688 self._run_gerrit_upload_test(
1689 ['--squash'],
1690 'desc\nBUG=\n\nChange-Id: 123456789',
1691 [],
1692 squash=True,
1693 expected_upstream_ref='origin/master',
1694 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1695
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001696 def test_gerrit_upload_squash_reupload(self):
1697 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001698 self._run_gerrit_upload_test(
1699 ['--squash'],
1700 description,
1701 [],
1702 squash=True,
1703 expected_upstream_ref='origin/master',
1704 issue=123456)
1705
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001706 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1707 self.mock(git_cl, 'DieWithError',
1708 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1709 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1710 with self.assertRaises(SystemExitMock):
1711 self._run_gerrit_upload_test(
1712 ['--squash'],
1713 description,
1714 [],
1715 squash=True,
1716 expected_upstream_ref='origin/master',
1717 issue=123456,
1718 fetched_status='ABANDONED')
1719
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001720 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1721 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1722 lambda *_, **__: {'email': 'yet-another@example.com'})
1723 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1724 self._run_gerrit_upload_test(
1725 ['--squash'],
1726 description,
1727 [],
1728 squash=True,
1729 expected_upstream_ref='origin/master',
1730 issue=123456,
1731 other_cl_owner='other@example.com')
1732 self.assertIn(
1733 'WARNING: change 123456 is owned by other@example.com, but you '
1734 'authenticate to Gerrit as yet-another@example.com.\n'
1735 'Uploading may fail due to lack of permissions',
1736 git_cl.sys.stdout.getvalue())
1737
rmistry@google.com2dd99862015-06-22 12:22:18 +00001738 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001739 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001740 def mock_run_git(*args, **_kwargs):
1741 if args[0] == ['for-each-ref',
1742 '--format=%(refname:short) %(upstream:short)',
1743 'refs/heads']:
1744 # Create a local branch dependency tree that looks like this:
1745 # test1 -> test2 -> test3 -> test4 -> test5
1746 # -> test3.1
1747 # test6 -> test0
1748 branch_deps = [
1749 'test2 test1', # test1 -> test2
1750 'test3 test2', # test2 -> test3
1751 'test3.1 test2', # test2 -> test3.1
1752 'test4 test3', # test3 -> test4
1753 'test5 test4', # test4 -> test5
1754 'test6 test0', # test0 -> test6
1755 'test7', # test7
1756 ]
1757 return '\n'.join(branch_deps)
1758 self.mock(git_cl, 'RunGit', mock_run_git)
1759
1760 class RecordCalls:
1761 times_called = 0
1762 record_calls = RecordCalls()
1763 def mock_CMDupload(*args, **_kwargs):
1764 record_calls.times_called += 1
1765 return 0
1766 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1767
1768 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001769 (('ask_for_data', 'This command will checkout all dependent branches '
1770 'and run "git cl upload". Press Enter to continue, '
1771 'or Ctrl+C to abort'), ''),
1772 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001773
1774 class MockChangelist():
1775 def __init__(self):
1776 pass
1777 def GetBranch(self):
1778 return 'test1'
1779 def GetIssue(self):
1780 return '123'
1781 def GetPatchset(self):
1782 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001783 def IsGerrit(self):
1784 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001785
1786 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1787 # CMDupload should have been called 5 times because of 5 dependent branches.
1788 self.assertEquals(5, record_calls.times_called)
1789 self.assertEquals(0, ret)
1790
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001791 def test_gerrit_change_id(self):
1792 self.calls = [
1793 ((['git', 'write-tree'], ),
1794 'hashtree'),
1795 ((['git', 'rev-parse', 'HEAD~0'], ),
1796 'branch-parent'),
1797 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1798 'A B <a@b.org> 1456848326 +0100'),
1799 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1800 'C D <c@d.org> 1456858326 +0100'),
1801 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1802 'hashchange'),
1803 ]
1804 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1805 self.assertEqual(change_id, 'Ihashchange')
1806
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001807 def test_desecription_append_footer(self):
1808 for init_desc, footer_line, expected_desc in [
1809 # Use unique desc first lines for easy test failure identification.
1810 ('foo', 'R=one', 'foo\n\nR=one'),
1811 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1812 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1813 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1814 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1815 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1816 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1817 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1818 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1819 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1820 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1821 ]:
1822 desc = git_cl.ChangeDescription(init_desc)
1823 desc.append_footer(footer_line)
1824 self.assertEqual(desc.description, expected_desc)
1825
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001826 def test_update_reviewers(self):
1827 data = [
1828 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001829 ('foo\nR=xx', [], 'foo\nR=xx'),
1830 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001831 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001832 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1833 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1834 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001835 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001836 ('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 +00001837 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001838 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1839 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1840 # Same as the line before, but full of whitespaces.
1841 (
1842 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1843 'foo\nBar\n\nR=c@c\n BUG =',
1844 ),
1845 # Whitespaces aren't interpreted as new lines.
1846 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001847 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001848 expected = [i[2] for i in data]
1849 actual = []
1850 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001851 obj = git_cl.ChangeDescription(orig)
1852 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001853 actual.append(obj.description)
1854 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001855
wittman@chromium.org455dc922015-01-26 20:15:50 +00001856 def test_get_target_ref(self):
1857 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001858 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001859 self.assertEqual(None, git_cl.GetTargetRef(None,
1860 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001861 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001862
wittman@chromium.org455dc922015-01-26 20:15:50 +00001863 # Check default target refs for branches.
1864 self.assertEqual('refs/heads/master',
1865 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001866 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001867 self.assertEqual('refs/heads/master',
1868 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001869 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001870 self.assertEqual('refs/heads/master',
1871 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001872 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001873 self.assertEqual('refs/branch-heads/123',
1874 git_cl.GetTargetRef('origin',
1875 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001876 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001877 self.assertEqual('refs/diff/test',
1878 git_cl.GetTargetRef('origin',
1879 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001880 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001881 self.assertEqual('refs/heads/chrome/m42',
1882 git_cl.GetTargetRef('origin',
1883 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001884 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001885
1886 # Check target refs for user-specified target branch.
1887 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1888 'refs/remotes/branch-heads/123'):
1889 self.assertEqual('refs/branch-heads/123',
1890 git_cl.GetTargetRef('origin',
1891 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001892 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001893 for branch in ('origin/master', 'remotes/origin/master',
1894 'refs/remotes/origin/master'):
1895 self.assertEqual('refs/heads/master',
1896 git_cl.GetTargetRef('origin',
1897 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001898 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001899 for branch in ('master', 'heads/master', 'refs/heads/master'):
1900 self.assertEqual('refs/heads/master',
1901 git_cl.GetTargetRef('origin',
1902 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001903 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001904
wychen@chromium.orga872e752015-04-28 23:42:18 +00001905 def test_patch_when_dirty(self):
1906 # Patch when local tree is dirty
1907 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1908 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1909
1910 def test_diff_when_dirty(self):
1911 # Do 'git cl diff' when local tree is dirty
1912 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1913 self.assertNotEqual(git_cl.main(['diff']), 0)
1914
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001915 @staticmethod
1916 def _get_gerrit_codereview_server_calls(branch, value=None,
1917 git_short_host='host',
1918 detect_branch=True):
1919 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1920
1921 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1922 """
1923 calls = []
1924 if detect_branch:
1925 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1926 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1927 CERR1 if value is None else value))
1928 if value is None:
1929 calls += [
1930 ((['git', 'config', 'branch.' + branch + '.merge'],),
1931 'refs/heads' + branch),
1932 ((['git', 'config', 'branch.' + branch + '.remote'],),
1933 'origin'),
1934 ((['git', 'config', 'remote.origin.url'],),
1935 'https://%s.googlesource.com/my/repo' % git_short_host),
1936 ]
1937 return calls
1938
tandriidf09a462016-08-18 16:23:55 -07001939 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001940 new_branch=False, git_short_host='host',
1941 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001942 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001943 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1944 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001945 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001946 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001947 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1948
tandriidf09a462016-08-18 16:23:55 -07001949 if new_branch:
1950 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1951 else:
1952 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001953
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001954 if not force_codereview:
1955 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001956 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001957 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001958 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1959 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001960 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001961 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001962
1963 if is_gerrit:
1964 if not force_codereview:
1965 self.calls += [
1966 ((['git', 'config', 'gerrit.host'],), 'true'),
1967 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001968 if detect_gerrit_server:
1969 self.calls += self._get_gerrit_codereview_server_calls(
1970 'master', git_short_host=git_short_host,
1971 detect_branch=not new_branch and force_codereview)
1972
1973 self.calls += [
1974 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001975 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001976 {
1977 'current_revision': '7777777777',
1978 'revisions': {
1979 '1111111111': {
1980 '_number': 1,
1981 'fetch': {'http': {
1982 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1983 'ref': 'refs/changes/56/123456/1',
1984 }},
1985 },
1986 '7777777777': {
1987 '_number': 7,
1988 'fetch': {'http': {
1989 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1990 'ref': 'refs/changes/56/123456/7',
1991 }},
1992 },
1993 },
1994 }),
1995 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001996 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001997 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001998 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001999 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07002000 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002001 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002002 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002003
tandriidf09a462016-08-18 16:23:55 -07002004 def _common_patch_successful(self, new_branch=False):
2005 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002006 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002007 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002008 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002009 ((['git', 'config', 'branch.master.rietveldserver',
2010 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002011 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002012 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002013 ((['git', 'commit', '-m',
2014 'Description\n\n' +
2015 'patch from issue 123456 at patchset 60001 ' +
2016 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002017 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002018
2019 def test_patch_successful(self):
2020 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00002021 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2022
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002023 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07002024 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002025 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2026
wychen@chromium.orga872e752015-04-28 23:42:18 +00002027 def test_patch_conflict(self):
2028 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07002029 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002030 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002031
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002032 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002033 self._patch_common(is_gerrit=True, git_short_host='chromium',
2034 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002035 self.calls += [
2036 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2037 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002038 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002039 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002040 ((['git', 'config', 'branch.master.gerritserver',
2041 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002042 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002043 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002044 ]
2045 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2046
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002047 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002048 self._patch_common(is_gerrit=True, force_codereview=True,
2049 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002050 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002051 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002052 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002053 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002054 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002055 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002056 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002057 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002058 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002059 ]
2060 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2061
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002062 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002063 self._patch_common(is_gerrit=True, git_short_host='else',
2064 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002065 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002066 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002067 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002068 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002069 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002070 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002071 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002072 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002073 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002074 ]
2075 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002076 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002077
2078 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002079 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
2080 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002081 self.calls += [
2082 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2083 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002084 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2085 ''),
2086 ((['git', 'config', 'branch.master.gerritserver',
2087 'https://chromium-review.googlesource.com'],), ''),
2088 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002089 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2090 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2091 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002092 ]
2093 with self.assertRaises(SystemExitMock):
2094 git_cl.main(['patch',
2095 'https://chromium-review.googlesource.com/#/c/123456/1'])
2096
tandriic2405f52016-10-10 08:13:15 -07002097 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002098 def notExists(_issue, *_, **kwargs):
2099 self.assertFalse(kwargs['ignore_404'])
2100 raise git_cl.gerrit_util.GerritError(404, '')
2101 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2102
tandriic2405f52016-10-10 08:13:15 -07002103 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07002104 self.calls = [
2105 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2106 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2107 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2108 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2109 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2110 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08002111 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07002112 'or you have no access to it'],), SystemExitMock()),
2113 ]
2114 with self.assertRaises(SystemExitMock):
2115 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
2116
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002117 def _checkout_calls(self):
2118 return [
2119 ((['git', 'config', '--local', '--get-regexp',
2120 'branch\\..*\\.rietveldissue'], ),
2121 ('branch.retrying.rietveldissue 1111111111\n'
2122 'branch.some-fix.rietveldissue 2222222222\n')),
2123 ((['git', 'config', '--local', '--get-regexp',
2124 'branch\\..*\\.gerritissue'], ),
2125 ('branch.ger-branch.gerritissue 123456\n'
2126 'branch.gbranch654.gerritissue 654321\n')),
2127 ]
2128
2129 def test_checkout_gerrit(self):
2130 """Tests git cl checkout <issue>."""
2131 self.calls = self._checkout_calls()
2132 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2133 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2134
2135 def test_checkout_rietveld(self):
2136 """Tests git cl checkout <issue>."""
2137 self.calls = self._checkout_calls()
2138 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2139 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2140
2141 def test_checkout_not_found(self):
2142 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002143 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002144 self.calls = self._checkout_calls()
2145 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2146
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002147 def test_checkout_no_branch_issues(self):
2148 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002149 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002150 self.calls = [
2151 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002152 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002153 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002154 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002155 ]
2156 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2157
tandrii@chromium.org28253532016-04-14 13:46:56 +00002158 def _test_gerrit_ensure_authenticated_common(self, auth,
2159 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002160 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2161 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2162 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002163 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002164 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002165 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002166 cl.branch = 'master'
2167 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002168 cl.lookedup_issue = True
2169 return cl
2170
2171 def test_gerrit_ensure_authenticated_missing(self):
2172 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002173 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002174 })
2175 self.calls.append(
2176 ((['DieWithError',
2177 'Credentials for the following hosts are required:\n'
2178 ' chromium-review.googlesource.com\n'
2179 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002180 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002181 'https://chromium-review.googlesource.com/new-password'],), ''),)
2182 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2183
2184 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002185 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002186 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002187 'chromium.googlesource.com':
2188 ('git-one.example.com', None, 'secret1'),
2189 'chromium-review.googlesource.com':
2190 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002191 })
2192 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002193 (('ask_for_data', 'If you know what you are doing '
2194 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002195 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2196
2197 def test_gerrit_ensure_authenticated_ok(self):
2198 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002199 'chromium.googlesource.com':
2200 ('git-same.example.com', None, 'secret'),
2201 'chromium-review.googlesource.com':
2202 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002203 })
2204 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2205
tandrii@chromium.org28253532016-04-14 13:46:56 +00002206 def test_gerrit_ensure_authenticated_skipped(self):
2207 cl = self._test_gerrit_ensure_authenticated_common(
2208 auth={}, skip_auth_check=True)
2209 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2210
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002211 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002212 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2213 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002214 self.calls = [
2215 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002216 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002217 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2218 ((['git', 'config', 'rietveld.server'],), ''),
2219 ((['git', 'config', 'rietveld.server'],), ''),
2220 ((['git', 'config', 'branch.feature.rietveldserver'],),
2221 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002222 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002223 ]
2224 self.assertEqual(0, git_cl.main(['set-commit']))
2225
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002226 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002227 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002228 lambda h, i, labels, notify=None:
2229 self._mocked_call(['SetReview', h, i, labels, notify]))
2230
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002231 self.calls = [
2232 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002233 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2234 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002235 ((['git', 'config', 'branch.feature.gerritserver'],),
2236 'https://chromium-review.googlesource.com'),
2237 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002238 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002239 ]
tandriid9e5ce52016-07-13 02:32:59 -07002240
2241 def test_cmd_set_commit_gerrit_clear(self):
2242 self._cmd_set_commit_gerrit_common(0)
2243 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2244
2245 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002246 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002247 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2248
tandriid9e5ce52016-07-13 02:32:59 -07002249 def test_cmd_set_commit_gerrit(self):
2250 self._cmd_set_commit_gerrit_common(2)
2251 self.assertEqual(0, git_cl.main(['set-commit']))
2252
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002253 def test_description_display(self):
2254 out = StringIO.StringIO()
2255 self.mock(git_cl.sys, 'stdout', out)
2256
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002257 self.mock(git_cl, 'Changelist', ChangelistMock)
2258 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002259
2260 self.assertEqual(0, git_cl.main(['description', '-d']))
2261 self.assertEqual('foo\n', out.getvalue())
2262
2263 def test_description_rietveld(self):
2264 out = StringIO.StringIO()
2265 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002266 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002267
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002268 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002269 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002270 self.assertEqual('foobar\n', out.getvalue())
2271
iannucci3c972b92016-08-17 13:24:10 -07002272 def test_StatusFieldOverrideIssueMissingArgs(self):
2273 out = StringIO.StringIO()
2274 self.mock(git_cl.sys, 'stderr', out)
2275
2276 try:
2277 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2278 except SystemExit as ex:
2279 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002280 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002281
2282 out = StringIO.StringIO()
2283 self.mock(git_cl.sys, 'stderr', out)
2284
2285 try:
2286 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2287 except SystemExit as ex:
2288 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002289 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002290
2291 def test_StatusFieldOverrideIssue(self):
2292 out = StringIO.StringIO()
2293 self.mock(git_cl.sys, 'stdout', out)
2294
2295 def assertIssue(cl_self, *_args):
2296 self.assertEquals(cl_self.issue, 1)
2297 return 'foobar'
2298
2299 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2300 self.calls = [
2301 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2302 ((['git', 'config', 'rietveld.server'],), ''),
2303 ((['git', 'config', 'rietveld.server'],), ''),
2304 ]
iannuccie53c9352016-08-17 14:40:40 -07002305 self.assertEqual(
2306 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2307 0)
iannucci3c972b92016-08-17 13:24:10 -07002308 self.assertEqual(out.getvalue(), 'foobar\n')
2309
iannuccie53c9352016-08-17 14:40:40 -07002310 def test_SetCloseOverrideIssue(self):
2311 def assertIssue(cl_self, *_args):
2312 self.assertEquals(cl_self.issue, 1)
2313 return 'foobar'
2314
2315 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2316 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2317 self.calls = [
2318 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2319 ((['git', 'config', 'rietveld.server'],), ''),
2320 ((['git', 'config', 'rietveld.server'],), ''),
2321 ]
2322 self.assertEqual(
2323 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2324
2325 def test_SetCommitOverrideIssue(self):
2326 def assertIssue(cl_self, *_args):
2327 self.assertEquals(cl_self.issue, 1)
2328 return 'foobar'
2329
2330 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2331 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2332 self.calls = [
2333 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2334 ((['git', 'config', 'rietveld.server'],), ''),
2335 ((['git', 'config', 'rietveld.server'],), ''),
2336 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2337 ((['git', 'config', 'rietveld.server'],), ''),
2338 ((['git', 'config', 'rietveld.server'],), ''),
2339 ]
2340 self.assertEqual(
2341 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2342
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002343 def test_description_gerrit(self):
2344 out = StringIO.StringIO()
2345 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002346 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002347 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002348 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2349 {
2350 'current_revision': 'sha1',
2351 'revisions': {'sha1': {
2352 'commit': {'message': 'foobar'},
2353 }},
2354 }),
2355 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002356 self.assertEqual(0, git_cl.main([
2357 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2358 self.assertEqual('foobar\n', out.getvalue())
2359
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002360 def test_description_set_raw(self):
2361 out = StringIO.StringIO()
2362 self.mock(git_cl.sys, 'stdout', out)
2363
2364 self.mock(git_cl, 'Changelist', ChangelistMock)
2365 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2366
2367 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2368 self.assertEqual('hihi', ChangelistMock.desc)
2369
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002370 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002371 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002372
2373 def RunEditor(desc, _, **kwargs):
2374 self.assertEquals(
2375 '# Enter a description of the change.\n'
2376 '# This will be displayed on the codereview site.\n'
2377 '# The first line will also be used as the subject of the review.\n'
2378 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002379 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002380 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002381 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002382 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002383 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002384
dsansomee2d6fd92016-09-08 00:10:47 -07002385 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002386 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002387
2388 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2389 self.mock(git_cl.Changelist, 'GetDescription',
2390 lambda *args: current_desc)
2391 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2392 UpdateDescriptionRemote)
2393 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2394
2395 self.calls = [
2396 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002397 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002398 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2399 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002400 ((['git', 'config', 'core.editor'],), 'vi'),
2401 ]
2402 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2403
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002404 def test_description_set_stdin(self):
2405 out = StringIO.StringIO()
2406 self.mock(git_cl.sys, 'stdout', out)
2407
2408 self.mock(git_cl, 'Changelist', ChangelistMock)
2409 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2410
2411 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2412 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2413
kmarshall3bff56b2016-06-06 18:31:47 -07002414 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002415 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2416
kmarshall3bff56b2016-06-06 18:31:47 -07002417 self.calls = \
2418 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2419 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002420 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002421 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2422 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002423 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2424 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2425 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002426 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2427 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2428 ((['git', 'branch', '-D', 'foo'],), '')]
2429
kmarshall3bff56b2016-06-06 18:31:47 -07002430 self.mock(git_cl, 'get_cl_statuses',
2431 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002432 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2433 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2434 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002435
2436 self.assertEqual(0, git_cl.main(['archive', '-f']))
2437
2438 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002439 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002440 self.calls = \
2441 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2442 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002443 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002444 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2445 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002446 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2447
kmarshall9249e012016-08-23 12:02:16 -07002448 self.mock(git_cl, 'get_cl_statuses',
2449 lambda branches, fine_grained, max_processes:
2450 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2451
2452 self.assertEqual(1, git_cl.main(['archive', '-f']))
2453
2454 def test_archive_dry_run(self):
2455 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2456
2457 self.calls = \
2458 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2459 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2460 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2461 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2462 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2463 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2464 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2465 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2466 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002467
2468 self.mock(git_cl, 'get_cl_statuses',
2469 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002470 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2471 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2472 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002473
kmarshall9249e012016-08-23 12:02:16 -07002474 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2475
2476 def test_archive_no_tags(self):
2477 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2478
2479 self.calls = \
2480 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2481 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2482 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2483 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2484 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2485 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2486 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2487 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2488 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2489 ((['git', 'branch', '-D', 'foo'],), '')]
2490
2491 self.mock(git_cl, 'get_cl_statuses',
2492 lambda branches, fine_grained, max_processes:
2493 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2494 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2495 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2496
2497 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002498
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002499 def test_cmd_issue_erase_existing(self):
2500 out = StringIO.StringIO()
2501 self.mock(git_cl.sys, 'stdout', out)
2502 self.calls = [
2503 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002504 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2505 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002506 # Let this command raise exception (retcode=1) - it should be ignored.
2507 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002508 CERR1),
2509 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2510 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002511 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2512 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2513 ''),
2514 ]
2515 self.assertEqual(0, git_cl.main(['issue', '0']))
2516
phajdan.jre328cf92016-08-22 04:12:17 -07002517 def test_cmd_issue_json(self):
2518 out = StringIO.StringIO()
2519 self.mock(git_cl.sys, 'stdout', out)
2520 self.calls = [
2521 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002522 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002523 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2524 ((['git', 'config', 'rietveld.server'],),
2525 'https://codereview.chromium.org'),
2526 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2527 (('write_json', 'output.json',
2528 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2529 ''),
2530 ]
2531 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2532
tandriide281ae2016-10-12 06:02:30 -07002533 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002534 self.mock(git_cl.Changelist, 'GetChange',
2535 lambda _, *a: (
2536 self._mocked_call(['GetChange']+list(a))))
2537 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2538 lambda *_, **__: (
2539 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002540 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2541 lambda _, s: self._mocked_call(['SetCQState', s]))
2542 self.calls = [
2543 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002544 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002545 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2546 ((['git', 'config', 'rietveld.server'],),
2547 'https://codereview.chromium.org'),
2548 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2549 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2550 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2551 ((['get_or_create_merge_base', 'feature', 'feature'],),
2552 'fake_ancestor_sha'),
2553 ((['GetChange', 'fake_ancestor_sha', None], ),
2554 git_cl.presubmit_support.GitChange(
2555 '', '', '', '', '', '', '', '')),
2556 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2557 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002558 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2559 ]
2560 out = StringIO.StringIO()
2561 self.mock(git_cl.sys, 'stdout', out)
2562 self.assertEqual(0, git_cl.main(['try']))
2563 self.assertEqual(
2564 out.getvalue(),
2565 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2566
tandrii8c5a3532016-11-04 07:52:02 -07002567 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2568 self.mock(git_cl.Changelist, 'GetChange',
2569 lambda _, *a: (
2570 self._mocked_call(['GetChange']+list(a))))
2571 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2572 lambda *_, **__: (
2573 self._mocked_call(['DoGetTryMasters'])))
2574 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2575 lambda _, s: self._mocked_call(['SetCQState', s]))
2576
tandrii8c5a3532016-11-04 07:52:02 -07002577 self.calls = [
2578 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2579 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2580 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2581 ((['git', 'config', 'branch.feature.gerritserver'],),
2582 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002583 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2584 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2585 'project': 'depot_tools',
2586 'status': 'OPEN',
2587 'owner': {'email': 'owner@e.mail'},
2588 'revisions': {
2589 'deadbeaf': {
2590 '_number': 6,
2591 },
2592 'beeeeeef': {
2593 '_number': 7,
2594 'fetch': {'http': {
2595 'url': 'https://chromium.googlesource.com/depot_tools',
2596 'ref': 'refs/changes/56/123456/7'
2597 }},
2598 },
2599 },
2600 }),
tandrii8c5a3532016-11-04 07:52:02 -07002601 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2602 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2603 ((['get_or_create_merge_base', 'feature', 'feature'],),
2604 'fake_ancestor_sha'),
2605 ((['GetChange', 'fake_ancestor_sha', None], ),
2606 git_cl.presubmit_support.GitChange(
2607 '', '', '', '', '', '', '', '')),
2608 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2609 ((['DoGetTryMasters'], ), None),
2610 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2611 ]
2612 out = StringIO.StringIO()
2613 self.mock(git_cl.sys, 'stdout', out)
2614 self.assertEqual(0, git_cl.main(['try']))
2615 self.assertEqual(
2616 out.getvalue(),
2617 'scheduled CQ Dry Run on '
2618 'https://chromium-review.googlesource.com/123456\n')
2619
2620 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2621 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2622 lambda _: {
2623 'owner_email': 'owner@e.mail',
2624 'private': False,
2625 'closed': False,
2626 'project': 'depot_tools',
2627 'patchsets': [20001],
2628 })
tandriide281ae2016-10-12 06:02:30 -07002629 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2630 self.calls = [
2631 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2632 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2633 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2634 ((['git', 'config', 'rietveld.server'],),
2635 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002636 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002637 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002638 ]
2639
2640 def _buildbucket_retry(*_, **kw):
2641 # self.maxDiff = 10000
2642 body = json.loads(kw['body'])
2643 self.assertEqual(len(body['builds']), 1)
2644 build = body['builds'][0]
2645 params = json.loads(build.pop('parameters_json'))
2646 self.assertEqual(params, {
2647 u'builder_name': u'win',
2648 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2649 u'revision': None}],
2650 u'properties': {
2651 u'category': u'git_cl_try',
2652 u'issue': 123,
2653 u'key': u'val',
2654 u'json': [{u'a': 1}, None],
2655 u'master': u'tryserver.chromium',
2656 u'patch_project': u'depot_tools',
2657 u'patch_storage': u'rietveld',
2658 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002659 u'rietveld': u'https://codereview.chromium.org',
2660 }
2661 })
2662 self.assertEqual(build, {
2663 u'bucket': u'master.tryserver.chromium',
2664 u'client_operation_id': u'uuid4',
2665 u'tags': [u'builder:win',
2666 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002667 u'user_agent:git_cl_try',
2668 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002669 })
2670
2671 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2672
2673 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2674 self.assertEqual(0, git_cl.main([
2675 'try', '-m', 'tryserver.chromium', '-b', 'win',
2676 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2677 self.assertRegexpMatches(
2678 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002679 'Tried jobs on:\nBucket: master.tryserver.chromium')
2680
tandrii8c5a3532016-11-04 07:52:02 -07002681 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2682 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2683 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2684
tandrii8c5a3532016-11-04 07:52:02 -07002685 self.calls = [
2686 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2687 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2688 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2689 ((['git', 'config', 'branch.feature.gerritserver'],),
2690 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002691 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002692 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002693 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002694 'status': 'OPEN',
2695 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002696 'revisions': {
2697 'deadbeaf': {
2698 '_number': 6,
2699 },
2700 'beeeeeef': {
2701 '_number': 7,
2702 'fetch': {'http': {
2703 'url': 'https://chromium.googlesource.com/depot_tools',
2704 'ref': 'refs/changes/56/123456/7'
2705 }},
2706 },
2707 },
2708 }),
2709 ]
2710
2711 def _buildbucket_retry(*_, **kw):
2712 # self.maxDiff = 10000
2713 body = json.loads(kw['body'])
2714 self.assertEqual(len(body['builds']), 1)
2715 build = body['builds'][0]
2716 params = json.loads(build.pop('parameters_json'))
2717 self.assertEqual(params, {
2718 u'builder_name': u'win',
2719 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2720 u'revision': None}],
2721 u'properties': {
2722 u'category': u'git_cl_try',
2723 u'key': u'val',
2724 u'json': [{u'a': 1}, None],
2725 u'master': u'tryserver.chromium',
2726
2727 u'patch_gerrit_url':
2728 u'https://chromium-review.googlesource.com',
2729 u'patch_issue': 123456,
2730 u'patch_project': u'depot_tools',
2731 u'patch_ref': u'refs/changes/56/123456/7',
2732 u'patch_repository_url':
2733 u'https://chromium.googlesource.com/depot_tools',
2734 u'patch_set': 7,
2735 u'patch_storage': u'gerrit',
2736 }
2737 })
2738 self.assertEqual(build, {
2739 u'bucket': u'master.tryserver.chromium',
2740 u'client_operation_id': u'uuid4',
2741 u'tags': [
2742 u'builder:win',
2743 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2744 u'user_agent:git_cl_try',
2745 u'master:tryserver.chromium'],
2746 })
2747
2748 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2749
2750 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2751 self.assertEqual(0, git_cl.main([
2752 'try', '-m', 'tryserver.chromium', '-b', 'win',
2753 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2754 self.assertRegexpMatches(
2755 git_cl.sys.stdout.getvalue(),
2756 'Tried jobs on:\nBucket: master.tryserver.chromium')
2757
borenet6c0efe62016-10-19 08:13:29 -07002758 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002759 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2760 lambda _: {
2761 'owner_email': 'owner@e.mail',
2762 'private': False,
2763 'closed': False,
2764 'project': 'depot_tools',
2765 'patchsets': [20001],
2766 })
borenet6c0efe62016-10-19 08:13:29 -07002767 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2768 self.calls = [
2769 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2770 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2771 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2772 ((['git', 'config', 'rietveld.server'],),
2773 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002774 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002775 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002776 ]
2777
2778 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002779 body = json.loads(kw['body'])
2780 self.assertEqual(len(body['builds']), 1)
2781 build = body['builds'][0]
2782 params = json.loads(build.pop('parameters_json'))
2783 self.assertEqual(params, {
2784 u'builder_name': u'win',
2785 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2786 u'revision': None}],
2787 u'properties': {
2788 u'category': u'git_cl_try',
2789 u'issue': 123,
2790 u'patch_project': u'depot_tools',
2791 u'patch_storage': u'rietveld',
2792 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002793 u'rietveld': u'https://codereview.chromium.org',
2794 }
2795 })
2796 self.assertEqual(build, {
2797 u'bucket': u'test.bucket',
2798 u'client_operation_id': u'uuid4',
2799 u'tags': [u'builder:win',
2800 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2801 u'user_agent:git_cl_try'],
2802 })
2803
2804 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2805
2806 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2807 self.assertEqual(0, git_cl.main([
2808 'try', '-B', 'test.bucket', '-b', 'win']))
2809 self.assertRegexpMatches(
2810 git_cl.sys.stdout.getvalue(),
2811 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002812
qyearsley123a4682016-10-26 09:12:17 -07002813 def test_git_cl_try_bots_on_multiple_masters(self):
2814 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2815 self.calls = [
2816 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2817 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2818 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2819 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002820 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002821 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2822 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2823 ]
2824
2825 def _buildbucket_retry(*_, **kw):
2826 body = json.loads(kw['body'])
2827 self.assertEqual(len(body['builds']), 2)
2828
2829 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2830 self.assertEqual(first_build_params['builder_name'], 'builder1')
2831 self.assertEqual(first_build_params['properties']['master'], 'master1')
2832
2833 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2834 self.assertEqual(first_build_params['builder_name'], 'builder2')
2835 self.assertEqual(first_build_params['properties']['master'], 'master2')
2836
2837 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2838
2839 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2840 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2841
2842 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2843 self.assertEqual(
2844 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2845 self.assertEqual(
2846 git_cl.sys.stdout.getvalue(),
2847 'Tried jobs on:\n'
2848 'Bucket: master.master1\n'
2849 ' builder1: []\n'
2850 'Bucket: master.master2\n'
2851 ' builder2: []\n'
2852 'To see results here, run: git cl try-results\n'
2853 'To see results in browser, run: git cl web\n')
2854
tandrii16e0b4e2016-06-07 10:34:28 -07002855 def _common_GerritCommitMsgHookCheck(self):
2856 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2857 self.mock(git_cl.os.path, 'abspath',
2858 lambda path: self._mocked_call(['abspath', path]))
2859 self.mock(git_cl.os.path, 'exists',
2860 lambda path: self._mocked_call(['exists', path]))
2861 self.mock(git_cl.gclient_utils, 'FileRead',
2862 lambda path: self._mocked_call(['FileRead', path]))
2863 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2864 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2865 self.calls = [
2866 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2867 ((['abspath', '../'],), '/abs/git_repo_root'),
2868 ]
2869 return git_cl.Changelist(codereview='gerrit', issue=123)
2870
2871 def test_GerritCommitMsgHookCheck_custom_hook(self):
2872 cl = self._common_GerritCommitMsgHookCheck()
2873 self.calls += [
2874 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2875 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2876 '#!/bin/sh\necho "custom hook"')
2877 ]
2878 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2879
2880 def test_GerritCommitMsgHookCheck_not_exists(self):
2881 cl = self._common_GerritCommitMsgHookCheck()
2882 self.calls += [
2883 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2884 ]
2885 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2886
2887 def test_GerritCommitMsgHookCheck(self):
2888 cl = self._common_GerritCommitMsgHookCheck()
2889 self.calls += [
2890 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2891 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2892 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002893 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002894 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2895 ''),
2896 ]
2897 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2898
tandriic4344b52016-08-29 06:04:54 -07002899 def test_GerritCmdLand(self):
2900 self.calls += [
2901 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2902 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2903 'deadbeaf'),
2904 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2905 ((['git', 'config', 'branch.feature.gerritserver'],),
2906 'chromium-review.googlesource.com'),
2907 ]
2908 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2909 cl._codereview_impl._GetChangeDetail = lambda _: {
2910 'labels': {},
2911 'current_revision': 'deadbeaf',
2912 }
agable32978d92016-11-01 12:55:02 -07002913 cl._codereview_impl._GetChangeCommit = lambda: {
2914 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002915 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002916 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2917 }
tandriic4344b52016-08-29 06:04:54 -07002918 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002919 out = StringIO.StringIO()
2920 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002921 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002922 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002923 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002924
tandrii221ab252016-10-06 08:12:04 -07002925 BUILDBUCKET_BUILDS_MAP = {
2926 '9000': {
2927 'id': '9000',
2928 'status': 'STARTED',
2929 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2930 'result_details_json': '{"properties": {}}',
2931 'bucket': 'master.x.y',
2932 'created_by': 'user:someone@chromium.org',
2933 'created_ts': '147200002222000',
2934 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2935 },
2936 '8000': {
2937 'id': '8000',
2938 'status': 'COMPLETED',
2939 'result': 'FAILURE',
2940 'failure_reason': 'BUILD_FAILURE',
2941 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2942 'result_details_json': '{"properties": {}}',
2943 'bucket': 'master.x.y',
2944 'created_by': 'user:someone@chromium.org',
2945 'created_ts': '147200001111000',
2946 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2947 },
2948 }
2949
2950 def test_write_try_results_json(self):
2951 expected_output = [
2952 {
2953 'buildbucket_id': '8000',
2954 'bucket': 'master.x.y',
2955 'builder_name': 'my-builder',
2956 'status': 'COMPLETED',
2957 'result': 'FAILURE',
2958 'failure_reason': 'BUILD_FAILURE',
2959 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2960 },
2961 {
2962 'buildbucket_id': '9000',
2963 'bucket': 'master.x.y',
2964 'builder_name': 'my-builder',
2965 'status': 'STARTED',
2966 'result': None,
2967 'failure_reason': None,
2968 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2969 }
2970 ]
2971 self.calls = [(('write_json', 'output.json', expected_output), '')]
2972 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2973
tandrii45b2a582016-10-11 03:14:16 -07002974 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002975 out = StringIO.StringIO()
2976 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002977 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2978 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002979 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2980 self._mocked_call(['get_authenticator_for_host', host]))
2981 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2982 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002983
2984 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2985 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002986 self.calls += [
2987 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2988 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2989 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2990 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2991 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2992 ((['git', 'config', 'branch.feature.rietveldserver'],),
2993 'codereview.example.com'),
2994 ((['get_authenticator_for_host', 'codereview.example.com'],),
2995 AuthenticatorMock()),
2996 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2997
2998 def test_fetch_try_jobs_none_rietveld(self):
2999 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003000 # Simulate that user isn't logged in.
3001 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003002 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003003 self.assertRegexpMatches(sys.stdout.getvalue(),
3004 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003005 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3006
3007 def test_fetch_try_jobs_some_rietveld(self):
3008 self._setup_fetch_try_jobs_rietveld({
3009 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3010 })
3011 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003012 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3013 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3014 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3015
3016 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3017 self._setup_fetch_try_jobs(most_recent_patchset=13)
3018 self.calls += [
3019 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3020 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3021 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003022 # TODO(tandrii): Uncomment the below if we decide to support checking
3023 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003024 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003025 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003026 ((['git', 'config', 'branch.feature.gerritserver'],),
3027 'https://x-review.googlesource.com'),
3028 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3029 AuthenticatorMock()),
3030 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3031
3032 def test_fetch_try_jobs_none_gerrit(self):
3033 self._setup_fetch_try_jobs_gerrit({})
3034 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003035 # TODO(tandrii): Uncomment the below if we decide to support checking
3036 # patchsets for Gerrit.
3037 # self.assertRegexpMatches(
3038 # sys.stdout.getvalue(),
3039 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003040 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3041
3042 def test_fetch_try_jobs_some_gerrit(self):
3043 self._setup_fetch_try_jobs_gerrit({
3044 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3045 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003046 # TODO(tandrii): Uncomment the below if we decide to support checking
3047 # patchsets for Gerrit.
3048 # self.calls.remove(
3049 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003050 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3051
3052 # ... and doesn't result in warning.
3053 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3054 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003055 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3056 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3057
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003058 def _mock_gerrit_changes_for_detail_cache(self):
3059 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003060
3061 def test_gerrit_change_detail_cache_normalize(self):
3062 self._mock_gerrit_changes_for_detail_cache()
3063 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003064 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003065 ]
3066 cl = git_cl.Changelist(codereview='gerrit')
3067 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3068 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3069 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3070 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3071
3072 def test_gerrit_change_detail_cache_simple(self):
3073 self._mock_gerrit_changes_for_detail_cache()
3074 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003075 (('GetChangeDetail', 'host', '1', []), 'a'),
3076 (('GetChangeDetail', 'host', '2', []), 'b'),
3077 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003078 ]
3079 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3080 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3081 self.assertEqual(cl._GetChangeDetail(), 'a')
3082 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003083 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003084 self.assertEqual(cl._GetChangeDetail(), 'a')
3085 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3086
3087 def test_gerrit_change_detail_cache_options(self):
3088 self._mock_gerrit_changes_for_detail_cache()
3089 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003090 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3091 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3092 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3093 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003094 ]
3095 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3096 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3097 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3098 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3099 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3100 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3101 self.assertEqual(cl._GetChangeDetail(), 'cab')
3102
3103 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3104 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3105 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3106 self.assertEqual(cl._GetChangeDetail(), 'cab')
3107
3108 # Finally, no_cache should invalidate all caches for given change.
3109 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3110 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3111
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003112 def test_gerrit_description_caching(self):
3113 def gen_detail(rev, desc):
3114 return {
3115 'current_revision': rev,
3116 'revisions': {rev: {'commit': {'message': desc}}}
3117 }
3118 self.calls = [
3119 (('GetChangeDetail', 'host', '1',
3120 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3121 gen_detail('rev1', 'desc1')),
3122 (('GetChangeDetail', 'host', '1',
3123 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3124 gen_detail('rev2', 'desc2')),
3125 ]
3126
3127 self._mock_gerrit_changes_for_detail_cache()
3128 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3129 self.assertEqual(cl.GetDescription(), 'desc1')
3130 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3131 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003132
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003133 def test_print_current_creds(self):
3134 class CookiesAuthenticatorMock(object):
3135 def __init__(self):
3136 self.gitcookies = {
3137 'host.googlesource.com': ('user', 'pass'),
3138 'host-review.googlesource.com': ('user', 'pass'),
3139 }
3140 self.netrc = self
3141 self.netrc.hosts = {
3142 'github.com': ('user2', None, 'pass2'),
3143 'host2.googlesource.com': ('user3', None, 'pass'),
3144 }
3145 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3146 CookiesAuthenticatorMock)
3147 self.mock(sys, 'stdout', StringIO.StringIO())
3148 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3149 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3150 ' Host\t User\t Which file',
3151 '============================\t=====\t===========',
3152 'host-review.googlesource.com\t user\t.gitcookies',
3153 ' host.googlesource.com\t user\t.gitcookies',
3154 ' host2.googlesource.com\tuser3\t .netrc',
3155 ])
3156 sys.stdout.buf = ''
3157 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3158 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3159 ' Host\tUser\t Which file',
3160 '============================\t====\t===========',
3161 'host-review.googlesource.com\tuser\t.gitcookies',
3162 ' host.googlesource.com\tuser\t.gitcookies',
3163 ])
3164
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003165 def _common_creds_check_mocks(self):
3166 def exists_mock(path):
3167 dirname = os.path.dirname(path)
3168 if dirname == os.path.expanduser('~'):
3169 dirname = '~'
3170 base = os.path.basename(path)
3171 if base in ('.netrc', '.gitcookies'):
3172 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3173 # git cl also checks for existence other files not relevant to this test.
3174 return None
3175 self.mock(os.path, 'exists', exists_mock)
3176 self.mock(sys, 'stdout', StringIO.StringIO())
3177
3178 def test_creds_check_gitcookies_not_configured(self):
3179 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003180 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003181 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003182 self.calls = [
3183 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3184 (('os.path.exists', '~/.netrc'), True),
3185 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3186 'or Ctrl+C to abort'), ''),
3187 ((['git', 'config', '--global', 'http.cookiefile',
3188 os.path.expanduser('~/.gitcookies')], ), ''),
3189 ]
3190 self.assertEqual(0, git_cl.main(['creds-check']))
3191 self.assertRegexpMatches(
3192 sys.stdout.getvalue(),
3193 '^You seem to be using outdated .netrc for git credentials:')
3194 self.assertRegexpMatches(
3195 sys.stdout.getvalue(),
3196 '\nConfigured git to use .gitcookies from')
3197
3198 def test_creds_check_gitcookies_configured_custom_broken(self):
3199 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003200 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003201 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003202 self.calls = [
3203 ((['git', 'config', '--global', 'http.cookiefile'],),
3204 '/custom/.gitcookies'),
3205 (('os.path.exists', '/custom/.gitcookies'), False),
3206 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3207 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3208 ((['git', 'config', '--global', 'http.cookiefile',
3209 os.path.expanduser('~/.gitcookies')], ), ''),
3210 ]
3211 self.assertEqual(0, git_cl.main(['creds-check']))
3212 self.assertRegexpMatches(
3213 sys.stdout.getvalue(),
3214 'WARNING: you have configured custom path to .gitcookies: ')
3215 self.assertRegexpMatches(
3216 sys.stdout.getvalue(),
3217 'However, your configured .gitcookies file is missing.')
3218
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003219 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003220 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3221 lambda _, message: self._mocked_call('AddComment', message))
3222 self.calls = [
3223 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3224 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3225 (('AddComment', 'msg'), ''),
3226 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003227 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3228 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003229
3230 def test_git_cl_comment_add_gerrit(self):
3231 self.mock(git_cl.gerrit_util, 'SetReview',
3232 lambda host, change, msg:
3233 self._mocked_call('SetReview', host, change, msg))
3234 self.calls = [
3235 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3236 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3237 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3238 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3239 'origin/master'),
3240 ((['git', 'config', 'remote.origin.url'],),
3241 'https://chromium.googlesource.com/infra/infra'),
3242 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3243 ]
3244 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3245 '-a', 'msg']))
3246
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003247 def test_git_cl_comments_fetch_rietveld(self):
3248 self.mock(sys, 'stdout', StringIO.StringIO())
3249 self.calls = [
3250 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3251 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3252 ] * 2
3253 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3254 'messages': [
3255 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3256 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3257 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3258 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3259 # Intentionally wrong order here.
3260 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3261 'disapproval': False, 'approval': False,
3262 'sender': 'owner@example.com'},
3263 ],
3264 'owner_email': 'owner@example.com',
3265 })
3266 expected_comments_summary = [
3267 git_cl._CommentSummary(
3268 message='lgtm',
3269 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3270 disapproval=False, approval=True, sender='r@example.com'),
3271 git_cl._CommentSummary(
3272 message='not lgtm',
3273 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3274 disapproval=True, approval=False, sender='r2@example.com'),
3275 # Note: same order as in whatever Rietveld returns.
3276 git_cl._CommentSummary(
3277 message='PTAL',
3278 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3279 disapproval=False, approval=False, sender='owner@example.com'),
3280 ]
3281 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3282 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3283
3284 with git_cl.gclient_utils.temporary_directory() as tempdir:
3285 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3286 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3287 '-j', out_file]))
3288 with open(out_file) as f:
3289 read = json.load(f)
3290 self.assertEqual(len(read), 3)
3291 self.assertEqual(read[0], {
3292 'date': '2000-03-13 20:49:34.515270',
3293 'message': 'PTAL',
3294 'approval': False,
3295 'disapproval': False,
3296 'sender': 'owner@example.com'})
3297 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3298 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3299
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003300 def test_git_cl_comments_fetch_gerrit(self):
3301 self.mock(sys, 'stdout', StringIO.StringIO())
3302 self.calls = [
3303 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3304 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3305 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3306 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3307 'origin/master'),
3308 ((['git', 'config', 'remote.origin.url'],),
3309 'https://chromium.googlesource.com/infra/infra'),
3310 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3311 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3312 'owner': {'email': 'owner@example.com'},
3313 'messages': [
3314 {
3315 u'_revision_number': 1,
3316 u'author': {
3317 u'_account_id': 1111084,
3318 u'email': u'commit-bot@chromium.org',
3319 u'name': u'Commit Bot'
3320 },
3321 u'date': u'2017-03-15 20:08:45.000000000',
3322 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3323 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3324 u'tag': u'autogenerated:cq:dry-run'
3325 },
3326 {
3327 u'_revision_number': 2,
3328 u'author': {
3329 u'_account_id': 11151243,
3330 u'email': u'owner@example.com',
3331 u'name': u'owner'
3332 },
3333 u'date': u'2017-03-16 20:00:41.000000000',
3334 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3335 u'message': u'PTAL',
3336 },
3337 {
3338 u'_revision_number': 2,
3339 u'author': {
3340 u'_account_id': 148512 ,
3341 u'email': u'reviewer@example.com',
3342 u'name': u'reviewer'
3343 },
3344 u'date': u'2017-03-17 05:19:37.500000000',
3345 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3346 u'message': u'Patch Set 2: Code-Review+1',
3347 },
3348 ]
3349 })
3350 ] * 2
3351 expected_comments_summary = [
3352 git_cl._CommentSummary(
3353 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3354 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3355 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3356 git_cl._CommentSummary(
3357 message=u'PTAL',
3358 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3359 disapproval=False, approval=False, sender=u'owner@example.com'),
3360 git_cl._CommentSummary(
3361 message=u'Patch Set 2: Code-Review+1',
3362 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3363 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3364 ]
3365 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3366 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3367
3368 with git_cl.gclient_utils.temporary_directory() as tempdir:
3369 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3370 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3371 '-j', out_file]))
3372 with open(out_file) as f:
3373 read = json.load(f)
3374 self.assertEqual(len(read), 3)
3375 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3376 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3377 self.assertEqual(read[2], {
3378 u'date': u'2017-03-17 05:19:37.500000',
3379 u'message': u'Patch Set 2: Code-Review+1',
3380 u'approval': False,
3381 u'disapproval': False,
3382 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003383
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003384if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003385 logging.basicConfig(
3386 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003387 unittest.main()