blob: 32c6c290574d7666363099d334c5c289aeb91129 [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
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +020010import itertools
tandriide281ae2016-10-12 06:02:30 -070011import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010012import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000013import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000014import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000015import sys
16import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000017import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000018
19sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
20
21from testing_support.auto_stub import TestCase
22
23import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000024import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000025import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000027
tandrii5d48c322016-08-18 16:19:37 -070028def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
29 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
30
31
32CERR1 = callError(1)
33
34
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000035class ChangelistMock(object):
36 # A class variable so we can access it when we don't have access to the
37 # instance that's being set.
38 desc = ""
39 def __init__(self, **kwargs):
40 pass
41 def GetIssue(self):
42 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080043 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000044 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070045 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000046 ChangelistMock.desc = desc
47
tandrii5d48c322016-08-18 16:19:37 -070048
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000049class PresubmitMock(object):
50 def __init__(self, *args, **kwargs):
51 self.reviewers = []
52 @staticmethod
53 def should_continue():
54 return True
55
56
57class RietveldMock(object):
58 def __init__(self, *args, **kwargs):
59 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000060
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000061 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080062 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000063 return 'Issue: %d' % issue
64
maruel@chromium.org78936cb2013-04-11 00:17:52 +000065 @staticmethod
66 def get_issue_properties(_issue, _messages):
67 return {
68 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
69 'messages': [
70 {
71 'approval': True,
72 'sender': 'john@chromium.org',
73 },
74 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010075 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000076 }
77
iannuccie53c9352016-08-17 14:40:40 -070078 @staticmethod
79 def close_issue(_issue):
80 return 'Closed'
81
skobes6468b902016-10-24 08:45:10 -070082 @staticmethod
83 def get_patch(issue, patchset):
84 return 'patch set from issue %s patchset %s' % (issue, patchset)
85
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010086 @staticmethod
87 def update_description(_issue, _description):
88 return 'Updated'
89
90 @staticmethod
91 def add_comment(_issue, _comment):
92 return 'Commented'
93
94
95
skobes6468b902016-10-24 08:45:10 -070096
97class GitCheckoutMock(object):
98 def __init__(self, *args, **kwargs):
99 pass
100
101 @staticmethod
102 def reset():
103 GitCheckoutMock.conflict = False
104
105 def apply_patch(self, p):
106 if GitCheckoutMock.conflict:
107 raise Exception('failed')
108
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000109
110class WatchlistsMock(object):
111 def __init__(self, _):
112 pass
113 @staticmethod
114 def GetWatchersForPaths(_):
115 return ['joe@example.com']
116
117
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000118class CodereviewSettingsFileMock(object):
119 def __init__(self):
120 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800121 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000122 def read(self):
123 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000124 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000125
126
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000127class AuthenticatorMock(object):
128 def __init__(self, *_args):
129 pass
130 def has_cached_credentials(self):
131 return True
tandrii221ab252016-10-06 08:12:04 -0700132 def authorize(self, http):
133 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000134
135
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100136def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000137 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
138
139 Usage:
140 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100141 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000142
143 OR
144 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100145 CookiesAuthenticatorMockFactory(
146 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 """
148 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800149 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000150 # Intentionally not calling super() because it reads actual cookie files.
151 pass
152 @classmethod
153 def get_gitcookies_path(cls):
154 return '~/.gitcookies'
155 @classmethod
156 def get_netrc_path(cls):
157 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100158 def _get_auth_for_host(self, host):
159 if same_auth:
160 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000161 return (hosts_with_creds or {}).get(host)
162 return CookiesAuthenticatorMock
163
kmarshall9249e012016-08-23 12:02:16 -0700164class MockChangelistWithBranchAndIssue():
165 def __init__(self, branch, issue):
166 self.branch = branch
167 self.issue = issue
168 def GetBranch(self):
169 return self.branch
170 def GetIssue(self):
171 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000172
tandriic2405f52016-10-10 08:13:15 -0700173
174class SystemExitMock(Exception):
175 pass
176
177
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000178class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100179 def test_get_description(self):
180 cl = git_cl.Changelist(issue=1, codereview='rietveld',
181 codereview_host='host')
182 cl.description = 'x'
183 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800184 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100185 self.assertEquals(cl.GetDescription(), 'x')
186 self.assertEquals(cl.GetDescription(force=True), 'y')
187 self.assertEquals(cl.GetDescription(), 'y')
188
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700189 def test_description_footers(self):
190 cl = git_cl.Changelist(issue=1, codereview='gerrit',
191 codereview_host='host')
192 cl.description = '\n'.join([
193 'This is some message',
194 '',
195 'It has some lines',
196 'and, also',
197 '',
198 'Some: Really',
199 'Awesome: Footers',
200 ])
201 cl.has_description = True
202 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
203 msg, footers = cl.GetDescriptionFooters()
204 self.assertEquals(
205 msg, ['This is some message', '', 'It has some lines', 'and, also'])
206 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
207
208 msg.append('wut')
209 footers.append(('gnarly-dude', 'beans'))
210 cl.UpdateDescriptionFooters(msg, footers)
211 self.assertEquals(cl.GetDescription().splitlines(), [
212 'This is some message',
213 '',
214 'It has some lines',
215 'and, also',
216 'wut'
217 '',
218 'Some: Really',
219 'Awesome: Footers',
220 'Gnarly-Dude: beans',
221 ])
222
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000223 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
224 parsed = urlparse.urlparse(url)
225 result = func(parsed)
226 if fail:
227 self.assertIsNone(result)
228 return None
229 self.assertIsNotNone(result)
230 self.assertEqual(result.issue, issue)
231 self.assertEqual(result.patchset, patchset)
232 self.assertEqual(result.hostname, hostname)
233 return result
234
235 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700236 def test(url, issue=None, patchset=None, hostname=None, fail=None):
237 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000238 git_cl._RietveldChangelistImpl.ParseIssueURL,
239 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000240
241 test('http://codereview.chromium.org/123',
242 123, None, 'codereview.chromium.org')
243 test('https://codereview.chromium.org/123',
244 123, None, 'codereview.chromium.org')
245 test('https://codereview.chromium.org/123/',
246 123, None, 'codereview.chromium.org')
247 test('https://codereview.chromium.org/123/whatever',
248 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700249 test('https://codereview.chromium.org/123/#ps20001',
250 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000251 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700252 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000253 # This looks like bad Gerrit, but is actually valid Rietveld.
254 test('https://chrome-review.source.com/123/4/',
255 123, None, 'chrome-review.source.com')
256
257 test('https://codereview.chromium.org/deadbeaf', fail=True)
258 test('https://codereview.chromium.org/api/123', fail=True)
259 test('bad://codereview.chromium.org/123', fail=True)
260 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
261
262 def test_ParseIssueURL_gerrit(self):
263 def test(url, issue=None, patchset=None, hostname=None, fail=None):
264 self._test_ParseIssueUrl(
265 git_cl._GerritChangelistImpl.ParseIssueURL,
266 url, issue, patchset, hostname, fail)
267
268 test('http://chrome-review.source.com/c/123',
269 123, None, 'chrome-review.source.com')
270 test('https://chrome-review.source.com/c/123/',
271 123, None, 'chrome-review.source.com')
272 test('https://chrome-review.source.com/c/123/4',
273 123, 4, 'chrome-review.source.com')
274 test('https://chrome-review.source.com/#/c/123/4',
275 123, 4, 'chrome-review.source.com')
276 test('https://chrome-review.source.com/c/123/4',
277 123, 4, 'chrome-review.source.com')
278 test('https://chrome-review.source.com/123',
279 123, None, 'chrome-review.source.com')
280 test('https://chrome-review.source.com/123/4',
281 123, 4, 'chrome-review.source.com')
282
283 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
284 test('https://chrome-review.source.com/c/abc/', fail=True)
285 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
286
287 def test_ParseIssueNumberArgument(self):
288 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
289 result = git_cl.ParseIssueNumberArgument(arg)
290 self.assertIsNotNone(result)
291 if fail:
292 self.assertFalse(result.valid)
293 else:
294 self.assertEqual(result.issue, issue)
295 self.assertEqual(result.patchset, patchset)
296 self.assertEqual(result.hostname, hostname)
297
298 test('123', 123)
299 test('', fail=True)
300 test('abc', fail=True)
301 test('123/1', fail=True)
302 test('123a', fail=True)
303 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
304 # Rietveld.
305 test('https://codereview.source.com/123',
306 123, None, 'codereview.source.com')
307 test('https://codereview.source.com/www123', fail=True)
308 # 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
Jochen Eisinger72606f82017-04-04 10:44:18 +0200688 def test_LoadCodereviewSettingsFromFile_owners_status(self):
689 codereview_file = StringIO.StringIO('OWNERS_STATUS_FILE: status')
690 self.calls = [
691 ((['git', 'config', '--unset-all', 'rietveld.server'],), ''),
692 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
693 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
694 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
695 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
696 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
697 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
698 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
699 CERR1),
700 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
701 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
702 CERR1),
703 ((['git', 'config', 'rietveld.owners-status-file', 'status'],), ''),
704 ]
705 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
706
maruel@chromium.orga3353652011-11-30 14:26:57 +0000707 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000708 def _is_gerrit_calls(cls, gerrit=False):
709 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
710 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
711
712 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000713 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000714 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000715 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000716
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000717 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000718 def _upload_no_rev_calls(cls, similarity, find_copies):
719 return (cls._git_base_calls(similarity, find_copies) +
720 cls._git_upload_no_rev_calls())
721
722 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000723 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000724 if similarity is None:
725 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700726 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700727 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000728 else:
tandrii33a46ff2016-08-23 05:53:40 -0700729 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700730 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000731
732 if find_copies is None:
733 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700734 find_copies_call = ((['git', 'config', '--bool',
735 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000736 else:
tandrii5d48c322016-08-18 16:19:37 -0700737 val = str(find_copies).lower()
738 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000739 'branch.master.git-find-copies', val],), '')
740
741 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000742 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800743 '-l100000', '-C'+similarity,
744 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000745 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000746 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000747 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000748
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000749 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000750 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000751 similarity_call,
752 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
753 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000754 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000755 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700756 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
757 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000758 ((['git', 'config', 'rietveld.server'],),
759 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000760 ((['git', 'config', 'branch.master.merge'],), 'master'),
761 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000762 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000763 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000764 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000765 ((['git', 'rev-parse', '--show-cdup'],), ''),
766 ((['git', 'rev-parse', 'HEAD'],), '12345'),
767 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000768 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000769 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700770 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000771 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000772 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000773 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000774 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000775 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000776 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000777 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000778 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700779 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000780 ]
781
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000782 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000783 def _git_upload_no_rev_calls(cls):
784 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000786 ]
787
788 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000789 def _git_upload_calls(cls, private):
790 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000791 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000792 private_call = []
793 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000794 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000795 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000796 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000797
maruel@chromium.orga3353652011-11-30 14:26:57 +0000798 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000799 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000800 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000801 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800802 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000803 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700804 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000805 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000806 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000807 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700808 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000809 ] + cls._git_post_upload_calls()
810
811 @classmethod
812 def _git_post_upload_calls(cls):
813 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000814 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
815 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
816 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000817 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000818 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000819 ]
820
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000821 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000822 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000823 fake_ancestor = 'fake_ancestor'
824 fake_cl = 'fake_cl_for_patch'
825 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000826 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000827 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000828 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000829 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000830 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000831 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000832 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000833 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700834 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000835 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000836 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000837 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000838 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000839 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000840 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000841 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000842 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000844 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000845 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000846
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000847 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700848 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000849 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000850 return [
851 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000852 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000853 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000854 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700855 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000856 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000857 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100858 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000859 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000860 ]
861
862 def _run_reviewer_test(
863 self,
864 upload_args,
865 expected_description,
866 returned_description,
867 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000868 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700869 private=False,
870 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000871 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000872 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000873 try:
874 similarity = upload_args[upload_args.index('--similarity')+1]
875 except ValueError:
876 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000877
878 if '--find-copies' in upload_args:
879 find_copies = True
880 elif '--no-find-copies' in upload_args:
881 find_copies = False
882 else:
883 find_copies = None
884
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000885 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700886 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000887
888 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000889
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000890 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000891 self.assertEquals(
892 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000893 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000894 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000895 '#--------------------This line is 72 characters long'
896 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897 expected_description,
898 desc)
899 return returned_description
900 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000901
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000902 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000903 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700904 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000905 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000906 return 1, 2
907 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000908
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000909 git_cl.main(['upload'] + upload_args)
910
911 def test_no_reviewer(self):
912 self._run_reviewer_test(
913 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000914 'desc\n\nBUG=',
915 '# Blah blah comment.\ndesc\n\nBUG=',
916 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000917 [])
918
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000919 def test_keep_similarity(self):
920 self._run_reviewer_test(
921 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000922 'desc\n\nBUG=',
923 '# Blah blah comment.\ndesc\n\nBUG=',
924 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000925 [])
926
iannucci@chromium.org79540052012-10-19 23:15:26 +0000927 def test_keep_find_copies(self):
928 self._run_reviewer_test(
929 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000930 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000931 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000932 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000933 [])
934
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000935 def test_private(self):
936 self._run_reviewer_test(
937 ['--private'],
938 'desc\n\nBUG=',
939 '# Blah blah comment.\ndesc\n\nBUG=\n',
940 'desc\n\nBUG=',
941 [])
942
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000943 def test_reviewers_cmd_line(self):
944 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000945 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000946 self._run_reviewer_test(
947 ['-r' 'foo@example.com'],
948 description,
949 '\n%s\n' % description,
950 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000951 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000952
953 def test_reviewer_tbr_overriden(self):
954 # Reviewer is overriden with TBR
955 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000956 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000957 self._run_reviewer_test(
958 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000959 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000960 description.strip('\n'),
961 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000962 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000963
964 def test_reviewer_multiple(self):
965 # Handles multiple R= or TBR= lines.
966 description = (
bradnelsond975b302016-10-23 12:20:23 -0700967 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
968 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000969 self._run_reviewer_test(
970 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000971 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000972 description,
973 description,
bradnelsond975b302016-10-23 12:20:23 -0700974 ['--reviewers=another@example.com,reviewer@example.com'],
975 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000976
maruel@chromium.orga3353652011-11-30 14:26:57 +0000977 def test_reviewer_send_mail(self):
978 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000979 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000980 self._run_reviewer_test(
981 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000982 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000983 description.strip('\n'),
984 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000985 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000986
987 def test_reviewer_send_mail_no_rev(self):
988 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000989 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700990 self.calls = self._upload_no_rev_calls(None, None) + [
991 ((['DieWithError', 'Must specify reviewers to send email.'],),
992 SystemExitMock())
993 ]
994
995 def RunEditor(desc, _, **kwargs):
996 return desc
997 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
998 self.mock(sys, 'stdout', stdout)
999 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001000 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -07001001 self.assertEqual(
1002 'Using 50% similarity for rename/copy detection. Override with '
1003 '--similarity.\n',
1004 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001005
tandriif9aefb72016-07-01 09:06:51 -07001006 def test_bug_on_cmd(self):
1007 self._run_reviewer_test(
1008 ['--bug=500658,proj:123'],
1009 'desc\n\nBUG=500658\nBUG=proj:123',
1010 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1011 'desc\n\nBUG=500658\nBUG=proj:1234',
1012 [])
1013
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001014 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1015 parent_msg=None,
1016 new_msg=None,
1017 fail_after_parent_msg=False,
1018 fail_cherry_pick=False,
1019 fail_push_count=0,
1020 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001021 if debug:
1022 # Very useful due to finally clause in git cl land raising exceptions and
1023 # shadowing real cause of failure.
1024 self.mock(git_cl, '_IS_BEING_TESTED', True)
1025 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001026 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001027
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001028 if git_numberer_enabled:
1029 # Special mocks to check validity of timestamp.
1030 original_git_amend_head = git_cl._git_amend_head
1031 def _git_amend_head_mock(msg, tstamp):
1032 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1033 return original_git_amend_head(msg, tstamp)
1034 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1035
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001036 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1037 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001038 self.mock(RietveldMock, 'update_description', staticmethod(
1039 lambda i, d: self._mocked_call(['update_description', i, d])))
1040 self.mock(RietveldMock, 'add_comment', staticmethod(
1041 lambda i, c: self._mocked_call(['add_comment', i, c])))
1042 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001043 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1044 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1045 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1046 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1047 CERR1),
1048 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1049 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001050 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001051 ((['git', 'config', 'rietveld.server'],),
1052 'https://codereview.chromium.org'),
1053 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1054 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1055 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1056 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001057 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1058 ''), # No commits to rebase, according to local view of origin.
1059 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1060 'fake_ancestor_sha'),
1061 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1062 ((['git', 'rev-parse', '--show-cdup'],), ''),
1063 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1064 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1065 'fake_ancestor_sha...', '.'],),
1066 'M\tfile1.cpp'),
1067 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1068 ((['git', 'config', 'branch.feature.rietveldserver'],),
1069 'https://codereview.chromium.org'),
1070 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1071 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1072 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1073 'fake_ancestor_sha', 'feature'],),
1074 # This command just prints smth like this:
1075 # file1.cpp | 53 ++++++--
1076 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1077 ''),
1078 ((['git', 'show-ref', '--quiet', '--verify',
1079 'refs/heads/git-cl-commit'],),
1080 ''), # 0 return code means branch exists.
1081 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1082 ((['git', 'show-ref', '--quiet', '--verify',
1083 'refs/heads/git-cl-cherry-pick'],),
1084 CERR1), # This means git-cl-cherry-pick branch does not exist.
1085 ((['git', 'rev-parse', '--show-cdup'],), ''),
1086 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1087 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1088 ((['git', 'commit', '-m',
1089 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001090 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001091 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1092 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1093 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001094 repo_url),
1095
1096 ((['git', 'config', 'remote.origin.url'],), repo_url),
1097 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1098 git_numberer_enabled),
1099
1100 # Auto-rebase init.
1101 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1102 ]
1103 # Auto-rebase loops.
1104 for attempt in xrange(fail_push_count + 1):
1105 self.calls += [
1106 # Auto-rebase loop start.
1107 ((['git', 'retry', 'fetch', 'origin',
1108 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1109 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1110 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1111 # different in each loop iteration for truly realistic test.
1112 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1113 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1114 callError(1, 'failed to cherry pick') if fail_cherry_pick
1115 else ''),
1116 ]
1117 if fail_cherry_pick:
1118 return
1119
1120 if git_numberer_enabled:
1121 assert parent_msg
1122 self.calls += [
1123 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1124 parent_msg),
1125 ]
1126 if fail_after_parent_msg:
1127 return
1128 assert new_msg
1129 self.calls += [
1130 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1131 '1480022355'), # Committer's unix timestamp.
1132 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1133 '1480024000'),
1134 ((['git_amend_head committer timestamp', 1480024000],), ''),
1135 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1136 ]
1137 self.calls += [
1138 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1139 CERR1 if attempt < fail_push_count else ''),
1140 ]
1141 # End of autorebase + push.
1142
1143 self.calls += [
1144 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1145 ]
1146 if git_numberer_enabled:
1147 self.calls += [
1148 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1149 ]
1150
1151 # Cleanup calls.
1152 self.calls += [
1153 ((['git', 'checkout', '-q', 'feature'],), ''),
1154 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1155 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001156 ]
1157
1158 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001159 self._land_rietveld_calls(
1160 repo_url='https://chromium.googlesource.com/infra/infra',
1161 git_numberer_enabled=False,
1162 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001163 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001164 ((['git', 'config', 'rietveld.viewvc-url'],),
1165 'https://chromium.googlesource.com/infra/infra/+/'),
1166 ((['update_description', 123,
1167 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001168 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001169 ''),
1170 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001171 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001172 ]
1173 git_cl.main(['land'])
1174
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001175 def test_land_rietveld_fail_cherry_pick(self):
1176 self._land_rietveld_calls(
1177 repo_url='https://chromium.googlesource.com/infra/infra',
1178 git_numberer_enabled=False,
1179 fail_cherry_pick=True,
1180 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001181 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001182 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1183 'U path/file1\n'
1184 'U file2.cpp\n'),
1185 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001186 ((['git', 'checkout', '-q', 'feature'],), ''),
1187 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001188 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1189 ]
1190 git_cl.main(['land'])
1191
1192 def test_land_rietveld_git_numberer_fail_1_push(self):
1193 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1194
1195 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1196 self._land_rietveld_calls(
1197 repo_url='https://chromium.googlesource.com/chromium/src',
1198 git_numberer_enabled=True,
1199 parent_msg=('This is parent commit.\n'
1200 '\n'
1201 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1202 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1203 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1204 '\n'
1205 'Review-Url: https://codereview.chromium.org/123 .\n'
1206 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1207 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1208 fail_push_count=fail_push_count,
1209 debug=False)
1210
1211 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001212 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001213 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001214 ((['update_description', 123,
1215 'Issue: 123\n\nR=john@chromium.org\n'
1216 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001217 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001218 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1219 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1220 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001221 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001222 ''),
1223 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001224 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001225 ]
1226 git_cl.main(['land'])
1227
1228 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001229 self._land_rietveld_calls(
1230 repo_url='https://chromium.googlesource.com/v8/v8',
1231 git_numberer_enabled=True,
1232 parent_msg='This is parent commit with no footer.',
1233 fail_after_parent_msg=True,
1234 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001235 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001236 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001237 ((['git', 'checkout', '-q', 'feature'],), ''),
1238 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001239 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001240 ]
1241 with self.assertRaises(ValueError) as cm:
1242 git_cl.main(['land'])
1243 self.assertEqual(cm.exception.message,
1244 'Unable to infer commit position from footers')
1245
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001246 def test_git_numberer_not_whitelisted_repo(self):
1247 self.calls = []
1248 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001249 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1250 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001251 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001252
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001253 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001254 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1255 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'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001258 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001259 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001260 remote_url='https://chromium.googlesource.com/chromium/src',
1261 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001262 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001263
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001264 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001265 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001266 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001267 def fake_temporary_directory(**kwargs):
1268 yield tempdir
1269 self.mock(git_cl.gclient_utils, 'temporary_directory',
1270 fake_temporary_directory)
1271 self._test_GitNumbererState_valid_configs_inner(tempdir)
1272
1273 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001274 self.calls = [
1275 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001276 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001277 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1278 '''
1279 [plugin "git-numberer"]
1280 validate-enabled-refglob = refs/else/*
1281 validate-enabled-refglob = refs/heads/*
1282 validate-disabled-refglob = refs/heads/disabled
1283 validate-disabled-refglob = refs/branch-heads/*
1284 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001285 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1286 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001287 'refs/else/*\n'
1288 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001289 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1290 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001291 'refs/heads/disabled\n'
1292 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001293 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001294
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001295 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001296 remote_url='https://chromium.googlesource.com/chromium/src',
1297 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001298 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001299
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001300 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001301 remote_url='https://chromium.googlesource.com/chromium/src',
1302 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001303 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001304
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001305 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001306 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001307 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001308 remote_url='https://chromium.googlesource.com/chromium/src',
1309 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001310 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001311
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001312 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001313 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001314 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001315 if skip_auth_check:
1316 return [((cmd, ), 'true')]
1317
tandrii5d48c322016-08-18 16:19:37 -07001318 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001319 if issue:
1320 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001321 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001322 ])
1323 calls.extend([
1324 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1325 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1326 ((['git', 'config', 'remote.origin.url'],),
1327 'https://chromium.googlesource.com/my/repo'),
1328 ((['git', 'config', 'remote.origin.url'],),
1329 'https://chromium.googlesource.com/my/repo'),
1330 ])
1331 return calls
1332
1333 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001334 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001335 fetched_status=None, other_cl_owner=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001336 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001337 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001338 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001339 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001340 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001341 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1342 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001343 ]
1344 calls += cls._is_gerrit_calls(True)
1345 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001346 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001347 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1348 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001349 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001350 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001351 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001352 ((['get_or_create_merge_base', 'master',
1353 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001354 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001355 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001356 ]
1357 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1358
1359 if issue:
1360 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001361 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001362 '123456',
1363 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001364 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001365 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001366 'change_id': '123456789',
1367 'current_revision': 'sha1_of_current_revision',
1368 'revisions': { 'sha1_of_current_revision': {
1369 'commit': {'message': fetched_description},
1370 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001371 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001372 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001373 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001374 if fetched_status == 'ABANDONED':
1375 calls += [
1376 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1377 '123456 has been abandoned, new uploads are not '
1378 'allowed'), SystemExitMock()),
1379 ]
1380 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001381 if other_cl_owner:
1382 calls += [
1383 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1384 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001385
1386 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1387 get_remote_branch=False)
1388 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001389 ((['git', 'rev-parse', '--show-cdup'],), ''),
1390 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001391
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001392 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001393 'diff', '--name-status', '--no-renames', '-r',
1394 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001395 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001396 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001397 ]
1398
1399 if not issue:
1400 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001401 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001402 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001403 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001404 ]
1405
1406 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001407 ((['git', 'config', 'user.email'],), 'me@example.com'),
1408 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001409 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1410 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001411 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001412 ]
1413 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001414
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001415 @classmethod
1416 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001417 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001418 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001419 push_opts=None, title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001420 post_amend_description=None, issue=None, cc=None,
1421 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001422 if post_amend_description is None:
1423 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001424 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001425 cc = cc or []
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001426 push_opts = push_opts or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001427
tandriia60502f2016-06-20 02:01:53 -07001428 if squash_mode == 'default':
1429 calls.extend([
1430 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1431 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1432 ])
1433 elif squash_mode in ('override_squash', 'override_nosquash'):
1434 calls.extend([
1435 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1436 'true' if squash_mode == 'override_squash' else 'false'),
1437 ])
1438 else:
1439 assert squash_mode in ('squash', 'nosquash')
1440
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001441 # If issue is given, then description is fetched from Gerrit instead.
1442 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001443 calls += [
1444 ((['git', 'log', '--pretty=format:%s\n\n%b',
1445 'fake_ancestor_sha..HEAD'],),
1446 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001447 if squash:
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001448 title = 'Initial upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001449 else:
1450 if not title:
1451 calls += [
1452 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001453 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001454 ]
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001455 title = 'User input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001456 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001457 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001458 # DownloadGerritHook(False)
1459 ((False, ),
1460 ''),
1461 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001462 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001463 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001464 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001465 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001466 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001467 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001468 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001469 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001470 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001471 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001472 if not issue:
1473 # Prompting to edit description on first upload.
1474 calls += [
1475 ((['git', 'config', 'core.editor'],), ''),
1476 ((['RunEditor'],), description),
1477 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001478 ref_to_push = 'abcdef0123456789'
1479 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001480 ((['git', 'config', 'branch.master.merge'],),
1481 'refs/heads/master'),
1482 ((['git', 'config', 'branch.master.remote'],),
1483 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001484 ((['get_or_create_merge_base', 'master',
1485 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001486 'origin/master'),
1487 ((['git', 'rev-parse', 'HEAD:'],),
1488 '0123456789abcdef'),
1489 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001490 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001491 ref_to_push),
1492 ]
1493 else:
1494 ref_to_push = 'HEAD'
1495
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001496 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001497 ((['git', 'rev-list',
1498 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001499 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001500
Aaron Gable9b713dd2016-12-14 16:04:21 -08001501 if title:
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001502 push_opts += ['m=' + title]
Aaron Gable9b713dd2016-12-14 16:04:21 -08001503
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001504 push_opts += ['notify=%s' % ('ALL' if notify else 'NONE')]
1505 push_opts += ['r=%s' % email for email in sorted(reviewers or [])]
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001506
1507 if git_mirror is None:
1508 calls += [
1509 ((['git', 'config', 'remote.origin.url'],),
1510 'https://chromium.googlesource.com/yyy/zzz'),
1511 ]
1512 else:
1513 calls += [
1514 ((['git', 'config', 'remote.origin.url'],),
1515 '/cache/this-dir-exists'),
1516 (('os.path.isdir', '/cache/this-dir-exists'),
1517 True),
1518 # Runs in /cache/this-dir-exists.
1519 ((['git', 'config', 'remote.origin.url'],),
1520 'https://chromium.googlesource.com/yyy/zzz'),
1521 ]
1522
ukai@chromium.orge8077812012-02-03 03:41:46 +00001523 calls += [
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001524 ((['git', 'push'] +
1525 list(itertools.chain(*(['-o', opt] for opt in sorted(push_opts)))) +
1526 ['https://chromium.googlesource.com/yyy/zzz',
1527 ref_to_push + ':refs/for/refs/heads/master'],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001528 ('remote:\n'
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001529 'remote: Processing changes: (\)\n'
1530 'remote: Processing changes: (|)\n'
1531 'remote: Processing changes: (/)\n'
1532 'remote: Processing changes: (-)\n'
1533 'remote: Processing changes: new: 1 (/)\n'
1534 'remote: Processing changes: new: 1, done\n'
1535 'remote:\n'
1536 'remote: New Changes:\n'
1537 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1538 'remote:\n'
1539 'To https://chromium.googlesource.com/yyy/zzz\n'
1540 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001541 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001542 if squash:
1543 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001544 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001545 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001546 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001547 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001548 ((['git', 'config', 'branch.master.gerritsquashhash',
1549 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001550 ]
tandrii88189772016-09-29 04:29:57 -07001551 calls += [
1552 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001553 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001554 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001555 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001556 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001557 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001558 return calls
1559
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001560 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001561 self,
1562 upload_args,
1563 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001564 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001565 squash=True,
1566 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001567 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001568 push_opts=None,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001569 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001570 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001571 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001572 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001573 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001574 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001575 fetched_status=None,
1576 other_cl_owner=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001577 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001578 if squash_mode is None:
1579 if '--no-squash' in upload_args:
1580 squash_mode = 'nosquash'
1581 elif '--squash' in upload_args:
1582 squash_mode = 'squash'
1583 else:
1584 squash_mode = 'default'
1585
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001586 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001587 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001588 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001589 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001590 CookiesAuthenticatorMockFactory(
1591 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001592 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1593 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001594 self.mock(git_cl.gclient_utils, 'RunEditor',
1595 lambda *_, **__: self._mocked_call(['RunEditor']))
1596 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1597
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001598 original_os_path_isdir = os.path.isdir
1599 def selective_os_path_isdir_mock(path):
1600 if path == '/cache/this-dir-exists':
1601 return self._mocked_call('os.path.isdir', path)
1602 return original_os_path_isdir(path)
1603 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1604
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001605 self.calls = self._gerrit_base_calls(
1606 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001607 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001608 fetched_status=fetched_status,
1609 other_cl_owner=other_cl_owner)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001610 if fetched_status != 'ABANDONED':
1611 self.calls += self._gerrit_upload_calls(
1612 description, reviewers, squash,
1613 squash_mode=squash_mode,
1614 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001615 push_opts=push_opts, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001616 post_amend_description=post_amend_description,
1617 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001618 # Uncomment when debugging.
1619 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001620 git_cl.main(['upload'] + upload_args)
1621
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001622 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001623 self._run_gerrit_upload_test(
1624 ['--no-squash'],
1625 'desc\n\nBUG=\n',
1626 [],
1627 squash=False,
1628 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1629
1630 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001631 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001632 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001633 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001634 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001635 [],
tandriia60502f2016-06-20 02:01:53 -07001636 squash=False,
1637 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001638 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001639
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001640 def test_gerrit_no_reviewer(self):
1641 self._run_gerrit_upload_test(
1642 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001643 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001644 [],
1645 squash=False,
1646 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001647
ukai@chromium.orge8077812012-02-03 03:41:46 +00001648 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001649 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001650 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001651 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001652 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001653 squash=False,
1654 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001655 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001656
1657 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001658 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001659 [],
bradnelsond975b302016-10-23 12:20:23 -07001660 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1661 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001662 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001663 ['reviewer@example.com', 'another@example.com'],
1664 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001665 squash_mode='override_nosquash',
Andrii Shyshkalov0267fd22017-04-05 14:35:18 +02001666 push_opts=['l=Code-Review+1'],
bradnelsond975b302016-10-23 12:20:23 -07001667 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001668
1669 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001670 self._run_gerrit_upload_test(
1671 [],
1672 'desc\nBUG=\n\nChange-Id: 123456789',
1673 [],
1674 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001675
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001676 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001677 self._run_gerrit_upload_test(
1678 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001679 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001680 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001681 squash=True,
1682 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001683
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001684 def test_gerrit_upload_squash_first_with_mirror(self):
1685 self._run_gerrit_upload_test(
1686 ['--squash'],
1687 'desc\nBUG=\n\nChange-Id: 123456789',
1688 [],
1689 squash=True,
1690 expected_upstream_ref='origin/master',
1691 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1692
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001693 def test_gerrit_upload_squash_reupload(self):
1694 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001695 self._run_gerrit_upload_test(
1696 ['--squash'],
1697 description,
1698 [],
1699 squash=True,
1700 expected_upstream_ref='origin/master',
1701 issue=123456)
1702
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001703 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1704 self.mock(git_cl, 'DieWithError',
1705 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1706 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1707 with self.assertRaises(SystemExitMock):
1708 self._run_gerrit_upload_test(
1709 ['--squash'],
1710 description,
1711 [],
1712 squash=True,
1713 expected_upstream_ref='origin/master',
1714 issue=123456,
1715 fetched_status='ABANDONED')
1716
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001717 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1718 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1719 lambda *_, **__: {'email': 'yet-another@example.com'})
1720 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1721 self._run_gerrit_upload_test(
1722 ['--squash'],
1723 description,
1724 [],
1725 squash=True,
1726 expected_upstream_ref='origin/master',
1727 issue=123456,
1728 other_cl_owner='other@example.com')
1729 self.assertIn(
1730 'WARNING: change 123456 is owned by other@example.com, but you '
1731 'authenticate to Gerrit as yet-another@example.com.\n'
1732 'Uploading may fail due to lack of permissions',
1733 git_cl.sys.stdout.getvalue())
1734
rmistry@google.com2dd99862015-06-22 12:22:18 +00001735 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001736 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001737 def mock_run_git(*args, **_kwargs):
1738 if args[0] == ['for-each-ref',
1739 '--format=%(refname:short) %(upstream:short)',
1740 'refs/heads']:
1741 # Create a local branch dependency tree that looks like this:
1742 # test1 -> test2 -> test3 -> test4 -> test5
1743 # -> test3.1
1744 # test6 -> test0
1745 branch_deps = [
1746 'test2 test1', # test1 -> test2
1747 'test3 test2', # test2 -> test3
1748 'test3.1 test2', # test2 -> test3.1
1749 'test4 test3', # test3 -> test4
1750 'test5 test4', # test4 -> test5
1751 'test6 test0', # test0 -> test6
1752 'test7', # test7
1753 ]
1754 return '\n'.join(branch_deps)
1755 self.mock(git_cl, 'RunGit', mock_run_git)
1756
1757 class RecordCalls:
1758 times_called = 0
1759 record_calls = RecordCalls()
1760 def mock_CMDupload(*args, **_kwargs):
1761 record_calls.times_called += 1
1762 return 0
1763 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1764
1765 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001766 (('ask_for_data', 'This command will checkout all dependent branches '
1767 'and run "git cl upload". Press Enter to continue, '
1768 'or Ctrl+C to abort'), ''),
1769 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001770
1771 class MockChangelist():
1772 def __init__(self):
1773 pass
1774 def GetBranch(self):
1775 return 'test1'
1776 def GetIssue(self):
1777 return '123'
1778 def GetPatchset(self):
1779 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001780 def IsGerrit(self):
1781 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001782
1783 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1784 # CMDupload should have been called 5 times because of 5 dependent branches.
1785 self.assertEquals(5, record_calls.times_called)
1786 self.assertEquals(0, ret)
1787
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001788 def test_gerrit_change_id(self):
1789 self.calls = [
1790 ((['git', 'write-tree'], ),
1791 'hashtree'),
1792 ((['git', 'rev-parse', 'HEAD~0'], ),
1793 'branch-parent'),
1794 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1795 'A B <a@b.org> 1456848326 +0100'),
1796 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1797 'C D <c@d.org> 1456858326 +0100'),
1798 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1799 'hashchange'),
1800 ]
1801 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1802 self.assertEqual(change_id, 'Ihashchange')
1803
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001804 def test_desecription_append_footer(self):
1805 for init_desc, footer_line, expected_desc in [
1806 # Use unique desc first lines for easy test failure identification.
1807 ('foo', 'R=one', 'foo\n\nR=one'),
1808 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1809 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1810 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1811 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1812 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1813 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1814 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1815 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1816 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1817 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1818 ]:
1819 desc = git_cl.ChangeDescription(init_desc)
1820 desc.append_footer(footer_line)
1821 self.assertEqual(desc.description, expected_desc)
1822
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001823 def test_update_reviewers(self):
1824 data = [
1825 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001826 ('foo\nR=xx', [], 'foo\nR=xx'),
1827 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001828 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001829 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1830 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1831 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001832 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001833 ('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 +00001834 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001835 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1836 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1837 # Same as the line before, but full of whitespaces.
1838 (
1839 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1840 'foo\nBar\n\nR=c@c\n BUG =',
1841 ),
1842 # Whitespaces aren't interpreted as new lines.
1843 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001844 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001845 expected = [i[2] for i in data]
1846 actual = []
1847 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001848 obj = git_cl.ChangeDescription(orig)
1849 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001850 actual.append(obj.description)
1851 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001852
wittman@chromium.org455dc922015-01-26 20:15:50 +00001853 def test_get_target_ref(self):
1854 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001855 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001856 self.assertEqual(None, git_cl.GetTargetRef(None,
1857 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001858 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001859
wittman@chromium.org455dc922015-01-26 20:15:50 +00001860 # Check default target refs for branches.
1861 self.assertEqual('refs/heads/master',
1862 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001863 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001864 self.assertEqual('refs/heads/master',
1865 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
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/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001869 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001870 self.assertEqual('refs/branch-heads/123',
1871 git_cl.GetTargetRef('origin',
1872 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001873 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001874 self.assertEqual('refs/diff/test',
1875 git_cl.GetTargetRef('origin',
1876 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001877 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001878 self.assertEqual('refs/heads/chrome/m42',
1879 git_cl.GetTargetRef('origin',
1880 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001881 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001882
1883 # Check target refs for user-specified target branch.
1884 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1885 'refs/remotes/branch-heads/123'):
1886 self.assertEqual('refs/branch-heads/123',
1887 git_cl.GetTargetRef('origin',
1888 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001889 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001890 for branch in ('origin/master', 'remotes/origin/master',
1891 'refs/remotes/origin/master'):
1892 self.assertEqual('refs/heads/master',
1893 git_cl.GetTargetRef('origin',
1894 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001895 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001896 for branch in ('master', 'heads/master', 'refs/heads/master'):
1897 self.assertEqual('refs/heads/master',
1898 git_cl.GetTargetRef('origin',
1899 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001900 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001901
wychen@chromium.orga872e752015-04-28 23:42:18 +00001902 def test_patch_when_dirty(self):
1903 # Patch when local tree is dirty
1904 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1905 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1906
1907 def test_diff_when_dirty(self):
1908 # Do 'git cl diff' when local tree is dirty
1909 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1910 self.assertNotEqual(git_cl.main(['diff']), 0)
1911
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001912 @staticmethod
1913 def _get_gerrit_codereview_server_calls(branch, value=None,
1914 git_short_host='host',
1915 detect_branch=True):
1916 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1917
1918 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1919 """
1920 calls = []
1921 if detect_branch:
1922 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1923 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1924 CERR1 if value is None else value))
1925 if value is None:
1926 calls += [
1927 ((['git', 'config', 'branch.' + branch + '.merge'],),
1928 'refs/heads' + branch),
1929 ((['git', 'config', 'branch.' + branch + '.remote'],),
1930 'origin'),
1931 ((['git', 'config', 'remote.origin.url'],),
1932 'https://%s.googlesource.com/my/repo' % git_short_host),
1933 ]
1934 return calls
1935
tandriidf09a462016-08-18 16:23:55 -07001936 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001937 new_branch=False, git_short_host='host',
1938 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001939 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001940 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1941 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001942 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001943 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001944 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1945
tandriidf09a462016-08-18 16:23:55 -07001946 if new_branch:
1947 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1948 else:
1949 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001950
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001951 if not force_codereview:
1952 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001953 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001954 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001955 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1956 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001957 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001958 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001959
1960 if is_gerrit:
1961 if not force_codereview:
1962 self.calls += [
1963 ((['git', 'config', 'gerrit.host'],), 'true'),
1964 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001965 if detect_gerrit_server:
1966 self.calls += self._get_gerrit_codereview_server_calls(
1967 'master', git_short_host=git_short_host,
1968 detect_branch=not new_branch and force_codereview)
1969
1970 self.calls += [
1971 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001972 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001973 {
1974 'current_revision': '7777777777',
1975 'revisions': {
1976 '1111111111': {
1977 '_number': 1,
1978 'fetch': {'http': {
1979 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1980 'ref': 'refs/changes/56/123456/1',
1981 }},
1982 },
1983 '7777777777': {
1984 '_number': 7,
1985 'fetch': {'http': {
1986 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1987 'ref': 'refs/changes/56/123456/7',
1988 }},
1989 },
1990 },
1991 }),
1992 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001993 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001994 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001995 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001996 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001997 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001998 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001999 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002000
tandriidf09a462016-08-18 16:23:55 -07002001 def _common_patch_successful(self, new_branch=False):
2002 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002003 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002004 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002005 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002006 ((['git', 'config', 'branch.master.rietveldserver',
2007 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002008 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002009 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002010 ((['git', 'commit', '-m',
2011 'Description\n\n' +
2012 'patch from issue 123456 at patchset 60001 ' +
2013 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002014 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002015
2016 def test_patch_successful(self):
2017 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00002018 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2019
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002020 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07002021 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002022 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2023
wychen@chromium.orga872e752015-04-28 23:42:18 +00002024 def test_patch_conflict(self):
2025 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07002026 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002027 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002028
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002029 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002030 self._patch_common(is_gerrit=True, git_short_host='chromium',
2031 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002032 self.calls += [
2033 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2034 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002035 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002036 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002037 ((['git', 'config', 'branch.master.gerritserver',
2038 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002039 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002040 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002041 ]
2042 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2043
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002044 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002045 self._patch_common(is_gerrit=True, force_codereview=True,
2046 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002047 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002048 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002049 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002050 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002051 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002052 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002053 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002054 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002055 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002056 ]
2057 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2058
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002059 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002060 self._patch_common(is_gerrit=True, git_short_host='else',
2061 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002062 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002063 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002064 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002065 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002066 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002067 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002068 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002069 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002070 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002071 ]
2072 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002073 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002074
2075 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002076 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
2077 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002078 self.calls += [
2079 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2080 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002081 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2082 ''),
2083 ((['git', 'config', 'branch.master.gerritserver',
2084 'https://chromium-review.googlesource.com'],), ''),
2085 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002086 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2087 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2088 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002089 ]
2090 with self.assertRaises(SystemExitMock):
2091 git_cl.main(['patch',
2092 'https://chromium-review.googlesource.com/#/c/123456/1'])
2093
tandriic2405f52016-10-10 08:13:15 -07002094 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002095 def notExists(_issue, *_, **kwargs):
2096 self.assertFalse(kwargs['ignore_404'])
2097 raise git_cl.gerrit_util.GerritError(404, '')
2098 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2099
tandriic2405f52016-10-10 08:13:15 -07002100 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07002101 self.calls = [
2102 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2103 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2104 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2105 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2106 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2107 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08002108 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07002109 'or you have no access to it'],), SystemExitMock()),
2110 ]
2111 with self.assertRaises(SystemExitMock):
2112 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
2113
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002114 def _checkout_calls(self):
2115 return [
2116 ((['git', 'config', '--local', '--get-regexp',
2117 'branch\\..*\\.rietveldissue'], ),
2118 ('branch.retrying.rietveldissue 1111111111\n'
2119 'branch.some-fix.rietveldissue 2222222222\n')),
2120 ((['git', 'config', '--local', '--get-regexp',
2121 'branch\\..*\\.gerritissue'], ),
2122 ('branch.ger-branch.gerritissue 123456\n'
2123 'branch.gbranch654.gerritissue 654321\n')),
2124 ]
2125
2126 def test_checkout_gerrit(self):
2127 """Tests git cl checkout <issue>."""
2128 self.calls = self._checkout_calls()
2129 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2130 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2131
2132 def test_checkout_rietveld(self):
2133 """Tests git cl checkout <issue>."""
2134 self.calls = self._checkout_calls()
2135 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2136 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2137
2138 def test_checkout_not_found(self):
2139 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002140 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002141 self.calls = self._checkout_calls()
2142 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2143
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002144 def test_checkout_no_branch_issues(self):
2145 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002146 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002147 self.calls = [
2148 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002149 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002150 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002151 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002152 ]
2153 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2154
tandrii@chromium.org28253532016-04-14 13:46:56 +00002155 def _test_gerrit_ensure_authenticated_common(self, auth,
2156 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002157 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2158 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2159 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002160 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002161 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002162 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002163 cl.branch = 'master'
2164 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002165 cl.lookedup_issue = True
2166 return cl
2167
2168 def test_gerrit_ensure_authenticated_missing(self):
2169 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002170 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002171 })
2172 self.calls.append(
2173 ((['DieWithError',
2174 'Credentials for the following hosts are required:\n'
2175 ' chromium-review.googlesource.com\n'
2176 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002177 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002178 'https://chromium-review.googlesource.com/new-password'],), ''),)
2179 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2180
2181 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002182 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002183 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002184 'chromium.googlesource.com':
2185 ('git-one.example.com', None, 'secret1'),
2186 'chromium-review.googlesource.com':
2187 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002188 })
2189 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002190 (('ask_for_data', 'If you know what you are doing '
2191 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002192 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2193
2194 def test_gerrit_ensure_authenticated_ok(self):
2195 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002196 'chromium.googlesource.com':
2197 ('git-same.example.com', None, 'secret'),
2198 'chromium-review.googlesource.com':
2199 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002200 })
2201 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2202
tandrii@chromium.org28253532016-04-14 13:46:56 +00002203 def test_gerrit_ensure_authenticated_skipped(self):
2204 cl = self._test_gerrit_ensure_authenticated_common(
2205 auth={}, skip_auth_check=True)
2206 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2207
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002208 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002209 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2210 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002211 self.calls = [
2212 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002213 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002214 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2215 ((['git', 'config', 'rietveld.server'],), ''),
2216 ((['git', 'config', 'rietveld.server'],), ''),
2217 ((['git', 'config', 'branch.feature.rietveldserver'],),
2218 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002219 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002220 ]
2221 self.assertEqual(0, git_cl.main(['set-commit']))
2222
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002223 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002224 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002225 lambda h, i, labels, notify=None:
2226 self._mocked_call(['SetReview', h, i, labels, notify]))
2227
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002228 self.calls = [
2229 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002230 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2231 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002232 ((['git', 'config', 'branch.feature.gerritserver'],),
2233 'https://chromium-review.googlesource.com'),
2234 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002235 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002236 ]
tandriid9e5ce52016-07-13 02:32:59 -07002237
2238 def test_cmd_set_commit_gerrit_clear(self):
2239 self._cmd_set_commit_gerrit_common(0)
2240 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2241
2242 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002243 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002244 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2245
tandriid9e5ce52016-07-13 02:32:59 -07002246 def test_cmd_set_commit_gerrit(self):
2247 self._cmd_set_commit_gerrit_common(2)
2248 self.assertEqual(0, git_cl.main(['set-commit']))
2249
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002250 def test_description_display(self):
2251 out = StringIO.StringIO()
2252 self.mock(git_cl.sys, 'stdout', out)
2253
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002254 self.mock(git_cl, 'Changelist', ChangelistMock)
2255 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002256
2257 self.assertEqual(0, git_cl.main(['description', '-d']))
2258 self.assertEqual('foo\n', out.getvalue())
2259
2260 def test_description_rietveld(self):
2261 out = StringIO.StringIO()
2262 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002263 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002264
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002265 self.assertEqual(0, git_cl.main([
2266 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2267 self.assertEqual('foobar\n', out.getvalue())
2268
iannucci3c972b92016-08-17 13:24:10 -07002269 def test_StatusFieldOverrideIssueMissingArgs(self):
2270 out = StringIO.StringIO()
2271 self.mock(git_cl.sys, 'stderr', out)
2272
2273 try:
2274 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2275 except SystemExit as ex:
2276 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002277 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002278
2279 out = StringIO.StringIO()
2280 self.mock(git_cl.sys, 'stderr', out)
2281
2282 try:
2283 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2284 except SystemExit as ex:
2285 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002286 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002287
2288 def test_StatusFieldOverrideIssue(self):
2289 out = StringIO.StringIO()
2290 self.mock(git_cl.sys, 'stdout', out)
2291
2292 def assertIssue(cl_self, *_args):
2293 self.assertEquals(cl_self.issue, 1)
2294 return 'foobar'
2295
2296 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2297 self.calls = [
2298 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2299 ((['git', 'config', 'rietveld.server'],), ''),
2300 ((['git', 'config', 'rietveld.server'],), ''),
2301 ]
iannuccie53c9352016-08-17 14:40:40 -07002302 self.assertEqual(
2303 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2304 0)
iannucci3c972b92016-08-17 13:24:10 -07002305 self.assertEqual(out.getvalue(), 'foobar\n')
2306
iannuccie53c9352016-08-17 14:40:40 -07002307 def test_SetCloseOverrideIssue(self):
2308 def assertIssue(cl_self, *_args):
2309 self.assertEquals(cl_self.issue, 1)
2310 return 'foobar'
2311
2312 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2313 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2314 self.calls = [
2315 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2316 ((['git', 'config', 'rietveld.server'],), ''),
2317 ((['git', 'config', 'rietveld.server'],), ''),
2318 ]
2319 self.assertEqual(
2320 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2321
2322 def test_SetCommitOverrideIssue(self):
2323 def assertIssue(cl_self, *_args):
2324 self.assertEquals(cl_self.issue, 1)
2325 return 'foobar'
2326
2327 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2328 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2329 self.calls = [
2330 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2331 ((['git', 'config', 'rietveld.server'],), ''),
2332 ((['git', 'config', 'rietveld.server'],), ''),
2333 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2334 ((['git', 'config', 'rietveld.server'],), ''),
2335 ((['git', 'config', 'rietveld.server'],), ''),
2336 ]
2337 self.assertEqual(
2338 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2339
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002340 def test_description_gerrit(self):
2341 out = StringIO.StringIO()
2342 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002343 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002344 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002345 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2346 {
2347 'current_revision': 'sha1',
2348 'revisions': {'sha1': {
2349 'commit': {'message': 'foobar'},
2350 }},
2351 }),
2352 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002353 self.assertEqual(0, git_cl.main([
2354 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2355 self.assertEqual('foobar\n', out.getvalue())
2356
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002357 def test_description_set_raw(self):
2358 out = StringIO.StringIO()
2359 self.mock(git_cl.sys, 'stdout', out)
2360
2361 self.mock(git_cl, 'Changelist', ChangelistMock)
2362 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2363
2364 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2365 self.assertEqual('hihi', ChangelistMock.desc)
2366
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002367 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002368 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002369
2370 def RunEditor(desc, _, **kwargs):
2371 self.assertEquals(
2372 '# Enter a description of the change.\n'
2373 '# This will be displayed on the codereview site.\n'
2374 '# The first line will also be used as the subject of the review.\n'
2375 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002376 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002377 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002378 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002379 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002380 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002381
dsansomee2d6fd92016-09-08 00:10:47 -07002382 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002383 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002384
2385 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2386 self.mock(git_cl.Changelist, 'GetDescription',
2387 lambda *args: current_desc)
2388 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2389 UpdateDescriptionRemote)
2390 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2391
2392 self.calls = [
2393 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002394 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002395 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2396 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002397 ((['git', 'config', 'core.editor'],), 'vi'),
2398 ]
2399 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2400
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002401 def test_description_set_stdin(self):
2402 out = StringIO.StringIO()
2403 self.mock(git_cl.sys, 'stdout', out)
2404
2405 self.mock(git_cl, 'Changelist', ChangelistMock)
2406 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2407
2408 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2409 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2410
kmarshall3bff56b2016-06-06 18:31:47 -07002411 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002412 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2413
kmarshall3bff56b2016-06-06 18:31:47 -07002414 self.calls = \
2415 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2416 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002417 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002418 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2419 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002420 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2421 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2422 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002423 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2424 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2425 ((['git', 'branch', '-D', 'foo'],), '')]
2426
kmarshall3bff56b2016-06-06 18:31:47 -07002427 self.mock(git_cl, 'get_cl_statuses',
2428 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002429 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2430 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2431 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002432
2433 self.assertEqual(0, git_cl.main(['archive', '-f']))
2434
2435 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002436 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002437 self.calls = \
2438 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2439 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002440 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002441 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2442 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002443 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2444
kmarshall9249e012016-08-23 12:02:16 -07002445 self.mock(git_cl, 'get_cl_statuses',
2446 lambda branches, fine_grained, max_processes:
2447 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2448
2449 self.assertEqual(1, git_cl.main(['archive', '-f']))
2450
2451 def test_archive_dry_run(self):
2452 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2453
2454 self.calls = \
2455 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2456 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2457 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2458 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2459 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2460 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2461 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2462 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2463 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002464
2465 self.mock(git_cl, 'get_cl_statuses',
2466 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002467 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2468 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2469 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002470
kmarshall9249e012016-08-23 12:02:16 -07002471 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2472
2473 def test_archive_no_tags(self):
2474 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2475
2476 self.calls = \
2477 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2478 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2479 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2480 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2481 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2482 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2483 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2484 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2485 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2486 ((['git', 'branch', '-D', 'foo'],), '')]
2487
2488 self.mock(git_cl, 'get_cl_statuses',
2489 lambda branches, fine_grained, max_processes:
2490 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2491 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2492 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2493
2494 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002495
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002496 def test_cmd_issue_erase_existing(self):
2497 out = StringIO.StringIO()
2498 self.mock(git_cl.sys, 'stdout', out)
2499 self.calls = [
2500 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002501 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2502 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002503 # Let this command raise exception (retcode=1) - it should be ignored.
2504 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002505 CERR1),
2506 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2507 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002508 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2509 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2510 ''),
2511 ]
2512 self.assertEqual(0, git_cl.main(['issue', '0']))
2513
phajdan.jre328cf92016-08-22 04:12:17 -07002514 def test_cmd_issue_json(self):
2515 out = StringIO.StringIO()
2516 self.mock(git_cl.sys, 'stdout', out)
2517 self.calls = [
2518 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002519 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002520 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2521 ((['git', 'config', 'rietveld.server'],),
2522 'https://codereview.chromium.org'),
2523 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2524 (('write_json', 'output.json',
2525 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2526 ''),
2527 ]
2528 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2529
tandriide281ae2016-10-12 06:02:30 -07002530 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002531 self.mock(git_cl.Changelist, 'GetChange',
2532 lambda _, *a: (
2533 self._mocked_call(['GetChange']+list(a))))
2534 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2535 lambda *_, **__: (
2536 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002537 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2538 lambda _, s: self._mocked_call(['SetCQState', s]))
2539 self.calls = [
2540 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002541 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002542 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2543 ((['git', 'config', 'rietveld.server'],),
2544 'https://codereview.chromium.org'),
2545 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2546 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2547 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2548 ((['get_or_create_merge_base', 'feature', 'feature'],),
2549 'fake_ancestor_sha'),
2550 ((['GetChange', 'fake_ancestor_sha', None], ),
2551 git_cl.presubmit_support.GitChange(
2552 '', '', '', '', '', '', '', '')),
2553 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2554 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002555 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2556 ]
2557 out = StringIO.StringIO()
2558 self.mock(git_cl.sys, 'stdout', out)
2559 self.assertEqual(0, git_cl.main(['try']))
2560 self.assertEqual(
2561 out.getvalue(),
2562 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2563
tandrii8c5a3532016-11-04 07:52:02 -07002564 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2565 self.mock(git_cl.Changelist, 'GetChange',
2566 lambda _, *a: (
2567 self._mocked_call(['GetChange']+list(a))))
2568 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2569 lambda *_, **__: (
2570 self._mocked_call(['DoGetTryMasters'])))
2571 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2572 lambda _, s: self._mocked_call(['SetCQState', s]))
2573
tandrii8c5a3532016-11-04 07:52:02 -07002574 self.calls = [
2575 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2576 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2577 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2578 ((['git', 'config', 'branch.feature.gerritserver'],),
2579 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002580 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2581 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2582 'project': 'depot_tools',
2583 'status': 'OPEN',
2584 'owner': {'email': 'owner@e.mail'},
2585 'revisions': {
2586 'deadbeaf': {
2587 '_number': 6,
2588 },
2589 'beeeeeef': {
2590 '_number': 7,
2591 'fetch': {'http': {
2592 'url': 'https://chromium.googlesource.com/depot_tools',
2593 'ref': 'refs/changes/56/123456/7'
2594 }},
2595 },
2596 },
2597 }),
tandrii8c5a3532016-11-04 07:52:02 -07002598 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2599 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2600 ((['get_or_create_merge_base', 'feature', 'feature'],),
2601 'fake_ancestor_sha'),
2602 ((['GetChange', 'fake_ancestor_sha', None], ),
2603 git_cl.presubmit_support.GitChange(
2604 '', '', '', '', '', '', '', '')),
2605 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2606 ((['DoGetTryMasters'], ), None),
2607 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2608 ]
2609 out = StringIO.StringIO()
2610 self.mock(git_cl.sys, 'stdout', out)
2611 self.assertEqual(0, git_cl.main(['try']))
2612 self.assertEqual(
2613 out.getvalue(),
2614 'scheduled CQ Dry Run on '
2615 'https://chromium-review.googlesource.com/123456\n')
2616
2617 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2618 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2619 lambda _: {
2620 'owner_email': 'owner@e.mail',
2621 'private': False,
2622 'closed': False,
2623 'project': 'depot_tools',
2624 'patchsets': [20001],
2625 })
tandriide281ae2016-10-12 06:02:30 -07002626 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2627 self.calls = [
2628 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2629 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2630 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2631 ((['git', 'config', 'rietveld.server'],),
2632 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002633 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002634 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002635 ]
2636
2637 def _buildbucket_retry(*_, **kw):
2638 # self.maxDiff = 10000
2639 body = json.loads(kw['body'])
2640 self.assertEqual(len(body['builds']), 1)
2641 build = body['builds'][0]
2642 params = json.loads(build.pop('parameters_json'))
2643 self.assertEqual(params, {
2644 u'builder_name': u'win',
2645 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2646 u'revision': None}],
2647 u'properties': {
2648 u'category': u'git_cl_try',
2649 u'issue': 123,
2650 u'key': u'val',
2651 u'json': [{u'a': 1}, None],
2652 u'master': u'tryserver.chromium',
2653 u'patch_project': u'depot_tools',
2654 u'patch_storage': u'rietveld',
2655 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002656 u'rietveld': u'https://codereview.chromium.org',
2657 }
2658 })
2659 self.assertEqual(build, {
2660 u'bucket': u'master.tryserver.chromium',
2661 u'client_operation_id': u'uuid4',
2662 u'tags': [u'builder:win',
2663 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002664 u'user_agent:git_cl_try',
2665 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002666 })
2667
2668 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2669
2670 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2671 self.assertEqual(0, git_cl.main([
2672 'try', '-m', 'tryserver.chromium', '-b', 'win',
2673 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2674 self.assertRegexpMatches(
2675 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002676 'Tried jobs on:\nBucket: master.tryserver.chromium')
2677
tandrii8c5a3532016-11-04 07:52:02 -07002678 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2679 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2680 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2681
tandrii8c5a3532016-11-04 07:52:02 -07002682 self.calls = [
2683 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2684 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2685 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2686 ((['git', 'config', 'branch.feature.gerritserver'],),
2687 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002688 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002689 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002690 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002691 'status': 'OPEN',
2692 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002693 'revisions': {
2694 'deadbeaf': {
2695 '_number': 6,
2696 },
2697 'beeeeeef': {
2698 '_number': 7,
2699 'fetch': {'http': {
2700 'url': 'https://chromium.googlesource.com/depot_tools',
2701 'ref': 'refs/changes/56/123456/7'
2702 }},
2703 },
2704 },
2705 }),
2706 ]
2707
2708 def _buildbucket_retry(*_, **kw):
2709 # self.maxDiff = 10000
2710 body = json.loads(kw['body'])
2711 self.assertEqual(len(body['builds']), 1)
2712 build = body['builds'][0]
2713 params = json.loads(build.pop('parameters_json'))
2714 self.assertEqual(params, {
2715 u'builder_name': u'win',
2716 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2717 u'revision': None}],
2718 u'properties': {
2719 u'category': u'git_cl_try',
2720 u'key': u'val',
2721 u'json': [{u'a': 1}, None],
2722 u'master': u'tryserver.chromium',
2723
2724 u'patch_gerrit_url':
2725 u'https://chromium-review.googlesource.com',
2726 u'patch_issue': 123456,
2727 u'patch_project': u'depot_tools',
2728 u'patch_ref': u'refs/changes/56/123456/7',
2729 u'patch_repository_url':
2730 u'https://chromium.googlesource.com/depot_tools',
2731 u'patch_set': 7,
2732 u'patch_storage': u'gerrit',
2733 }
2734 })
2735 self.assertEqual(build, {
2736 u'bucket': u'master.tryserver.chromium',
2737 u'client_operation_id': u'uuid4',
2738 u'tags': [
2739 u'builder:win',
2740 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2741 u'user_agent:git_cl_try',
2742 u'master:tryserver.chromium'],
2743 })
2744
2745 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2746
2747 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2748 self.assertEqual(0, git_cl.main([
2749 'try', '-m', 'tryserver.chromium', '-b', 'win',
2750 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2751 self.assertRegexpMatches(
2752 git_cl.sys.stdout.getvalue(),
2753 'Tried jobs on:\nBucket: master.tryserver.chromium')
2754
borenet6c0efe62016-10-19 08:13:29 -07002755 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002756 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2757 lambda _: {
2758 'owner_email': 'owner@e.mail',
2759 'private': False,
2760 'closed': False,
2761 'project': 'depot_tools',
2762 'patchsets': [20001],
2763 })
borenet6c0efe62016-10-19 08:13:29 -07002764 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2765 self.calls = [
2766 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2767 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2768 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2769 ((['git', 'config', 'rietveld.server'],),
2770 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002771 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002772 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002773 ]
2774
2775 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002776 body = json.loads(kw['body'])
2777 self.assertEqual(len(body['builds']), 1)
2778 build = body['builds'][0]
2779 params = json.loads(build.pop('parameters_json'))
2780 self.assertEqual(params, {
2781 u'builder_name': u'win',
2782 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2783 u'revision': None}],
2784 u'properties': {
2785 u'category': u'git_cl_try',
2786 u'issue': 123,
2787 u'patch_project': u'depot_tools',
2788 u'patch_storage': u'rietveld',
2789 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002790 u'rietveld': u'https://codereview.chromium.org',
2791 }
2792 })
2793 self.assertEqual(build, {
2794 u'bucket': u'test.bucket',
2795 u'client_operation_id': u'uuid4',
2796 u'tags': [u'builder:win',
2797 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2798 u'user_agent:git_cl_try'],
2799 })
2800
2801 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2802
2803 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2804 self.assertEqual(0, git_cl.main([
2805 'try', '-B', 'test.bucket', '-b', 'win']))
2806 self.assertRegexpMatches(
2807 git_cl.sys.stdout.getvalue(),
2808 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002809
qyearsley123a4682016-10-26 09:12:17 -07002810 def test_git_cl_try_bots_on_multiple_masters(self):
2811 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2812 self.calls = [
2813 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2814 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2815 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2816 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002817 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002818 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2819 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2820 ]
2821
2822 def _buildbucket_retry(*_, **kw):
2823 body = json.loads(kw['body'])
2824 self.assertEqual(len(body['builds']), 2)
2825
2826 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2827 self.assertEqual(first_build_params['builder_name'], 'builder1')
2828 self.assertEqual(first_build_params['properties']['master'], 'master1')
2829
2830 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2831 self.assertEqual(first_build_params['builder_name'], 'builder2')
2832 self.assertEqual(first_build_params['properties']['master'], 'master2')
2833
2834 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2835
2836 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2837 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2838
2839 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2840 self.assertEqual(
2841 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2842 self.assertEqual(
2843 git_cl.sys.stdout.getvalue(),
2844 'Tried jobs on:\n'
2845 'Bucket: master.master1\n'
2846 ' builder1: []\n'
2847 'Bucket: master.master2\n'
2848 ' builder2: []\n'
2849 'To see results here, run: git cl try-results\n'
2850 'To see results in browser, run: git cl web\n')
2851
tandrii16e0b4e2016-06-07 10:34:28 -07002852 def _common_GerritCommitMsgHookCheck(self):
2853 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2854 self.mock(git_cl.os.path, 'abspath',
2855 lambda path: self._mocked_call(['abspath', path]))
2856 self.mock(git_cl.os.path, 'exists',
2857 lambda path: self._mocked_call(['exists', path]))
2858 self.mock(git_cl.gclient_utils, 'FileRead',
2859 lambda path: self._mocked_call(['FileRead', path]))
2860 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2861 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2862 self.calls = [
2863 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2864 ((['abspath', '../'],), '/abs/git_repo_root'),
2865 ]
2866 return git_cl.Changelist(codereview='gerrit', issue=123)
2867
2868 def test_GerritCommitMsgHookCheck_custom_hook(self):
2869 cl = self._common_GerritCommitMsgHookCheck()
2870 self.calls += [
2871 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2872 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2873 '#!/bin/sh\necho "custom hook"')
2874 ]
2875 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2876
2877 def test_GerritCommitMsgHookCheck_not_exists(self):
2878 cl = self._common_GerritCommitMsgHookCheck()
2879 self.calls += [
2880 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2881 ]
2882 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2883
2884 def test_GerritCommitMsgHookCheck(self):
2885 cl = self._common_GerritCommitMsgHookCheck()
2886 self.calls += [
2887 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2888 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2889 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002890 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002891 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2892 ''),
2893 ]
2894 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2895
tandriic4344b52016-08-29 06:04:54 -07002896 def test_GerritCmdLand(self):
2897 self.calls += [
2898 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2899 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2900 'deadbeaf'),
2901 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2902 ((['git', 'config', 'branch.feature.gerritserver'],),
2903 'chromium-review.googlesource.com'),
2904 ]
2905 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2906 cl._codereview_impl._GetChangeDetail = lambda _: {
2907 'labels': {},
2908 'current_revision': 'deadbeaf',
2909 }
agable32978d92016-11-01 12:55:02 -07002910 cl._codereview_impl._GetChangeCommit = lambda: {
2911 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002912 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002913 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2914 }
tandriic4344b52016-08-29 06:04:54 -07002915 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002916 out = StringIO.StringIO()
2917 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002918 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002919 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002920 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002921
tandrii221ab252016-10-06 08:12:04 -07002922 BUILDBUCKET_BUILDS_MAP = {
2923 '9000': {
2924 'id': '9000',
2925 'status': 'STARTED',
2926 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2927 'result_details_json': '{"properties": {}}',
2928 'bucket': 'master.x.y',
2929 'created_by': 'user:someone@chromium.org',
2930 'created_ts': '147200002222000',
2931 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2932 },
2933 '8000': {
2934 'id': '8000',
2935 'status': 'COMPLETED',
2936 'result': 'FAILURE',
2937 'failure_reason': 'BUILD_FAILURE',
2938 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2939 'result_details_json': '{"properties": {}}',
2940 'bucket': 'master.x.y',
2941 'created_by': 'user:someone@chromium.org',
2942 'created_ts': '147200001111000',
2943 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2944 },
2945 }
2946
2947 def test_write_try_results_json(self):
2948 expected_output = [
2949 {
2950 'buildbucket_id': '8000',
2951 'bucket': 'master.x.y',
2952 'builder_name': 'my-builder',
2953 'status': 'COMPLETED',
2954 'result': 'FAILURE',
2955 'failure_reason': 'BUILD_FAILURE',
2956 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2957 },
2958 {
2959 'buildbucket_id': '9000',
2960 'bucket': 'master.x.y',
2961 'builder_name': 'my-builder',
2962 'status': 'STARTED',
2963 'result': None,
2964 'failure_reason': None,
2965 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2966 }
2967 ]
2968 self.calls = [(('write_json', 'output.json', expected_output), '')]
2969 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2970
tandrii45b2a582016-10-11 03:14:16 -07002971 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002972 out = StringIO.StringIO()
2973 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002974 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2975 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002976 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2977 self._mocked_call(['get_authenticator_for_host', host]))
2978 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2979 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002980
2981 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2982 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002983 self.calls += [
2984 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2985 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2986 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2987 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2988 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2989 ((['git', 'config', 'branch.feature.rietveldserver'],),
2990 'codereview.example.com'),
2991 ((['get_authenticator_for_host', 'codereview.example.com'],),
2992 AuthenticatorMock()),
2993 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2994
2995 def test_fetch_try_jobs_none_rietveld(self):
2996 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002997 # Simulate that user isn't logged in.
2998 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002999 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003000 self.assertRegexpMatches(sys.stdout.getvalue(),
3001 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003002 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3003
3004 def test_fetch_try_jobs_some_rietveld(self):
3005 self._setup_fetch_try_jobs_rietveld({
3006 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3007 })
3008 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003009 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3010 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3011 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3012
3013 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3014 self._setup_fetch_try_jobs(most_recent_patchset=13)
3015 self.calls += [
3016 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3017 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3018 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003019 # TODO(tandrii): Uncomment the below if we decide to support checking
3020 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003021 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003022 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003023 ((['git', 'config', 'branch.feature.gerritserver'],),
3024 'https://x-review.googlesource.com'),
3025 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3026 AuthenticatorMock()),
3027 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3028
3029 def test_fetch_try_jobs_none_gerrit(self):
3030 self._setup_fetch_try_jobs_gerrit({})
3031 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003032 # TODO(tandrii): Uncomment the below if we decide to support checking
3033 # patchsets for Gerrit.
3034 # self.assertRegexpMatches(
3035 # sys.stdout.getvalue(),
3036 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003037 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3038
3039 def test_fetch_try_jobs_some_gerrit(self):
3040 self._setup_fetch_try_jobs_gerrit({
3041 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3042 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003043 # TODO(tandrii): Uncomment the below if we decide to support checking
3044 # patchsets for Gerrit.
3045 # self.calls.remove(
3046 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003047 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3048
3049 # ... and doesn't result in warning.
3050 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3051 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003052 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3053 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3054
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003055 def _mock_gerrit_changes_for_detail_cache(self):
3056 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003057
3058 def test_gerrit_change_detail_cache_normalize(self):
3059 self._mock_gerrit_changes_for_detail_cache()
3060 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003061 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003062 ]
3063 cl = git_cl.Changelist(codereview='gerrit')
3064 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3065 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3066 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3067 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3068
3069 def test_gerrit_change_detail_cache_simple(self):
3070 self._mock_gerrit_changes_for_detail_cache()
3071 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003072 (('GetChangeDetail', 'host', '1', []), 'a'),
3073 (('GetChangeDetail', 'host', '2', []), 'b'),
3074 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003075 ]
3076 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3077 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3078 self.assertEqual(cl._GetChangeDetail(), 'a')
3079 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003080 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003081 self.assertEqual(cl._GetChangeDetail(), 'a')
3082 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3083
3084 def test_gerrit_change_detail_cache_options(self):
3085 self._mock_gerrit_changes_for_detail_cache()
3086 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003087 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3088 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3089 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3090 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003091 ]
3092 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3093 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3094 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3095 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3096 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3097 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3098 self.assertEqual(cl._GetChangeDetail(), 'cab')
3099
3100 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3101 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3102 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3103 self.assertEqual(cl._GetChangeDetail(), 'cab')
3104
3105 # Finally, no_cache should invalidate all caches for given change.
3106 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3107 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3108
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003109 def test_gerrit_description_caching(self):
3110 def gen_detail(rev, desc):
3111 return {
3112 'current_revision': rev,
3113 'revisions': {rev: {'commit': {'message': desc}}}
3114 }
3115 self.calls = [
3116 (('GetChangeDetail', 'host', '1',
3117 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3118 gen_detail('rev1', 'desc1')),
3119 (('GetChangeDetail', 'host', '1',
3120 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3121 gen_detail('rev2', 'desc2')),
3122 ]
3123
3124 self._mock_gerrit_changes_for_detail_cache()
3125 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3126 self.assertEqual(cl.GetDescription(), 'desc1')
3127 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3128 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003129
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003130 def test_print_current_creds(self):
3131 class CookiesAuthenticatorMock(object):
3132 def __init__(self):
3133 self.gitcookies = {
3134 'host.googlesource.com': ('user', 'pass'),
3135 'host-review.googlesource.com': ('user', 'pass'),
3136 }
3137 self.netrc = self
3138 self.netrc.hosts = {
3139 'github.com': ('user2', None, 'pass2'),
3140 'host2.googlesource.com': ('user3', None, 'pass'),
3141 }
3142 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3143 CookiesAuthenticatorMock)
3144 self.mock(sys, 'stdout', StringIO.StringIO())
3145 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3146 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3147 ' Host\t User\t Which file',
3148 '============================\t=====\t===========',
3149 'host-review.googlesource.com\t user\t.gitcookies',
3150 ' host.googlesource.com\t user\t.gitcookies',
3151 ' host2.googlesource.com\tuser3\t .netrc',
3152 ])
3153 sys.stdout.buf = ''
3154 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3155 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3156 ' Host\tUser\t Which file',
3157 '============================\t====\t===========',
3158 'host-review.googlesource.com\tuser\t.gitcookies',
3159 ' host.googlesource.com\tuser\t.gitcookies',
3160 ])
3161
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003162 def _common_creds_check_mocks(self):
3163 def exists_mock(path):
3164 dirname = os.path.dirname(path)
3165 if dirname == os.path.expanduser('~'):
3166 dirname = '~'
3167 base = os.path.basename(path)
3168 if base in ('.netrc', '.gitcookies'):
3169 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3170 # git cl also checks for existence other files not relevant to this test.
3171 return None
3172 self.mock(os.path, 'exists', exists_mock)
3173 self.mock(sys, 'stdout', StringIO.StringIO())
3174
3175 def test_creds_check_gitcookies_not_configured(self):
3176 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003177 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003178 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003179 self.calls = [
3180 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3181 (('os.path.exists', '~/.netrc'), True),
3182 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3183 'or Ctrl+C to abort'), ''),
3184 ((['git', 'config', '--global', 'http.cookiefile',
3185 os.path.expanduser('~/.gitcookies')], ), ''),
3186 ]
3187 self.assertEqual(0, git_cl.main(['creds-check']))
3188 self.assertRegexpMatches(
3189 sys.stdout.getvalue(),
3190 '^You seem to be using outdated .netrc for git credentials:')
3191 self.assertRegexpMatches(
3192 sys.stdout.getvalue(),
3193 '\nConfigured git to use .gitcookies from')
3194
3195 def test_creds_check_gitcookies_configured_custom_broken(self):
3196 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003197 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003198 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003199 self.calls = [
3200 ((['git', 'config', '--global', 'http.cookiefile'],),
3201 '/custom/.gitcookies'),
3202 (('os.path.exists', '/custom/.gitcookies'), False),
3203 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3204 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3205 ((['git', 'config', '--global', 'http.cookiefile',
3206 os.path.expanduser('~/.gitcookies')], ), ''),
3207 ]
3208 self.assertEqual(0, git_cl.main(['creds-check']))
3209 self.assertRegexpMatches(
3210 sys.stdout.getvalue(),
3211 'WARNING: you have configured custom path to .gitcookies: ')
3212 self.assertRegexpMatches(
3213 sys.stdout.getvalue(),
3214 'However, your configured .gitcookies file is missing.')
3215
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003216 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003217 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3218 lambda _, message: self._mocked_call('AddComment', message))
3219 self.calls = [
3220 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3221 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3222 (('AddComment', 'msg'), ''),
3223 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003224 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3225 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003226
3227 def test_git_cl_comment_add_gerrit(self):
3228 self.mock(git_cl.gerrit_util, 'SetReview',
3229 lambda host, change, msg:
3230 self._mocked_call('SetReview', host, change, msg))
3231 self.calls = [
3232 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3233 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3234 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3235 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3236 'origin/master'),
3237 ((['git', 'config', 'remote.origin.url'],),
3238 'https://chromium.googlesource.com/infra/infra'),
3239 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3240 ]
3241 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3242 '-a', 'msg']))
3243
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003244 def test_git_cl_comments_fetch_rietveld(self):
3245 self.mock(sys, 'stdout', StringIO.StringIO())
3246 self.calls = [
3247 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3248 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3249 ] * 2
3250 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3251 'messages': [
3252 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3253 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3254 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3255 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3256 # Intentionally wrong order here.
3257 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3258 'disapproval': False, 'approval': False,
3259 'sender': 'owner@example.com'},
3260 ],
3261 'owner_email': 'owner@example.com',
3262 })
3263 expected_comments_summary = [
3264 git_cl._CommentSummary(
3265 message='lgtm',
3266 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3267 disapproval=False, approval=True, sender='r@example.com'),
3268 git_cl._CommentSummary(
3269 message='not lgtm',
3270 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3271 disapproval=True, approval=False, sender='r2@example.com'),
3272 # Note: same order as in whatever Rietveld returns.
3273 git_cl._CommentSummary(
3274 message='PTAL',
3275 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3276 disapproval=False, approval=False, sender='owner@example.com'),
3277 ]
3278 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3279 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3280
3281 with git_cl.gclient_utils.temporary_directory() as tempdir:
3282 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3283 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3284 '-j', out_file]))
3285 with open(out_file) as f:
3286 read = json.load(f)
3287 self.assertEqual(len(read), 3)
3288 self.assertEqual(read[0], {
3289 'date': '2000-03-13 20:49:34.515270',
3290 'message': 'PTAL',
3291 'approval': False,
3292 'disapproval': False,
3293 'sender': 'owner@example.com'})
3294 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3295 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3296
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003297 def test_git_cl_comments_fetch_gerrit(self):
3298 self.mock(sys, 'stdout', StringIO.StringIO())
3299 self.calls = [
3300 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3301 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3302 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3303 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3304 'origin/master'),
3305 ((['git', 'config', 'remote.origin.url'],),
3306 'https://chromium.googlesource.com/infra/infra'),
3307 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3308 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3309 'owner': {'email': 'owner@example.com'},
3310 'messages': [
3311 {
3312 u'_revision_number': 1,
3313 u'author': {
3314 u'_account_id': 1111084,
3315 u'email': u'commit-bot@chromium.org',
3316 u'name': u'Commit Bot'
3317 },
3318 u'date': u'2017-03-15 20:08:45.000000000',
3319 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3320 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3321 u'tag': u'autogenerated:cq:dry-run'
3322 },
3323 {
3324 u'_revision_number': 2,
3325 u'author': {
3326 u'_account_id': 11151243,
3327 u'email': u'owner@example.com',
3328 u'name': u'owner'
3329 },
3330 u'date': u'2017-03-16 20:00:41.000000000',
3331 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3332 u'message': u'PTAL',
3333 },
3334 {
3335 u'_revision_number': 2,
3336 u'author': {
3337 u'_account_id': 148512 ,
3338 u'email': u'reviewer@example.com',
3339 u'name': u'reviewer'
3340 },
3341 u'date': u'2017-03-17 05:19:37.500000000',
3342 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3343 u'message': u'Patch Set 2: Code-Review+1',
3344 },
3345 ]
3346 })
3347 ] * 2
3348 expected_comments_summary = [
3349 git_cl._CommentSummary(
3350 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3351 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3352 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3353 git_cl._CommentSummary(
3354 message=u'PTAL',
3355 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3356 disapproval=False, approval=False, sender=u'owner@example.com'),
3357 git_cl._CommentSummary(
3358 message=u'Patch Set 2: Code-Review+1',
3359 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3360 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3361 ]
3362 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3363 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3364
3365 with git_cl.gclient_utils.temporary_directory() as tempdir:
3366 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3367 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3368 '-j', out_file]))
3369 with open(out_file) as f:
3370 read = json.load(f)
3371 self.assertEqual(len(read), 3)
3372 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3373 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3374 self.assertEqual(read[2], {
3375 u'date': u'2017-03-17 05:19:37.500000',
3376 u'message': u'Patch Set 2: Code-Review+1',
3377 u'approval': False,
3378 u'disapproval': False,
3379 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003380
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003381if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003382 logging.basicConfig(
3383 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003384 unittest.main()