blob: b7b4804fa88260ce1868ce37eff18f79bb5664d6 [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Unit tests for git_cl.py."""
7
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01009import datetime
tandriide281ae2016-10-12 06:02:30 -070010import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010011import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000013import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014import sys
15import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000016import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017
18sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
19
20from testing_support.auto_stub import TestCase
21
22import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000023import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000024import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026
tandrii5d48c322016-08-18 16:19:37 -070027def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
28 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
29
30
31CERR1 = callError(1)
32
33
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000034class ChangelistMock(object):
35 # A class variable so we can access it when we don't have access to the
36 # instance that's being set.
37 desc = ""
38 def __init__(self, **kwargs):
39 pass
40 def GetIssue(self):
41 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080042 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070044 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000045 ChangelistMock.desc = desc
46
tandrii5d48c322016-08-18 16:19:37 -070047
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000048class PresubmitMock(object):
49 def __init__(self, *args, **kwargs):
50 self.reviewers = []
51 @staticmethod
52 def should_continue():
53 return True
54
55
56class RietveldMock(object):
57 def __init__(self, *args, **kwargs):
58 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000059
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000060 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080061 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000062 return 'Issue: %d' % issue
63
maruel@chromium.org78936cb2013-04-11 00:17:52 +000064 @staticmethod
65 def get_issue_properties(_issue, _messages):
66 return {
67 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
68 'messages': [
69 {
70 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070071 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000072 '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
tandriif9aefb72016-07-01 09:06:51 -0700223 def test_get_bug_line_values(self):
224 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
225 self.assertEqual(f('', ''), [])
226 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
227 self.assertEqual(f('v8', '456'), ['v8:456'])
228 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
229 # Not nice, but not worth carying.
230 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
231 ['v8:456', 'chromium:123', 'v8:123'])
232
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100233 def _test_git_number(self, parent_msg, dest_ref, child_msg,
234 parent_hash='parenthash'):
235 desc = git_cl.ChangeDescription(child_msg)
236 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
237 return desc.description
238
239 def assertEqualByLine(self, actual, expected):
240 self.assertEqual(actual.splitlines(), expected.splitlines())
241
242 def test_git_number_bad_parent(self):
243 with self.assertRaises(ValueError):
244 self._test_git_number('Parent', 'refs/heads/master', 'Child')
245
246 def test_git_number_bad_parent_footer(self):
247 with self.assertRaises(AssertionError):
248 self._test_git_number(
249 'Parent\n'
250 '\n'
251 'Cr-Commit-Position: wrong',
252 'refs/heads/master', 'Child')
253
254 def test_git_number_bad_lineage_ignored(self):
255 actual = self._test_git_number(
256 'Parent\n'
257 '\n'
258 'Cr-Commit-Position: refs/heads/master@{#1}\n'
259 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
260 'refs/heads/master', 'Child')
261 self.assertEqualByLine(
262 actual,
263 'Child\n'
264 '\n'
265 'Cr-Commit-Position: refs/heads/master@{#2}\n'
266 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
267
268 def test_git_number_same_branch(self):
269 actual = self._test_git_number(
270 'Parent\n'
271 '\n'
272 'Cr-Commit-Position: refs/heads/master@{#12}',
273 dest_ref='refs/heads/master',
274 child_msg='Child')
275 self.assertEqualByLine(
276 actual,
277 'Child\n'
278 '\n'
279 'Cr-Commit-Position: refs/heads/master@{#13}')
280
281 def test_git_number_same_branch_with_originals(self):
282 actual = self._test_git_number(
283 'Parent\n'
284 '\n'
285 'Cr-Commit-Position: refs/heads/master@{#12}',
286 dest_ref='refs/heads/master',
287 child_msg='Child\n'
288 '\n'
289 'Some users are smart and insert their own footers\n'
290 '\n'
291 'Cr-Whatever: value\n'
292 'Cr-Commit-Position: refs/copy/paste@{#22}')
293 self.assertEqualByLine(
294 actual,
295 'Child\n'
296 '\n'
297 'Some users are smart and insert their own footers\n'
298 '\n'
299 'Cr-Original-Whatever: value\n'
300 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
301 'Cr-Commit-Position: refs/heads/master@{#13}')
302
303 def test_git_number_new_branch(self):
304 actual = self._test_git_number(
305 'Parent\n'
306 '\n'
307 'Cr-Commit-Position: refs/heads/master@{#12}',
308 dest_ref='refs/heads/branch',
309 child_msg='Child')
310 self.assertEqualByLine(
311 actual,
312 'Child\n'
313 '\n'
314 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
315 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
316
317 def test_git_number_lineage(self):
318 actual = self._test_git_number(
319 'Parent\n'
320 '\n'
321 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
322 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
323 dest_ref='refs/heads/branch',
324 child_msg='Child')
325 self.assertEqualByLine(
326 actual,
327 'Child\n'
328 '\n'
329 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
330 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
331
332 def test_git_number_moooooooore_lineage(self):
333 actual = self._test_git_number(
334 'Parent\n'
335 '\n'
336 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
337 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
338 dest_ref='refs/heads/mooore',
339 child_msg='Child')
340 self.assertEqualByLine(
341 actual,
342 'Child\n'
343 '\n'
344 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
345 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
346 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
347
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100348 def test_git_number_ever_moooooooore_lineage(self):
349 self.maxDiff = 10000
350 actual = self._test_git_number(
351 'CQ commit on fresh new branch + numbering.\n'
352 '\n'
353 'NOTRY=True\n'
354 'NOPRESUBMIT=True\n'
355 'BUG=\n'
356 '\n'
357 'Review-Url: https://codereview.chromium.org/2577703003\n'
358 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
359 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
360 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
361 dest_ref='refs/heads/gnumb-test/cl',
362 child_msg='git cl on fresh new branch + numbering.\n'
363 '\n'
364 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
365 self.assertEqualByLine(
366 actual,
367 'git cl on fresh new branch + numbering.\n'
368 '\n'
369 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
370 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
371 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
372 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
373 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100374
375 def test_git_number_cherry_pick(self):
376 actual = self._test_git_number(
377 'Parent\n'
378 '\n'
379 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
380 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
381 dest_ref='refs/heads/branch',
382 child_msg='Child, which is cherry-pick from master\n'
383 '\n'
384 'Cr-Commit-Position: refs/heads/master@{#100}\n'
385 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
386 self.assertEqualByLine(
387 actual,
388 'Child, which is cherry-pick from master\n'
389 '\n'
390 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
391 '\n'
392 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
393 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
394 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
395
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000396
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200397class TestParseIssueURL(unittest.TestCase):
398 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
399 codereview=None, fail=False):
400 self.assertIsNotNone(parsed)
401 if fail:
402 self.assertFalse(parsed.valid)
403 return
404 self.assertTrue(parsed.valid)
405 self.assertEqual(parsed.issue, issue)
406 self.assertEqual(parsed.patchset, patchset)
407 self.assertEqual(parsed.hostname, hostname)
408 self.assertEqual(parsed.codereview, codereview)
409
410 def _run_and_validate(self, func, url, *args, **kwargs):
411 result = func(urlparse.urlparse(url))
412 if kwargs.pop('fail', False):
413 self.assertIsNone(result)
414 return None
415 self._validate(result, *args, fail=False, **kwargs)
416
417 def test_rietveld(self):
418 def test(url, *args, **kwargs):
419 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
420 *args, codereview='rietveld', **kwargs)
421
422 test('http://codereview.chromium.org/123',
423 123, None, 'codereview.chromium.org')
424 test('https://codereview.chromium.org/123',
425 123, None, 'codereview.chromium.org')
426 test('https://codereview.chromium.org/123/',
427 123, None, 'codereview.chromium.org')
428 test('https://codereview.chromium.org/123/whatever',
429 123, None, 'codereview.chromium.org')
430 test('https://codereview.chromium.org/123/#ps20001',
431 123, 20001, 'codereview.chromium.org')
432 test('http://codereview.chromium.org/download/issue123_4.diff',
433 123, 4, 'codereview.chromium.org')
434 # This looks like bad Gerrit, but is actually valid Rietveld, too.
435 test('https://chrome-review.source.com/123/4/',
436 123, None, 'chrome-review.source.com')
437
438 test('https://codereview.chromium.org/deadbeaf', fail=True)
439 test('https://codereview.chromium.org/api/123', fail=True)
440 test('bad://codereview.chromium.org/123', fail=True)
441 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
442
443 def test_gerrit(self):
444 def test(url, issue=None, patchset=None, hostname=None, fail=None):
445 self._test_ParseIssueUrl(
446 git_cl._GerritChangelistImpl.ParseIssueURL,
447 url, issue, patchset, hostname, fail)
448 def test(url, *args, **kwargs):
449 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
450 *args, codereview='gerrit', **kwargs)
451
452 test('http://chrome-review.source.com/c/123',
453 123, None, 'chrome-review.source.com')
454 test('https://chrome-review.source.com/c/123/',
455 123, None, 'chrome-review.source.com')
456 test('https://chrome-review.source.com/c/123/4',
457 123, 4, 'chrome-review.source.com')
458 test('https://chrome-review.source.com/#/c/123/4',
459 123, 4, 'chrome-review.source.com')
460 test('https://chrome-review.source.com/c/123/4',
461 123, 4, 'chrome-review.source.com')
462 test('https://chrome-review.source.com/123',
463 123, None, 'chrome-review.source.com')
464 test('https://chrome-review.source.com/123/4',
465 123, 4, 'chrome-review.source.com')
466
467 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
468 test('https://chrome-review.source.com/c/abc/', fail=True)
469 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
470
471 def test_ParseIssueNumberArgument(self):
472 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200473 codereview_hint = kwargs.pop('hint', None)
474 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
475 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200476
477 test('123', 123)
478 test('', fail=True)
479 test('abc', fail=True)
480 test('123/1', fail=True)
481 test('123a', fail=True)
482 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
483 # Rietveld.
484 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200485 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200486 test('https://codereview.source.com/123',
487 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200488 # Matches both, but we take Gerrit if specifically requested.
489 test('https://codereview.source.com/123',
490 123, None, 'codereview.source.com', 'gerrit',
491 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200492 # Gerrrit.
493 test('https://chrome-review.source.com/c/123/4',
494 123, 4, 'chrome-review.source.com', 'gerrit')
495 test('https://chrome-review.source.com/bad/123/4', fail=True)
496
497
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100498class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100499 def setUp(self):
500 super(GitCookiesCheckerTest, self).setUp()
501 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100502 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100503
504 def mock_hosts_creds(self, subhost_identity_pairs):
505 def ensure_googlesource(h):
506 if not h.endswith(self.c._GOOGLESOURCE):
507 assert not h.endswith('.')
508 return h + '.' + self.c._GOOGLESOURCE
509 return h
510 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
511 for h, i in subhost_identity_pairs]
512
513 def test_analysis_nothing(self):
514 self.c._all_hosts = []
515 self.assertFalse(self.c.has_generic_host())
516 self.assertEqual(set(), self.c.get_conflicting_hosts())
517 self.assertEqual(set(), self.c.get_duplicated_hosts())
518 self.assertEqual(set(), self.c.get_partially_configured_hosts())
519 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
520
521 def test_analysis(self):
522 self.mock_hosts_creds([
523 ('.googlesource.com', 'git-example.chromium.org'),
524
525 ('chromium', 'git-example.google.com'),
526 ('chromium-review', 'git-example.google.com'),
527 ('chrome-internal', 'git-example.chromium.org'),
528 ('chrome-internal-review', 'git-example.chromium.org'),
529 ('conflict', 'git-example.google.com'),
530 ('conflict-review', 'git-example.chromium.org'),
531 ('dup', 'git-example.google.com'),
532 ('dup', 'git-example.google.com'),
533 ('dup-review', 'git-example.google.com'),
534 ('partial', 'git-example.google.com'),
535 ])
536 self.assertTrue(self.c.has_generic_host())
537 self.assertEqual(set(['conflict.googlesource.com']),
538 self.c.get_conflicting_hosts())
539 self.assertEqual(set(['dup.googlesource.com']),
540 self.c.get_duplicated_hosts())
541 self.assertEqual(set(['partial.googlesource.com']),
542 self.c.get_partially_configured_hosts())
543 self.assertEqual(set(['chromium.googlesource.com',
544 'chrome-internal.googlesource.com']),
545 self.c.get_hosts_with_wrong_identities())
546
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100547 def test_report_no_problems(self):
548 self.test_analysis_nothing()
549 self.mock(sys, 'stdout', StringIO.StringIO())
550 self.assertFalse(self.c.find_and_report_problems())
551 self.assertEqual(sys.stdout.getvalue(), '')
552
553 def test_report(self):
554 self.test_analysis()
555 self.mock(sys, 'stdout', StringIO.StringIO())
556 self.assertTrue(self.c.find_and_report_problems())
557 with open(os.path.join(os.path.dirname(__file__),
558 'git_cl_creds_check_report.txt')) as f:
559 expected = f.read()
560 def by_line(text):
561 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200562 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100563
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000564class TestGitCl(TestCase):
565 def setUp(self):
566 super(TestGitCl, self).setUp()
567 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700568 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000569 self.mock(subprocess2, 'call', self._mocked_call)
570 self.mock(subprocess2, 'check_call', self._mocked_call)
571 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700572 self.mock(subprocess2, 'communicate',
573 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000574 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000575 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000576 self.mock(git_common, 'get_or_create_merge_base',
577 lambda *a: (
578 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000579 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000580 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100581 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
582 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700583 self.mock(git_cl, 'write_json', lambda path, contents:
584 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000585 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000586 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000587 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700588 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
589 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000590 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000591 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000592 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100593 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
594 lambda *args, **kwargs: self._mocked_call(
595 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700596 self.mock(git_cl.gerrit_util, 'GetChangeComments',
597 lambda *args, **kwargs: self._mocked_call(
598 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100599 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700600 lambda h, i, reviewers, ccs, notify: self._mocked_call(
601 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700602 self.mock(git_cl.gerrit_util, 'SetReview',
603 lambda h, i, labels, notify: self._mocked_call(
604 'SetReview', h, i, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000605 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
606 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700607 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100608 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000609 # It's important to reset settings to not have inter-tests interference.
610 git_cl.settings = None
611
612 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000613 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100614 self.assertEquals([], self.calls)
615 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000616 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100617 raise
618 # Sadly, has_failed() returns True if this OR any other tests before this
619 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200620 git_cl.logging.error(
621 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100622 'There are un-consumed self.calls after this test has finished.\n'
623 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700624 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200625 'If you are already running only this test, then **first** fix the '
626 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100627 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700628 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100629 'and follow instructions above.\n' +
630 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000631 finally:
632 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000633
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000634 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000635 self.assertTrue(
636 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700637 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000638 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000639 expected_args, result = top
640
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000641 # Also logs otherwise it could get caught in a try/finally and be hard to
642 # diagnose.
643 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700644 N = 5
645 prior_calls = '\n '.join(
646 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
647 for i, c in enumerate(self._calls_done[-N:]))
648 following_calls = '\n '.join(
649 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
650 for i, c in enumerate(self.calls[:N]))
651 extended_msg = (
652 'A few prior calls:\n %s\n\n'
653 'This (expected):\n @%d: %r\n'
654 'This (actual):\n @%d: %r\n\n'
655 'A few following expected calls:\n %s' %
656 (prior_calls, len(self._calls_done), expected_args,
657 len(self._calls_done), args, following_calls))
658 git_cl.logging.error(extended_msg)
659
tandrii99a72f22016-08-17 14:33:24 -0700660 self.fail('@%d\n'
661 ' Expected: %r\n'
662 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700663 len(self._calls_done), expected_args, args))
664
665 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700666 if isinstance(result, Exception):
667 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000668 return result
669
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100670 def test_ask_for_explicit_yes_true(self):
671 self.calls = [
672 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
673 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
674 ]
675 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
676
677 def test_ask_for_explicit_yes_true(self):
678 self.calls = [
679 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
680 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
681 ]
682 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
683
tandrii48df5812016-10-17 03:55:37 -0700684 def test_LoadCodereviewSettingsFromFile_gerrit(self):
685 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
686 self.calls = [
687 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
688 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
689 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
690 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
691 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
692 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700693 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
694 CERR1),
695 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700696 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
697 CERR1),
698 ((['git', 'config', 'gerrit.host', 'true'],), ''),
699 ]
700 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
701
maruel@chromium.orga3353652011-11-30 14:26:57 +0000702 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000703 def _is_gerrit_calls(cls, gerrit=False):
704 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
705 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
706
707 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000708 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200709 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000710 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000711
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000712 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200713 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
714 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
715 ((['git', 'config', 'core.editor'],), ''),
716 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000717
718 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200719 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000720 if similarity is None:
721 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700722 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700723 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000724 else:
tandrii33a46ff2016-08-23 05:53:40 -0700725 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700726 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000727
728 if find_copies is None:
729 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700730 find_copies_call = ((['git', 'config', '--bool',
731 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000732 else:
tandrii5d48c322016-08-18 16:19:37 -0700733 val = str(find_copies).lower()
734 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735 'branch.master.git-find-copies', val],), '')
736
737 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000738 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800739 '-l100000', '-C'+similarity,
740 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000741 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000742 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000743 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000744
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000745 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000746 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000747 similarity_call,
748 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
749 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000750 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000751 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700752 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
753 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000754 ((['git', 'config', 'rietveld.server'],),
755 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000756 ((['git', 'config', 'branch.master.merge'],), 'master'),
757 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000758 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000759 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000760 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000761 ((['git', 'rev-parse', '--show-cdup'],), ''),
762 ((['git', 'rev-parse', 'HEAD'],), '12345'),
763 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000764 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000765 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700766 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000767 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000768 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000769 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000770 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000771 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000772 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000773 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000774 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700775 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000776 ]
777
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000778 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000779 def _git_upload_calls(cls, private):
780 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000781 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000782 private_call = []
783 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000784 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000785 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000786 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000787
maruel@chromium.orga3353652011-11-30 14:26:57 +0000788 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000789 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000790 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000791 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800792 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000793 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700794 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000795 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000796 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000797 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700798 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000799 ] + cls._git_post_upload_calls()
800
801 @classmethod
802 def _git_post_upload_calls(cls):
803 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000804 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
805 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
806 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000807 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000808 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000809 ]
810
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000811 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000812 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000813 fake_ancestor = 'fake_ancestor'
814 fake_cl = 'fake_cl_for_patch'
815 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000816 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000817 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000819 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000820 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000821 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000822 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000823 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700824 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000825 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000826 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000828 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000829 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000830 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000831 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000832 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000833 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000834 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000835 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000836
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000837 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700838 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000839 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000840 return [
841 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000842 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000843 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000844 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700845 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000846 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000847 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100848 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000849 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000850 ]
851
852 def _run_reviewer_test(
853 self,
854 upload_args,
855 expected_description,
856 returned_description,
857 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000858 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700859 private=False,
860 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000861 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000862 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000863 try:
864 similarity = upload_args[upload_args.index('--similarity')+1]
865 except ValueError:
866 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000867
868 if '--find-copies' in upload_args:
869 find_copies = True
870 elif '--no-find-copies' in upload_args:
871 find_copies = False
872 else:
873 find_copies = None
874
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000875 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700876 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000877
878 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000879
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000880 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000881 self.assertEquals(
882 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000883 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000884 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000885 '#--------------------This line is 72 characters long'
886 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000887 expected_description,
888 desc)
889 return returned_description
890 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000891
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000892 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000893 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700894 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000895 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000896 return 1, 2
897 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000898
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000899 git_cl.main(['upload'] + upload_args)
900
901 def test_no_reviewer(self):
902 self._run_reviewer_test(
903 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000904 'desc\n\nBUG=',
905 '# Blah blah comment.\ndesc\n\nBUG=',
906 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000907 [])
908
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000909 def test_keep_similarity(self):
910 self._run_reviewer_test(
911 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000912 'desc\n\nBUG=',
913 '# Blah blah comment.\ndesc\n\nBUG=',
914 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000915 [])
916
iannucci@chromium.org79540052012-10-19 23:15:26 +0000917 def test_keep_find_copies(self):
918 self._run_reviewer_test(
919 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000920 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000921 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000922 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000923 [])
924
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000925 def test_private(self):
926 self._run_reviewer_test(
927 ['--private'],
928 'desc\n\nBUG=',
929 '# Blah blah comment.\ndesc\n\nBUG=\n',
930 'desc\n\nBUG=',
931 [])
932
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000933 def test_reviewers_cmd_line(self):
934 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000935 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000936 self._run_reviewer_test(
937 ['-r' 'foo@example.com'],
938 description,
939 '\n%s\n' % description,
940 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000941 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000942
943 def test_reviewer_tbr_overriden(self):
944 # Reviewer is overriden with TBR
945 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000946 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 self._run_reviewer_test(
948 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000949 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950 description.strip('\n'),
951 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000952 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000953
954 def test_reviewer_multiple(self):
955 # Handles multiple R= or TBR= lines.
956 description = (
bradnelsond975b302016-10-23 12:20:23 -0700957 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
958 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000959 self._run_reviewer_test(
960 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000961 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000962 description,
963 description,
bradnelsond975b302016-10-23 12:20:23 -0700964 ['--reviewers=another@example.com,reviewer@example.com'],
965 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000966
maruel@chromium.orga3353652011-11-30 14:26:57 +0000967 def test_reviewer_send_mail(self):
968 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000970 self._run_reviewer_test(
971 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000972 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000973 description.strip('\n'),
974 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000975 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000976
977 def test_reviewer_send_mail_no_rev(self):
978 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000979 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200980 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -0700981 ((['DieWithError', 'Must specify reviewers to send email.'],),
982 SystemExitMock())
983 ]
984
985 def RunEditor(desc, _, **kwargs):
986 return desc
987 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
988 self.mock(sys, 'stdout', stdout)
989 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000990 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -0700991 self.assertEqual(
992 '=====================================\n'
993 'NOTICE: Rietveld is being deprecated. '
994 'You can upload changes to Gerrit with\n'
995 ' git cl upload --gerrit\n'
996 'or set Gerrit to be your default code review tool with\n'
997 ' git config gerrit.host true\n'
998 '=====================================\n',
999 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001000
tandriif9aefb72016-07-01 09:06:51 -07001001 def test_bug_on_cmd(self):
1002 self._run_reviewer_test(
1003 ['--bug=500658,proj:123'],
1004 'desc\n\nBUG=500658\nBUG=proj:123',
1005 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1006 'desc\n\nBUG=500658\nBUG=proj:1234',
1007 [])
1008
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001009 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1010 parent_msg=None,
1011 new_msg=None,
1012 fail_after_parent_msg=False,
1013 fail_cherry_pick=False,
1014 fail_push_count=0,
1015 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001016 if debug:
1017 # Very useful due to finally clause in git cl land raising exceptions and
1018 # shadowing real cause of failure.
1019 self.mock(git_cl, '_IS_BEING_TESTED', True)
1020 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001021 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001022
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001023 if git_numberer_enabled:
1024 # Special mocks to check validity of timestamp.
1025 original_git_amend_head = git_cl._git_amend_head
1026 def _git_amend_head_mock(msg, tstamp):
1027 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1028 return original_git_amend_head(msg, tstamp)
1029 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1030
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001031 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1032 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001033 self.mock(RietveldMock, 'update_description', staticmethod(
1034 lambda i, d: self._mocked_call(['update_description', i, d])))
1035 self.mock(RietveldMock, 'add_comment', staticmethod(
1036 lambda i, c: self._mocked_call(['add_comment', i, c])))
1037 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001038 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1039 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1040 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1041 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1042 CERR1),
1043 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1044 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001045 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001046 ((['git', 'config', 'rietveld.server'],),
1047 'https://codereview.chromium.org'),
1048 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1049 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1050 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1051 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001052 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1053 ''), # No commits to rebase, according to local view of origin.
1054 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1055 'fake_ancestor_sha'),
1056 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1057 ((['git', 'rev-parse', '--show-cdup'],), ''),
1058 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1059 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1060 'fake_ancestor_sha...', '.'],),
1061 'M\tfile1.cpp'),
1062 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1063 ((['git', 'config', 'branch.feature.rietveldserver'],),
1064 'https://codereview.chromium.org'),
1065 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1066 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1067 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1068 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001069 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001070 # file1.cpp | 53 ++++++--
1071 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1072 ''),
1073 ((['git', 'show-ref', '--quiet', '--verify',
1074 'refs/heads/git-cl-commit'],),
1075 ''), # 0 return code means branch exists.
1076 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1077 ((['git', 'show-ref', '--quiet', '--verify',
1078 'refs/heads/git-cl-cherry-pick'],),
1079 CERR1), # This means git-cl-cherry-pick branch does not exist.
1080 ((['git', 'rev-parse', '--show-cdup'],), ''),
1081 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1082 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1083 ((['git', 'commit', '-m',
1084 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001085 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001086 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1087 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1088 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001089 repo_url),
1090
1091 ((['git', 'config', 'remote.origin.url'],), repo_url),
1092 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1093 git_numberer_enabled),
1094
1095 # Auto-rebase init.
1096 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1097 ]
1098 # Auto-rebase loops.
1099 for attempt in xrange(fail_push_count + 1):
1100 self.calls += [
1101 # Auto-rebase loop start.
1102 ((['git', 'retry', 'fetch', 'origin',
1103 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1104 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1105 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1106 # different in each loop iteration for truly realistic test.
1107 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1108 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1109 callError(1, 'failed to cherry pick') if fail_cherry_pick
1110 else ''),
1111 ]
1112 if fail_cherry_pick:
1113 return
1114
1115 if git_numberer_enabled:
1116 assert parent_msg
1117 self.calls += [
1118 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1119 parent_msg),
1120 ]
1121 if fail_after_parent_msg:
1122 return
1123 assert new_msg
1124 self.calls += [
1125 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1126 '1480022355'), # Committer's unix timestamp.
1127 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1128 '1480024000'),
1129 ((['git_amend_head committer timestamp', 1480024000],), ''),
1130 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1131 ]
1132 self.calls += [
1133 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1134 CERR1 if attempt < fail_push_count else ''),
1135 ]
1136 # End of autorebase + push.
1137
1138 self.calls += [
1139 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1140 ]
1141 if git_numberer_enabled:
1142 self.calls += [
1143 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1144 ]
1145
1146 # Cleanup calls.
1147 self.calls += [
1148 ((['git', 'checkout', '-q', 'feature'],), ''),
1149 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1150 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001151 ]
1152
1153 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001154 self._land_rietveld_calls(
1155 repo_url='https://chromium.googlesource.com/infra/infra',
1156 git_numberer_enabled=False,
1157 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001158 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001159 ((['git', 'config', 'rietveld.viewvc-url'],),
1160 'https://chromium.googlesource.com/infra/infra/+/'),
1161 ((['update_description', 123,
1162 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001163 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001164 ''),
1165 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001166 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001167 ]
1168 git_cl.main(['land'])
1169
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001170 def test_land_rietveld_fail_cherry_pick(self):
1171 self._land_rietveld_calls(
1172 repo_url='https://chromium.googlesource.com/infra/infra',
1173 git_numberer_enabled=False,
1174 fail_cherry_pick=True,
1175 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001176 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001177 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1178 'U path/file1\n'
1179 'U file2.cpp\n'),
1180 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001181 ((['git', 'checkout', '-q', 'feature'],), ''),
1182 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001183 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1184 ]
1185 git_cl.main(['land'])
1186
1187 def test_land_rietveld_git_numberer_fail_1_push(self):
1188 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1189
1190 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1191 self._land_rietveld_calls(
1192 repo_url='https://chromium.googlesource.com/chromium/src',
1193 git_numberer_enabled=True,
1194 parent_msg=('This is parent commit.\n'
1195 '\n'
1196 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1197 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1198 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1199 '\n'
1200 'Review-Url: https://codereview.chromium.org/123 .\n'
1201 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1202 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1203 fail_push_count=fail_push_count,
1204 debug=False)
1205
1206 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001207 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001208 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001209 ((['update_description', 123,
1210 'Issue: 123\n\nR=john@chromium.org\n'
1211 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001212 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001213 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1214 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1215 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001216 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001217 ''),
1218 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001219 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001220 ]
1221 git_cl.main(['land'])
1222
1223 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001224 self._land_rietveld_calls(
1225 repo_url='https://chromium.googlesource.com/v8/v8',
1226 git_numberer_enabled=True,
1227 parent_msg='This is parent commit with no footer.',
1228 fail_after_parent_msg=True,
1229 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001230 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001231 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001232 ((['git', 'checkout', '-q', 'feature'],), ''),
1233 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001234 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001235 ]
1236 with self.assertRaises(ValueError) as cm:
1237 git_cl.main(['land'])
1238 self.assertEqual(cm.exception.message,
1239 'Unable to infer commit position from footers')
1240
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001241 def test_git_numberer_not_whitelisted_repo(self):
1242 self.calls = []
1243 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001244 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1245 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001246 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001247
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001248 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001249 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1250 self.calls = [
1251 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001252 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001253 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001254 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001255 remote_url='https://chromium.googlesource.com/chromium/src',
1256 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001257 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001258
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001259 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001260 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001261 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001262 def fake_temporary_directory(**kwargs):
1263 yield tempdir
1264 self.mock(git_cl.gclient_utils, 'temporary_directory',
1265 fake_temporary_directory)
1266 self._test_GitNumbererState_valid_configs_inner(tempdir)
1267
1268 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001269 self.calls = [
1270 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001271 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001272 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1273 '''
1274 [plugin "git-numberer"]
1275 validate-enabled-refglob = refs/else/*
1276 validate-enabled-refglob = refs/heads/*
1277 validate-disabled-refglob = refs/heads/disabled
1278 validate-disabled-refglob = refs/branch-heads/*
1279 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001280 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1281 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001282 'refs/else/*\n'
1283 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001284 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1285 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001286 'refs/heads/disabled\n'
1287 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001288 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001289
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001290 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001291 remote_url='https://chromium.googlesource.com/chromium/src',
1292 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001293 self.assertEqual(res, True)
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/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001298 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001299
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001300 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001301 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001302 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001303 remote_url='https://chromium.googlesource.com/chromium/src',
1304 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001305 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001306
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001307 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001308 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001309 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001310 if skip_auth_check:
1311 return [((cmd, ), 'true')]
1312
tandrii5d48c322016-08-18 16:19:37 -07001313 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001314 if issue:
1315 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001316 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001317 ])
1318 calls.extend([
1319 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1320 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1321 ((['git', 'config', 'remote.origin.url'],),
1322 'https://chromium.googlesource.com/my/repo'),
1323 ((['git', 'config', 'remote.origin.url'],),
1324 'https://chromium.googlesource.com/my/repo'),
1325 ])
1326 return calls
1327
1328 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001329 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001330 fetched_status=None, other_cl_owner=None,
1331 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001332 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001333 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1334 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1335 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1336 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001337 ]
1338 calls += cls._is_gerrit_calls(True)
1339 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001340 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1341 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1342 ((['git', 'config', 'branch.master.gerritissue'],),
1343 CERR1 if issue is None else str(issue)),
1344 ]
1345
1346 if custom_cl_base:
1347 ancestor_revision = custom_cl_base
1348 else:
1349 # Determine ancestor_revision to be merge base.
1350 ancestor_revision = 'fake_ancestor_sha'
1351 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001352 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001353 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001354 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001355 'refs/remotes/origin/master'],), ancestor_revision),
1356 ]
1357
1358 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001359 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1360
1361 if issue:
1362 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001363 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001364 '123456',
1365 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001366 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001367 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001368 'change_id': '123456789',
1369 'current_revision': 'sha1_of_current_revision',
1370 'revisions': { 'sha1_of_current_revision': {
1371 'commit': {'message': fetched_description},
1372 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001373 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001374 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001375 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001376 if fetched_status == 'ABANDONED':
1377 calls += [
1378 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1379 '123456 has been abandoned, new uploads are not '
1380 'allowed'), SystemExitMock()),
1381 ]
1382 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001383 if other_cl_owner:
1384 calls += [
1385 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1386 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001387
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1389 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001390 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001391 ((['git', 'rev-parse', '--show-cdup'],), ''),
1392 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001393
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001394 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1395 ancestor_revision + '...', '.'],),
1396 'M\t.gitignore\n'),
1397 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001398 ]
1399
1400 if not issue:
1401 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001402 ((['git', 'log', '--pretty=format:%s%n%n%b',
1403 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001404 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001405 ]
1406
1407 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001408 ((['git', 'config', 'user.email'],), 'me@example.com'),
1409 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1410 ([custom_cl_base] if custom_cl_base else
1411 [ancestor_revision, 'HEAD']),),
1412 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001413 ]
1414 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001415
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001416 @classmethod
1417 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001418 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001419 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001420 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001421 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001422 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001423 if post_amend_description is None:
1424 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001425 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001426 # Determined in `_gerrit_base_calls`.
1427 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1428
1429 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001430
tandriia60502f2016-06-20 02:01:53 -07001431 if squash_mode == 'default':
1432 calls.extend([
1433 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1434 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1435 ])
1436 elif squash_mode in ('override_squash', 'override_nosquash'):
1437 calls.extend([
1438 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1439 'true' if squash_mode == 'override_squash' else 'false'),
1440 ])
1441 else:
1442 assert squash_mode in ('squash', 'nosquash')
1443
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001444 # If issue is given, then description is fetched from Gerrit instead.
1445 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001446 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001447 ((['git', 'log', '--pretty=format:%s\n\n%b',
1448 ((custom_cl_base + '..') if custom_cl_base else
1449 'fake_ancestor_sha..HEAD')],),
1450 description),
1451 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001452 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001453 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001454 else:
1455 if not title:
1456 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001457 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1458 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001459 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001460 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001461 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001462 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001463 (('DownloadGerritHook', False), ''),
1464 # Amending of commit message to get the Change-Id.
1465 ((['git', 'log', '--pretty=format:%s\n\n%b',
1466 determined_ancestor_revision + '..HEAD'],),
1467 description),
1468 ((['git', 'commit', '--amend', '-m', description],), ''),
1469 ((['git', 'log', '--pretty=format:%s\n\n%b',
1470 determined_ancestor_revision + '..HEAD'],),
1471 post_amend_description)
1472 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001473 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001474 if not issue:
1475 # Prompting to edit description on first upload.
1476 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001477 ((['git', 'config', 'core.editor'],), ''),
1478 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001479 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001480 ref_to_push = 'abcdef0123456789'
1481 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001482 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1483 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1484 ]
1485
1486 if custom_cl_base is None:
1487 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001488 ((['get_or_create_merge_base', 'master',
1489 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001490 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001491 ]
1492 parent = 'origin/master'
1493 else:
1494 calls += [
1495 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1496 'refs/remotes/origin/master'],),
1497 callError(1)), # Means not ancenstor.
1498 (('ask_for_data',
1499 'Do you take responsibility for cleaning up potential mess '
1500 'resulting from proceeding with upload? Press Enter to upload, '
1501 'or Ctrl+C to abort'), ''),
1502 ]
1503 parent = custom_cl_base
1504
1505 calls += [
1506 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1507 '0123456789abcdef'),
1508 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1509 '-m', description],),
1510 ref_to_push),
1511 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001512 else:
1513 ref_to_push = 'HEAD'
1514
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001515 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001516 ((['git', 'rev-list',
1517 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1518 ref_to_push],),
1519 '1hashPerLine\n'),
1520 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001521
Aaron Gablefd238082017-06-07 13:42:34 -07001522 ref_suffix = ''
Aaron Gable9b713dd2016-12-14 16:04:21 -08001523 if title:
Aaron Gablefd238082017-06-07 13:42:34 -07001524 ref_suffix += '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001525
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001526 notify_suffix = 'notify=NONE'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001527 if ref_suffix:
1528 ref_suffix += ',' + notify_suffix
1529 else:
1530 ref_suffix = '%' + notify_suffix
1531
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001532 if git_mirror is None:
1533 calls += [
1534 ((['git', 'config', 'remote.origin.url'],),
1535 'https://chromium.googlesource.com/yyy/zzz'),
1536 ]
1537 else:
1538 calls += [
1539 ((['git', 'config', 'remote.origin.url'],),
1540 '/cache/this-dir-exists'),
1541 (('os.path.isdir', '/cache/this-dir-exists'),
1542 True),
1543 # Runs in /cache/this-dir-exists.
1544 ((['git', 'config', 'remote.origin.url'],),
1545 'https://chromium.googlesource.com/yyy/zzz'),
1546 ]
1547
ukai@chromium.orge8077812012-02-03 03:41:46 +00001548 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001549 ((['git', 'push',
1550 'https://chromium.googlesource.com/yyy/zzz',
1551 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001552 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001553 'remote: Processing changes: (\)\n'
1554 'remote: Processing changes: (|)\n'
1555 'remote: Processing changes: (/)\n'
1556 'remote: Processing changes: (-)\n'
1557 'remote: Processing changes: new: 1 (/)\n'
1558 'remote: Processing changes: new: 1, done\n'
1559 'remote:\n'
1560 'remote: New Changes:\n'
1561 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1562 'remote:\n'
1563 'To https://chromium.googlesource.com/yyy/zzz\n'
1564 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001565 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001566 if squash:
1567 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001568 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001569 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001570 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001571 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001572 ((['git', 'config', 'branch.master.gerritsquashhash',
1573 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001574 ]
tandrii88189772016-09-29 04:29:57 -07001575 calls += [
1576 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001577 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001578 123456 if squash else None, sorted(reviewers),
1579 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001580 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001581 if tbr:
1582 calls += [
1583 (('SetReview', 'chromium-review.googlesource.com',
Andrii Shyshkalov2c376aa2017-06-09 15:39:37 +02001584 123456 if squash else None, {'Code-Review': 1},
1585 'ALL' if notify else 'NONE'), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001586 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001587 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001588 return calls
1589
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001590 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001591 self,
1592 upload_args,
1593 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001594 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001595 squash=True,
1596 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001597 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001598 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001599 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001600 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001601 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001602 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001603 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001604 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001605 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001606 custom_cl_base=None,
1607 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001608 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001609 if squash_mode is None:
1610 if '--no-squash' in upload_args:
1611 squash_mode = 'nosquash'
1612 elif '--squash' in upload_args:
1613 squash_mode = 'squash'
1614 else:
1615 squash_mode = 'default'
1616
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001617 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001618 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001619 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001620 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001621 CookiesAuthenticatorMockFactory(
1622 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001623 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1624 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001625 self.mock(git_cl.gclient_utils, 'RunEditor',
1626 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001627 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1628 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001629
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001630 original_os_path_isdir = os.path.isdir
1631 def selective_os_path_isdir_mock(path):
1632 if path == '/cache/this-dir-exists':
1633 return self._mocked_call('os.path.isdir', path)
1634 return original_os_path_isdir(path)
1635 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1636
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001637 self.calls = self._gerrit_base_calls(
1638 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001639 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001640 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001641 other_cl_owner=other_cl_owner,
1642 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001643 if fetched_status != 'ABANDONED':
1644 self.calls += self._gerrit_upload_calls(
1645 description, reviewers, squash,
1646 squash_mode=squash_mode,
1647 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001648 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001649 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001650 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001651 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001652 # Uncomment when debugging.
1653 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001654 git_cl.main(['upload'] + upload_args)
1655
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001656 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001657 self._run_gerrit_upload_test(
1658 ['--no-squash'],
1659 'desc\n\nBUG=\n',
1660 [],
1661 squash=False,
1662 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1663
1664 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001665 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001666 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001667 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001668 [],
tandriia60502f2016-06-20 02:01:53 -07001669 squash=False,
1670 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001671 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001672
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001673 def test_gerrit_no_reviewer(self):
1674 self._run_gerrit_upload_test(
1675 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001676 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001677 [],
1678 squash=False,
1679 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001680
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001681 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001682 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1683 self._run_gerrit_upload_test(
1684 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1685 'desc\n\nBUG=\n\nChange-Id: I123456789',
1686 squash=False,
1687 squash_mode='override_nosquash',
1688 title='Dont_put_bad_chars')
1689 self.assertIn(
1690 'WARNING: Patchset title may only contain alphanumeric chars '
1691 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1692 'Cleaned up title: Dont put bad chars\n',
1693 git_cl.sys.stdout.getvalue())
1694
ukai@chromium.orge8077812012-02-03 03:41:46 +00001695 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001696 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001697 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001698 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001699 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001700 squash=False,
1701 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001702 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001703
1704 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001705 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001706 [],
bradnelsond975b302016-10-23 12:20:23 -07001707 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1708 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001709 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001710 ['reviewer@example.com', 'another@example.com'],
1711 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001712 squash_mode='override_nosquash',
Aaron Gablefd238082017-06-07 13:42:34 -07001713 cc=['more@example.com', 'people@example.com'],
1714 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001715
1716 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001717 self._run_gerrit_upload_test(
1718 [],
1719 'desc\nBUG=\n\nChange-Id: 123456789',
1720 [],
1721 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001722
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001723 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001724 self._run_gerrit_upload_test(
1725 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001726 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001727 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001728 squash=True,
1729 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001730
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001731 def test_gerrit_upload_squash_first_against_rev(self):
1732 custom_cl_base = 'custom_cl_base_rev_or_branch'
1733 self._run_gerrit_upload_test(
1734 ['--squash', custom_cl_base],
1735 'desc\nBUG=\n\nChange-Id: 123456789',
1736 [],
1737 squash=True,
1738 expected_upstream_ref='origin/master',
1739 custom_cl_base=custom_cl_base)
1740 self.assertIn(
1741 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1742 sys.stdout.getvalue())
1743
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001744 def test_gerrit_upload_squash_first_with_mirror(self):
1745 self._run_gerrit_upload_test(
1746 ['--squash'],
1747 'desc\nBUG=\n\nChange-Id: 123456789',
1748 [],
1749 squash=True,
1750 expected_upstream_ref='origin/master',
1751 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1752
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001753 def test_gerrit_upload_squash_reupload(self):
1754 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001755 self._run_gerrit_upload_test(
1756 ['--squash'],
1757 description,
1758 [],
1759 squash=True,
1760 expected_upstream_ref='origin/master',
1761 issue=123456)
1762
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001763 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1764 self.mock(git_cl, 'DieWithError',
1765 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1766 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1767 with self.assertRaises(SystemExitMock):
1768 self._run_gerrit_upload_test(
1769 ['--squash'],
1770 description,
1771 [],
1772 squash=True,
1773 expected_upstream_ref='origin/master',
1774 issue=123456,
1775 fetched_status='ABANDONED')
1776
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001777 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1778 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1779 lambda *_, **__: {'email': 'yet-another@example.com'})
1780 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1781 self._run_gerrit_upload_test(
1782 ['--squash'],
1783 description,
1784 [],
1785 squash=True,
1786 expected_upstream_ref='origin/master',
1787 issue=123456,
1788 other_cl_owner='other@example.com')
1789 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001790 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001791 'authenticate to Gerrit as yet-another@example.com.\n'
1792 'Uploading may fail due to lack of permissions',
1793 git_cl.sys.stdout.getvalue())
1794
rmistry@google.com2dd99862015-06-22 12:22:18 +00001795 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001796 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001797 def mock_run_git(*args, **_kwargs):
1798 if args[0] == ['for-each-ref',
1799 '--format=%(refname:short) %(upstream:short)',
1800 'refs/heads']:
1801 # Create a local branch dependency tree that looks like this:
1802 # test1 -> test2 -> test3 -> test4 -> test5
1803 # -> test3.1
1804 # test6 -> test0
1805 branch_deps = [
1806 'test2 test1', # test1 -> test2
1807 'test3 test2', # test2 -> test3
1808 'test3.1 test2', # test2 -> test3.1
1809 'test4 test3', # test3 -> test4
1810 'test5 test4', # test4 -> test5
1811 'test6 test0', # test0 -> test6
1812 'test7', # test7
1813 ]
1814 return '\n'.join(branch_deps)
1815 self.mock(git_cl, 'RunGit', mock_run_git)
1816
1817 class RecordCalls:
1818 times_called = 0
1819 record_calls = RecordCalls()
1820 def mock_CMDupload(*args, **_kwargs):
1821 record_calls.times_called += 1
1822 return 0
1823 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1824
1825 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001826 (('ask_for_data', 'This command will checkout all dependent branches '
1827 'and run "git cl upload". Press Enter to continue, '
1828 'or Ctrl+C to abort'), ''),
1829 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001830
1831 class MockChangelist():
1832 def __init__(self):
1833 pass
1834 def GetBranch(self):
1835 return 'test1'
1836 def GetIssue(self):
1837 return '123'
1838 def GetPatchset(self):
1839 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001840 def IsGerrit(self):
1841 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001842
1843 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1844 # CMDupload should have been called 5 times because of 5 dependent branches.
1845 self.assertEquals(5, record_calls.times_called)
1846 self.assertEquals(0, ret)
1847
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001848 def test_gerrit_change_id(self):
1849 self.calls = [
1850 ((['git', 'write-tree'], ),
1851 'hashtree'),
1852 ((['git', 'rev-parse', 'HEAD~0'], ),
1853 'branch-parent'),
1854 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1855 'A B <a@b.org> 1456848326 +0100'),
1856 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1857 'C D <c@d.org> 1456858326 +0100'),
1858 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1859 'hashchange'),
1860 ]
1861 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1862 self.assertEqual(change_id, 'Ihashchange')
1863
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001864 def test_desecription_append_footer(self):
1865 for init_desc, footer_line, expected_desc in [
1866 # Use unique desc first lines for easy test failure identification.
1867 ('foo', 'R=one', 'foo\n\nR=one'),
1868 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1869 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1870 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1871 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1872 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1873 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1874 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1875 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1876 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1877 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1878 ]:
1879 desc = git_cl.ChangeDescription(init_desc)
1880 desc.append_footer(footer_line)
1881 self.assertEqual(desc.description, expected_desc)
1882
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001883 def test_update_reviewers(self):
1884 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001885 ('foo', [], [],
1886 'foo'),
1887 ('foo\nR=xx', [], [],
1888 'foo\nR=xx'),
1889 ('foo\nTBR=xx', [], [],
1890 'foo\nTBR=xx'),
1891 ('foo', ['a@c'], [],
1892 'foo\n\nR=a@c'),
1893 ('foo\nR=xx', ['a@c'], [],
1894 'foo\n\nR=a@c, xx'),
1895 ('foo\nTBR=xx', ['a@c'], [],
1896 'foo\n\nR=a@c\nTBR=xx'),
1897 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1898 'foo\n\nR=a@c, yy\nTBR=xx'),
1899 ('foo\nBUG=', ['a@c'], [],
1900 'foo\nBUG=\nR=a@c'),
1901 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1902 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1903 ('foo', ['a@c', 'b@c'], [],
1904 'foo\n\nR=a@c, b@c'),
1905 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1906 'foo\nBar\n\nR=c@c\nBUG='),
1907 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1908 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001909 # Same as the line before, but full of whitespaces.
1910 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001911 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001912 'foo\nBar\n\nR=c@c\n BUG =',
1913 ),
1914 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001915 ('foo BUG=allo R=joe ', ['c@c'], [],
1916 'foo BUG=allo R=joe\n\nR=c@c'),
1917 # Redundant TBRs get promoted to Rs
1918 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1919 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001920 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001921 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001922 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001923 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001924 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001925 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001926 actual.append(obj.description)
1927 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001928
wittman@chromium.org455dc922015-01-26 20:15:50 +00001929 def test_get_target_ref(self):
1930 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001931 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001932 self.assertEqual(None, git_cl.GetTargetRef(None,
1933 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001934 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001935
wittman@chromium.org455dc922015-01-26 20:15:50 +00001936 # Check default target refs for branches.
1937 self.assertEqual('refs/heads/master',
1938 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001939 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001940 self.assertEqual('refs/heads/master',
1941 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001942 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001943 self.assertEqual('refs/heads/master',
1944 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001945 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001946 self.assertEqual('refs/branch-heads/123',
1947 git_cl.GetTargetRef('origin',
1948 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001949 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001950 self.assertEqual('refs/diff/test',
1951 git_cl.GetTargetRef('origin',
1952 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001953 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001954 self.assertEqual('refs/heads/chrome/m42',
1955 git_cl.GetTargetRef('origin',
1956 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001957 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001958
1959 # Check target refs for user-specified target branch.
1960 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1961 'refs/remotes/branch-heads/123'):
1962 self.assertEqual('refs/branch-heads/123',
1963 git_cl.GetTargetRef('origin',
1964 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001965 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001966 for branch in ('origin/master', 'remotes/origin/master',
1967 'refs/remotes/origin/master'):
1968 self.assertEqual('refs/heads/master',
1969 git_cl.GetTargetRef('origin',
1970 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001971 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001972 for branch in ('master', 'heads/master', 'refs/heads/master'):
1973 self.assertEqual('refs/heads/master',
1974 git_cl.GetTargetRef('origin',
1975 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001976 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001977
wychen@chromium.orga872e752015-04-28 23:42:18 +00001978 def test_patch_when_dirty(self):
1979 # Patch when local tree is dirty
1980 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1981 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1982
1983 def test_diff_when_dirty(self):
1984 # Do 'git cl diff' when local tree is dirty
1985 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1986 self.assertNotEqual(git_cl.main(['diff']), 0)
1987
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001988 @staticmethod
1989 def _get_gerrit_codereview_server_calls(branch, value=None,
1990 git_short_host='host',
1991 detect_branch=True):
1992 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1993
1994 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1995 """
1996 calls = []
1997 if detect_branch:
1998 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1999 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2000 CERR1 if value is None else value))
2001 if value is None:
2002 calls += [
2003 ((['git', 'config', 'branch.' + branch + '.merge'],),
2004 'refs/heads' + branch),
2005 ((['git', 'config', 'branch.' + branch + '.remote'],),
2006 'origin'),
2007 ((['git', 'config', 'remote.origin.url'],),
2008 'https://%s.googlesource.com/my/repo' % git_short_host),
2009 ]
2010 return calls
2011
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002012 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002013 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002014 detect_gerrit_server=True,
2015 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002016 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002017 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2018 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002019 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002020 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002021 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2022
tandriidf09a462016-08-18 16:23:55 -07002023 if new_branch:
2024 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2025 else:
2026 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002027
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002028 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002029 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002030 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002031 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002032 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2033 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2034 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2035 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002036 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002037 if default_codereview == 'gerrit':
2038 if not force_codereview:
2039 self.calls += [
2040 ((['git', 'config', 'gerrit.host'],), 'true'),
2041 ]
2042 if detect_gerrit_server:
2043 self.calls += self._get_gerrit_codereview_server_calls(
2044 'master', git_short_host=git_short_host,
2045 detect_branch=not new_branch and force_codereview)
2046 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002047
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002048 elif default_codereview == 'rietveld':
2049 self.calls += [
2050 ((['git', 'config', 'gerrit.host'],), CERR1),
2051 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2052 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2053 ]
2054 actual_codereview = 'rietveld'
2055
2056 if actual_codereview == 'rietveld':
2057 self.calls += [
2058 ((['git', 'rev-parse', '--show-cdup'],), ''),
2059 ]
2060 if not default_codereview:
2061 self.calls += [
2062 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2063 ]
2064 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002065 self.calls += [
2066 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002067 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002068 {
2069 'current_revision': '7777777777',
2070 'revisions': {
2071 '1111111111': {
2072 '_number': 1,
2073 'fetch': {'http': {
2074 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2075 'ref': 'refs/changes/56/123456/1',
2076 }},
2077 },
2078 '7777777777': {
2079 '_number': 7,
2080 'fetch': {'http': {
2081 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2082 'ref': 'refs/changes/56/123456/7',
2083 }},
2084 },
2085 },
2086 }),
2087 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002088
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002089 def _common_patch_rietveld_successful(self, **kwargs):
2090 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002091 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002092 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002093 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002094 ((['git', 'config', 'branch.master.rietveldserver',
2095 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002096 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002097 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002098 ((['git', 'commit', '-m',
2099 'Description\n\n' +
2100 'patch from issue 123456 at patchset 60001 ' +
2101 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002102 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002103
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002104 def test_patch_rietveld_default(self):
2105 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002106 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2107
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002108 def test_patch_rietveld_successful_new_branch(self):
2109 self._common_patch_rietveld_successful(default_codereview='rietveld',
2110 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002111 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2112
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002113 def test_patch_rietveld_guess_by_url(self):
2114 self._common_patch_rietveld_successful(
2115 default_codereview=None, # It doesn't matter.
2116 actual_codereview='rietveld')
2117 self.assertEqual(git_cl.main(
2118 ['patch', 'https://codereview.example.com/123456']), 0)
2119
2120 def test_patch_rietveld_conflict(self):
2121 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002122 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002123 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002124
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002125 def test_patch_gerrit_default(self):
2126 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002127 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002128 self.calls += [
2129 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2130 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002131 ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''),
2132 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002133 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002134 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002135 ((['git', 'config', 'branch.master.gerritserver',
2136 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002137 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002138 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2139 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2140 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141 ]
2142 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2143
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002144 def test_patch_gerrit_force(self):
2145 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002146 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002147 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002148 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002149 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002150 ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''),
2151 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002152 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002153 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002154 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002155 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002156 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002157 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2158 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2159 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002160 ]
2161 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2162
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002163 def test_patch_gerrit_guess_by_url(self):
2164 self._patch_common(
2165 default_codereview=None, # It doesn't matter what's default.
2166 actual_codereview='gerrit',
2167 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002168 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002169 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002170 'refs/changes/56/123456/1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002171 ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''),
2172 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002173 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002174 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002175 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002177 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002178 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002179 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2180 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2181 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002182 ]
2183 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002184 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002185
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002186 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2187 self._patch_common(
2188 default_codereview=None, # It doesn't matter what's default.
2189 actual_codereview='gerrit',
2190 git_short_host='else', detect_gerrit_server=False)
2191 self.calls += [
2192 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2193 'refs/changes/56/123456/1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002194 ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],), ''),
2195 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002196 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2197 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2198 ''),
2199 ((['git', 'config', 'branch.master.gerritserver',
2200 'https://else-review.googlesource.com'],), ''),
2201 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002202 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2203 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2204 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002205 ]
2206 self.assertEqual(git_cl.main(
2207 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2208
Aaron Gable9387b4f2017-06-08 10:50:03 -07002209 def test_patch_gerrit_local_content(self):
2210 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
2211 git_short_host='chromium')
2212 self.calls += [
2213 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2214 'refs/changes/56/123456/7'],), ''),
2215 ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],),
2216 CERR1),
2217 ((['git', 'merge-base', '--ancestor', 'HEAD', 'FETCH_HEAD'],),
2218 CERR1),
2219 (('ask_for_data',
2220 'It looks like you\'re on a branch with some local commits.\n'
2221 'If you apply this patch on top of your local content, you will not be '
2222 'able to easily upload further changes based on it.\n'
2223 'Would you like to proceed with applying this patch anyway?\n'
2224 'Press Enter to confirm, or Ctrl+C to abort'), 'y'),
2225 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2226 ]
2227 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2228
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002229 def test_patch_gerrit_conflict(self):
2230 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002231 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002232 self.calls += [
2233 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002234 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002235 ((['git', 'merge-base', '--ancestor', 'HEAD', 'origin/master'],),
2236 CERR1),
2237 ((['git', 'merge-base', '--ancestor', 'HEAD', 'FETCH_HEAD'],),
2238 CERR1),
2239 (('ask_for_data',
2240 'It looks like you\'re on a branch with some local commits.\n'
2241 'If you apply this patch on top of your local content, you will not be '
2242 'able to easily upload further changes based on it.\n'
2243 'Would you like to proceed with applying this patch anyway?\n'
2244 'Press Enter to confirm, or Ctrl+C to abort'), 'y'),
tandrii5d48c322016-08-18 16:19:37 -07002245 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2246 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2247 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002248 ]
2249 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002250 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002251
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002252 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002253 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002254 raise git_cl.gerrit_util.GerritError(404, '')
2255 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2256
tandriic2405f52016-10-10 08:13:15 -07002257 self.calls = [
2258 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2259 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2260 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2261 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2262 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2263 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002264 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2265 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2266 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2267 ((['git', 'config', 'remote.origin.url'],),
2268 'https://chromium.googlesource.com/my/repo'),
2269 ((['DieWithError',
2270 'change 123456 at https://chromium-review.googlesource.com does not '
2271 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002272 ]
2273 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002274 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002275
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002276 def _checkout_calls(self):
2277 return [
2278 ((['git', 'config', '--local', '--get-regexp',
2279 'branch\\..*\\.rietveldissue'], ),
2280 ('branch.retrying.rietveldissue 1111111111\n'
2281 'branch.some-fix.rietveldissue 2222222222\n')),
2282 ((['git', 'config', '--local', '--get-regexp',
2283 'branch\\..*\\.gerritissue'], ),
2284 ('branch.ger-branch.gerritissue 123456\n'
2285 'branch.gbranch654.gerritissue 654321\n')),
2286 ]
2287
2288 def test_checkout_gerrit(self):
2289 """Tests git cl checkout <issue>."""
2290 self.calls = self._checkout_calls()
2291 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2292 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2293
2294 def test_checkout_rietveld(self):
2295 """Tests git cl checkout <issue>."""
2296 self.calls = self._checkout_calls()
2297 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2298 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2299
2300 def test_checkout_not_found(self):
2301 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002302 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002303 self.calls = self._checkout_calls()
2304 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2305
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002306 def test_checkout_no_branch_issues(self):
2307 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002308 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002309 self.calls = [
2310 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002311 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002312 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002313 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002314 ]
2315 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2316
tandrii@chromium.org28253532016-04-14 13:46:56 +00002317 def _test_gerrit_ensure_authenticated_common(self, auth,
2318 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002319 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2320 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2321 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002322 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002323 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002324 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002325 cl.branch = 'master'
2326 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002327 cl.lookedup_issue = True
2328 return cl
2329
2330 def test_gerrit_ensure_authenticated_missing(self):
2331 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002332 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002333 })
2334 self.calls.append(
2335 ((['DieWithError',
2336 'Credentials for the following hosts are required:\n'
2337 ' chromium-review.googlesource.com\n'
2338 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002339 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002340 'https://chromium-review.googlesource.com/new-password'],), ''),)
2341 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2342
2343 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002344 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002345 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002346 'chromium.googlesource.com':
2347 ('git-one.example.com', None, 'secret1'),
2348 'chromium-review.googlesource.com':
2349 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002350 })
2351 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002352 (('ask_for_data', 'If you know what you are doing '
2353 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002354 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2355
2356 def test_gerrit_ensure_authenticated_ok(self):
2357 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002358 'chromium.googlesource.com':
2359 ('git-same.example.com', None, 'secret'),
2360 'chromium-review.googlesource.com':
2361 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002362 })
2363 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2364
tandrii@chromium.org28253532016-04-14 13:46:56 +00002365 def test_gerrit_ensure_authenticated_skipped(self):
2366 cl = self._test_gerrit_ensure_authenticated_common(
2367 auth={}, skip_auth_check=True)
2368 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2369
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002370 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002371 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2372 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002373 self.calls = [
2374 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002375 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002376 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2377 ((['git', 'config', 'rietveld.server'],), ''),
2378 ((['git', 'config', 'rietveld.server'],), ''),
2379 ((['git', 'config', 'branch.feature.rietveldserver'],),
2380 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002381 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002382 ]
2383 self.assertEqual(0, git_cl.main(['set-commit']))
2384
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002385 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002386 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002387 lambda h, i, labels, notify=None:
2388 self._mocked_call(['SetReview', h, i, labels, notify]))
2389
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002390 self.calls = [
2391 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002392 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2393 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002394 ((['git', 'config', 'branch.feature.gerritserver'],),
2395 'https://chromium-review.googlesource.com'),
2396 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002397 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002398 ]
tandriid9e5ce52016-07-13 02:32:59 -07002399
2400 def test_cmd_set_commit_gerrit_clear(self):
2401 self._cmd_set_commit_gerrit_common(0)
2402 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2403
2404 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002405 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002406 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2407
tandriid9e5ce52016-07-13 02:32:59 -07002408 def test_cmd_set_commit_gerrit(self):
2409 self._cmd_set_commit_gerrit_common(2)
2410 self.assertEqual(0, git_cl.main(['set-commit']))
2411
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002412 def test_description_display(self):
2413 out = StringIO.StringIO()
2414 self.mock(git_cl.sys, 'stdout', out)
2415
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002416 self.mock(git_cl, 'Changelist', ChangelistMock)
2417 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002418
2419 self.assertEqual(0, git_cl.main(['description', '-d']))
2420 self.assertEqual('foo\n', out.getvalue())
2421
2422 def test_description_rietveld(self):
2423 out = StringIO.StringIO()
2424 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002425 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002426
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002427 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002428 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002429 self.assertEqual('foobar\n', out.getvalue())
2430
iannucci3c972b92016-08-17 13:24:10 -07002431 def test_StatusFieldOverrideIssueMissingArgs(self):
2432 out = StringIO.StringIO()
2433 self.mock(git_cl.sys, 'stderr', out)
2434
2435 try:
2436 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2437 except SystemExit as ex:
2438 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002439 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002440
2441 out = StringIO.StringIO()
2442 self.mock(git_cl.sys, 'stderr', out)
2443
2444 try:
2445 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2446 except SystemExit as ex:
2447 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002448 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002449
2450 def test_StatusFieldOverrideIssue(self):
2451 out = StringIO.StringIO()
2452 self.mock(git_cl.sys, 'stdout', out)
2453
2454 def assertIssue(cl_self, *_args):
2455 self.assertEquals(cl_self.issue, 1)
2456 return 'foobar'
2457
2458 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2459 self.calls = [
2460 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2461 ((['git', 'config', 'rietveld.server'],), ''),
2462 ((['git', 'config', 'rietveld.server'],), ''),
2463 ]
iannuccie53c9352016-08-17 14:40:40 -07002464 self.assertEqual(
2465 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2466 0)
iannucci3c972b92016-08-17 13:24:10 -07002467 self.assertEqual(out.getvalue(), 'foobar\n')
2468
iannuccie53c9352016-08-17 14:40:40 -07002469 def test_SetCloseOverrideIssue(self):
2470 def assertIssue(cl_self, *_args):
2471 self.assertEquals(cl_self.issue, 1)
2472 return 'foobar'
2473
2474 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2475 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2476 self.calls = [
2477 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2478 ((['git', 'config', 'rietveld.server'],), ''),
2479 ((['git', 'config', 'rietveld.server'],), ''),
2480 ]
2481 self.assertEqual(
2482 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2483
2484 def test_SetCommitOverrideIssue(self):
2485 def assertIssue(cl_self, *_args):
2486 self.assertEquals(cl_self.issue, 1)
2487 return 'foobar'
2488
2489 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2490 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2491 self.calls = [
2492 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2493 ((['git', 'config', 'rietveld.server'],), ''),
2494 ((['git', 'config', 'rietveld.server'],), ''),
2495 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2496 ((['git', 'config', 'rietveld.server'],), ''),
2497 ((['git', 'config', 'rietveld.server'],), ''),
2498 ]
2499 self.assertEqual(
2500 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2501
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002502 def test_description_gerrit(self):
2503 out = StringIO.StringIO()
2504 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002505 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002506 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002507 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2508 {
2509 'current_revision': 'sha1',
2510 'revisions': {'sha1': {
2511 'commit': {'message': 'foobar'},
2512 }},
2513 }),
2514 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002515 self.assertEqual(0, git_cl.main([
2516 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2517 self.assertEqual('foobar\n', out.getvalue())
2518
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002519 def test_description_set_raw(self):
2520 out = StringIO.StringIO()
2521 self.mock(git_cl.sys, 'stdout', out)
2522
2523 self.mock(git_cl, 'Changelist', ChangelistMock)
2524 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2525
2526 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2527 self.assertEqual('hihi', ChangelistMock.desc)
2528
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002529 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002530 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002531
2532 def RunEditor(desc, _, **kwargs):
2533 self.assertEquals(
2534 '# Enter a description of the change.\n'
2535 '# This will be displayed on the codereview site.\n'
2536 '# The first line will also be used as the subject of the review.\n'
2537 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002538 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002539 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002540 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002541 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002542 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002543
dsansomee2d6fd92016-09-08 00:10:47 -07002544 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002545 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002546
2547 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2548 self.mock(git_cl.Changelist, 'GetDescription',
2549 lambda *args: current_desc)
2550 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2551 UpdateDescriptionRemote)
2552 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2553
2554 self.calls = [
2555 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002556 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002557 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2558 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002559 ((['git', 'config', 'core.editor'],), 'vi'),
2560 ]
2561 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2562
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002563 def test_description_set_stdin(self):
2564 out = StringIO.StringIO()
2565 self.mock(git_cl.sys, 'stdout', out)
2566
2567 self.mock(git_cl, 'Changelist', ChangelistMock)
2568 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2569
2570 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2571 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2572
kmarshall3bff56b2016-06-06 18:31:47 -07002573 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002574 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2575
kmarshall3bff56b2016-06-06 18:31:47 -07002576 self.calls = \
2577 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2578 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002579 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002580 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2581 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002582 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2583 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2584 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002585 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2586 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2587 ((['git', 'branch', '-D', 'foo'],), '')]
2588
kmarshall3bff56b2016-06-06 18:31:47 -07002589 self.mock(git_cl, 'get_cl_statuses',
2590 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002591 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2592 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2593 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002594
2595 self.assertEqual(0, git_cl.main(['archive', '-f']))
2596
2597 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002598 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002599 self.calls = \
2600 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2601 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002602 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002603 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2604 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002605 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2606
kmarshall9249e012016-08-23 12:02:16 -07002607 self.mock(git_cl, 'get_cl_statuses',
2608 lambda branches, fine_grained, max_processes:
2609 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2610
2611 self.assertEqual(1, git_cl.main(['archive', '-f']))
2612
2613 def test_archive_dry_run(self):
2614 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2615
2616 self.calls = \
2617 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2618 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2619 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2620 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2621 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2622 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2623 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2624 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2625 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002626
2627 self.mock(git_cl, 'get_cl_statuses',
2628 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002629 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2630 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2631 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002632
kmarshall9249e012016-08-23 12:02:16 -07002633 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2634
2635 def test_archive_no_tags(self):
2636 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2637
2638 self.calls = \
2639 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2640 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2641 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2642 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2643 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2644 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2645 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2646 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2647 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2648 ((['git', 'branch', '-D', 'foo'],), '')]
2649
2650 self.mock(git_cl, 'get_cl_statuses',
2651 lambda branches, fine_grained, max_processes:
2652 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2653 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2654 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2655
2656 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002657
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002658 def test_cmd_issue_erase_existing(self):
2659 out = StringIO.StringIO()
2660 self.mock(git_cl.sys, 'stdout', out)
2661 self.calls = [
2662 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002663 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2664 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002665 # Let this command raise exception (retcode=1) - it should be ignored.
2666 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002667 CERR1),
2668 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2669 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002670 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2671 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2672 ''),
2673 ]
2674 self.assertEqual(0, git_cl.main(['issue', '0']))
2675
phajdan.jre328cf92016-08-22 04:12:17 -07002676 def test_cmd_issue_json(self):
2677 out = StringIO.StringIO()
2678 self.mock(git_cl.sys, 'stdout', out)
2679 self.calls = [
2680 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002681 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002682 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2683 ((['git', 'config', 'rietveld.server'],),
2684 'https://codereview.chromium.org'),
2685 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2686 (('write_json', 'output.json',
2687 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2688 ''),
2689 ]
2690 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2691
tandriide281ae2016-10-12 06:02:30 -07002692 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002693 self.mock(git_cl.Changelist, 'GetChange',
2694 lambda _, *a: (
2695 self._mocked_call(['GetChange']+list(a))))
2696 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2697 lambda *_, **__: (
2698 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002699 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2700 lambda _, s: self._mocked_call(['SetCQState', s]))
2701 self.calls = [
2702 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002703 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002704 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2705 ((['git', 'config', 'rietveld.server'],),
2706 'https://codereview.chromium.org'),
2707 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2708 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2709 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2710 ((['get_or_create_merge_base', 'feature', 'feature'],),
2711 'fake_ancestor_sha'),
2712 ((['GetChange', 'fake_ancestor_sha', None], ),
2713 git_cl.presubmit_support.GitChange(
2714 '', '', '', '', '', '', '', '')),
2715 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2716 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002717 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2718 ]
2719 out = StringIO.StringIO()
2720 self.mock(git_cl.sys, 'stdout', out)
2721 self.assertEqual(0, git_cl.main(['try']))
2722 self.assertEqual(
2723 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002724 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002725
tandrii8c5a3532016-11-04 07:52:02 -07002726 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2727 self.mock(git_cl.Changelist, 'GetChange',
2728 lambda _, *a: (
2729 self._mocked_call(['GetChange']+list(a))))
2730 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2731 lambda *_, **__: (
2732 self._mocked_call(['DoGetTryMasters'])))
2733 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2734 lambda _, s: self._mocked_call(['SetCQState', s]))
2735
tandrii8c5a3532016-11-04 07:52:02 -07002736 self.calls = [
2737 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2738 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2739 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2740 ((['git', 'config', 'branch.feature.gerritserver'],),
2741 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002742 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2743 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2744 'project': 'depot_tools',
2745 'status': 'OPEN',
2746 'owner': {'email': 'owner@e.mail'},
2747 'revisions': {
2748 'deadbeaf': {
2749 '_number': 6,
2750 },
2751 'beeeeeef': {
2752 '_number': 7,
2753 'fetch': {'http': {
2754 'url': 'https://chromium.googlesource.com/depot_tools',
2755 'ref': 'refs/changes/56/123456/7'
2756 }},
2757 },
2758 },
2759 }),
tandrii8c5a3532016-11-04 07:52:02 -07002760 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2761 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2762 ((['get_or_create_merge_base', 'feature', 'feature'],),
2763 'fake_ancestor_sha'),
2764 ((['GetChange', 'fake_ancestor_sha', None], ),
2765 git_cl.presubmit_support.GitChange(
2766 '', '', '', '', '', '', '', '')),
2767 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2768 ((['DoGetTryMasters'], ), None),
2769 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2770 ]
2771 out = StringIO.StringIO()
2772 self.mock(git_cl.sys, 'stdout', out)
2773 self.assertEqual(0, git_cl.main(['try']))
2774 self.assertEqual(
2775 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002776 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002777 'https://chromium-review.googlesource.com/123456\n')
2778
2779 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2780 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2781 lambda _: {
2782 'owner_email': 'owner@e.mail',
2783 'private': False,
2784 'closed': False,
2785 'project': 'depot_tools',
2786 'patchsets': [20001],
2787 })
tandriide281ae2016-10-12 06:02:30 -07002788 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2789 self.calls = [
2790 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2791 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2792 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2793 ((['git', 'config', 'rietveld.server'],),
2794 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002795 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002796 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002797 ]
2798
2799 def _buildbucket_retry(*_, **kw):
2800 # self.maxDiff = 10000
2801 body = json.loads(kw['body'])
2802 self.assertEqual(len(body['builds']), 1)
2803 build = body['builds'][0]
2804 params = json.loads(build.pop('parameters_json'))
2805 self.assertEqual(params, {
2806 u'builder_name': u'win',
2807 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2808 u'revision': None}],
2809 u'properties': {
2810 u'category': u'git_cl_try',
2811 u'issue': 123,
2812 u'key': u'val',
2813 u'json': [{u'a': 1}, None],
2814 u'master': u'tryserver.chromium',
2815 u'patch_project': u'depot_tools',
2816 u'patch_storage': u'rietveld',
2817 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002818 u'rietveld': u'https://codereview.chromium.org',
2819 }
2820 })
2821 self.assertEqual(build, {
2822 u'bucket': u'master.tryserver.chromium',
2823 u'client_operation_id': u'uuid4',
2824 u'tags': [u'builder:win',
2825 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002826 u'user_agent:git_cl_try',
2827 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002828 })
2829
2830 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2831
2832 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2833 self.assertEqual(0, git_cl.main([
2834 'try', '-m', 'tryserver.chromium', '-b', 'win',
2835 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2836 self.assertRegexpMatches(
2837 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002838 'Tried jobs on:\nBucket: master.tryserver.chromium')
2839
tandrii8c5a3532016-11-04 07:52:02 -07002840 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2841 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2842 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2843
tandrii8c5a3532016-11-04 07:52:02 -07002844 self.calls = [
2845 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2846 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2847 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2848 ((['git', 'config', 'branch.feature.gerritserver'],),
2849 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002850 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002851 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002852 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002853 'status': 'OPEN',
2854 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002855 'revisions': {
2856 'deadbeaf': {
2857 '_number': 6,
2858 },
2859 'beeeeeef': {
2860 '_number': 7,
2861 'fetch': {'http': {
2862 'url': 'https://chromium.googlesource.com/depot_tools',
2863 'ref': 'refs/changes/56/123456/7'
2864 }},
2865 },
2866 },
2867 }),
2868 ]
2869
2870 def _buildbucket_retry(*_, **kw):
2871 # self.maxDiff = 10000
2872 body = json.loads(kw['body'])
2873 self.assertEqual(len(body['builds']), 1)
2874 build = body['builds'][0]
2875 params = json.loads(build.pop('parameters_json'))
2876 self.assertEqual(params, {
2877 u'builder_name': u'win',
2878 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2879 u'revision': None}],
2880 u'properties': {
2881 u'category': u'git_cl_try',
2882 u'key': u'val',
2883 u'json': [{u'a': 1}, None],
2884 u'master': u'tryserver.chromium',
2885
2886 u'patch_gerrit_url':
2887 u'https://chromium-review.googlesource.com',
2888 u'patch_issue': 123456,
2889 u'patch_project': u'depot_tools',
2890 u'patch_ref': u'refs/changes/56/123456/7',
2891 u'patch_repository_url':
2892 u'https://chromium.googlesource.com/depot_tools',
2893 u'patch_set': 7,
2894 u'patch_storage': u'gerrit',
2895 }
2896 })
2897 self.assertEqual(build, {
2898 u'bucket': u'master.tryserver.chromium',
2899 u'client_operation_id': u'uuid4',
2900 u'tags': [
2901 u'builder:win',
2902 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2903 u'user_agent:git_cl_try',
2904 u'master:tryserver.chromium'],
2905 })
2906
2907 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2908
2909 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2910 self.assertEqual(0, git_cl.main([
2911 'try', '-m', 'tryserver.chromium', '-b', 'win',
2912 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2913 self.assertRegexpMatches(
2914 git_cl.sys.stdout.getvalue(),
2915 'Tried jobs on:\nBucket: master.tryserver.chromium')
2916
borenet6c0efe62016-10-19 08:13:29 -07002917 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002918 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2919 lambda _: {
2920 'owner_email': 'owner@e.mail',
2921 'private': False,
2922 'closed': False,
2923 'project': 'depot_tools',
2924 'patchsets': [20001],
2925 })
borenet6c0efe62016-10-19 08:13:29 -07002926 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2927 self.calls = [
2928 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2929 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2930 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2931 ((['git', 'config', 'rietveld.server'],),
2932 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002933 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002934 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002935 ]
2936
2937 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002938 body = json.loads(kw['body'])
2939 self.assertEqual(len(body['builds']), 1)
2940 build = body['builds'][0]
2941 params = json.loads(build.pop('parameters_json'))
2942 self.assertEqual(params, {
2943 u'builder_name': u'win',
2944 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2945 u'revision': None}],
2946 u'properties': {
2947 u'category': u'git_cl_try',
2948 u'issue': 123,
2949 u'patch_project': u'depot_tools',
2950 u'patch_storage': u'rietveld',
2951 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002952 u'rietveld': u'https://codereview.chromium.org',
2953 }
2954 })
2955 self.assertEqual(build, {
2956 u'bucket': u'test.bucket',
2957 u'client_operation_id': u'uuid4',
2958 u'tags': [u'builder:win',
2959 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2960 u'user_agent:git_cl_try'],
2961 })
2962
2963 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2964
2965 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2966 self.assertEqual(0, git_cl.main([
2967 'try', '-B', 'test.bucket', '-b', 'win']))
2968 self.assertRegexpMatches(
2969 git_cl.sys.stdout.getvalue(),
2970 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002971
qyearsley123a4682016-10-26 09:12:17 -07002972 def test_git_cl_try_bots_on_multiple_masters(self):
2973 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2974 self.calls = [
2975 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2976 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2977 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2978 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002979 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002980 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2981 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2982 ]
2983
2984 def _buildbucket_retry(*_, **kw):
2985 body = json.loads(kw['body'])
2986 self.assertEqual(len(body['builds']), 2)
2987
2988 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2989 self.assertEqual(first_build_params['builder_name'], 'builder1')
2990 self.assertEqual(first_build_params['properties']['master'], 'master1')
2991
2992 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2993 self.assertEqual(first_build_params['builder_name'], 'builder2')
2994 self.assertEqual(first_build_params['properties']['master'], 'master2')
2995
2996 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2997
2998 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2999 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3000
3001 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3002 self.assertEqual(
3003 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3004 self.assertEqual(
3005 git_cl.sys.stdout.getvalue(),
3006 'Tried jobs on:\n'
3007 'Bucket: master.master1\n'
3008 ' builder1: []\n'
3009 'Bucket: master.master2\n'
3010 ' builder2: []\n'
3011 'To see results here, run: git cl try-results\n'
3012 'To see results in browser, run: git cl web\n')
3013
tandrii16e0b4e2016-06-07 10:34:28 -07003014 def _common_GerritCommitMsgHookCheck(self):
3015 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3016 self.mock(git_cl.os.path, 'abspath',
3017 lambda path: self._mocked_call(['abspath', path]))
3018 self.mock(git_cl.os.path, 'exists',
3019 lambda path: self._mocked_call(['exists', path]))
3020 self.mock(git_cl.gclient_utils, 'FileRead',
3021 lambda path: self._mocked_call(['FileRead', path]))
3022 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3023 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3024 self.calls = [
3025 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3026 ((['abspath', '../'],), '/abs/git_repo_root'),
3027 ]
3028 return git_cl.Changelist(codereview='gerrit', issue=123)
3029
3030 def test_GerritCommitMsgHookCheck_custom_hook(self):
3031 cl = self._common_GerritCommitMsgHookCheck()
3032 self.calls += [
3033 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3034 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3035 '#!/bin/sh\necho "custom hook"')
3036 ]
3037 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3038
3039 def test_GerritCommitMsgHookCheck_not_exists(self):
3040 cl = self._common_GerritCommitMsgHookCheck()
3041 self.calls += [
3042 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3043 ]
3044 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3045
3046 def test_GerritCommitMsgHookCheck(self):
3047 cl = self._common_GerritCommitMsgHookCheck()
3048 self.calls += [
3049 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3050 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3051 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003052 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003053 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3054 ''),
3055 ]
3056 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3057
tandriic4344b52016-08-29 06:04:54 -07003058 def test_GerritCmdLand(self):
3059 self.calls += [
3060 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3061 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3062 'deadbeaf'),
3063 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3064 ((['git', 'config', 'branch.feature.gerritserver'],),
3065 'chromium-review.googlesource.com'),
3066 ]
3067 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3068 cl._codereview_impl._GetChangeDetail = lambda _: {
3069 'labels': {},
3070 'current_revision': 'deadbeaf',
3071 }
agable32978d92016-11-01 12:55:02 -07003072 cl._codereview_impl._GetChangeCommit = lambda: {
3073 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003074 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003075 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3076 }
tandriic4344b52016-08-29 06:04:54 -07003077 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003078 out = StringIO.StringIO()
3079 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003080 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003081 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003082 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003083
tandrii221ab252016-10-06 08:12:04 -07003084 BUILDBUCKET_BUILDS_MAP = {
3085 '9000': {
3086 'id': '9000',
3087 'status': 'STARTED',
3088 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3089 'result_details_json': '{"properties": {}}',
3090 'bucket': 'master.x.y',
3091 'created_by': 'user:someone@chromium.org',
3092 'created_ts': '147200002222000',
3093 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3094 },
3095 '8000': {
3096 'id': '8000',
3097 'status': 'COMPLETED',
3098 'result': 'FAILURE',
3099 'failure_reason': 'BUILD_FAILURE',
3100 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3101 'result_details_json': '{"properties": {}}',
3102 'bucket': 'master.x.y',
3103 'created_by': 'user:someone@chromium.org',
3104 'created_ts': '147200001111000',
3105 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3106 },
3107 }
3108
3109 def test_write_try_results_json(self):
3110 expected_output = [
3111 {
3112 'buildbucket_id': '8000',
3113 'bucket': 'master.x.y',
3114 'builder_name': 'my-builder',
3115 'status': 'COMPLETED',
3116 'result': 'FAILURE',
3117 'failure_reason': 'BUILD_FAILURE',
3118 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3119 },
3120 {
3121 'buildbucket_id': '9000',
3122 'bucket': 'master.x.y',
3123 'builder_name': 'my-builder',
3124 'status': 'STARTED',
3125 'result': None,
3126 'failure_reason': None,
3127 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3128 }
3129 ]
3130 self.calls = [(('write_json', 'output.json', expected_output), '')]
3131 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3132
tandrii45b2a582016-10-11 03:14:16 -07003133 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003134 out = StringIO.StringIO()
3135 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003136 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3137 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003138 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3139 self._mocked_call(['get_authenticator_for_host', host]))
3140 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3141 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003142
3143 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3144 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003145 self.calls += [
3146 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3147 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3148 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3149 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3150 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3151 ((['git', 'config', 'branch.feature.rietveldserver'],),
3152 'codereview.example.com'),
3153 ((['get_authenticator_for_host', 'codereview.example.com'],),
3154 AuthenticatorMock()),
3155 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3156
3157 def test_fetch_try_jobs_none_rietveld(self):
3158 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003159 # Simulate that user isn't logged in.
3160 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003161 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003162 self.assertRegexpMatches(sys.stdout.getvalue(),
3163 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003164 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3165
3166 def test_fetch_try_jobs_some_rietveld(self):
3167 self._setup_fetch_try_jobs_rietveld({
3168 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3169 })
3170 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003171 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3172 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3173 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3174
3175 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3176 self._setup_fetch_try_jobs(most_recent_patchset=13)
3177 self.calls += [
3178 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3179 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3180 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003181 # TODO(tandrii): Uncomment the below if we decide to support checking
3182 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003183 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003184 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003185 ((['git', 'config', 'branch.feature.gerritserver'],),
3186 'https://x-review.googlesource.com'),
3187 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3188 AuthenticatorMock()),
3189 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3190
3191 def test_fetch_try_jobs_none_gerrit(self):
3192 self._setup_fetch_try_jobs_gerrit({})
3193 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003194 # TODO(tandrii): Uncomment the below if we decide to support checking
3195 # patchsets for Gerrit.
3196 # self.assertRegexpMatches(
3197 # sys.stdout.getvalue(),
3198 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003199 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3200
3201 def test_fetch_try_jobs_some_gerrit(self):
3202 self._setup_fetch_try_jobs_gerrit({
3203 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3204 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003205 # TODO(tandrii): Uncomment the below if we decide to support checking
3206 # patchsets for Gerrit.
3207 # self.calls.remove(
3208 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003209 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3210
3211 # ... and doesn't result in warning.
3212 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3213 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003214 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3215 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3216
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003217 def _mock_gerrit_changes_for_detail_cache(self):
3218 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003219
3220 def test_gerrit_change_detail_cache_normalize(self):
3221 self._mock_gerrit_changes_for_detail_cache()
3222 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003223 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003224 ]
3225 cl = git_cl.Changelist(codereview='gerrit')
3226 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3227 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3228 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3229 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3230
3231 def test_gerrit_change_detail_cache_simple(self):
3232 self._mock_gerrit_changes_for_detail_cache()
3233 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003234 (('GetChangeDetail', 'host', '1', []), 'a'),
3235 (('GetChangeDetail', 'host', '2', []), 'b'),
3236 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003237 ]
3238 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3239 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3240 self.assertEqual(cl._GetChangeDetail(), 'a')
3241 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003242 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003243 self.assertEqual(cl._GetChangeDetail(), 'a')
3244 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3245
3246 def test_gerrit_change_detail_cache_options(self):
3247 self._mock_gerrit_changes_for_detail_cache()
3248 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003249 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3250 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3251 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3252 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003253 ]
3254 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3255 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3256 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3257 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3258 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3259 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3260 self.assertEqual(cl._GetChangeDetail(), 'cab')
3261
3262 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3263 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3264 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3265 self.assertEqual(cl._GetChangeDetail(), 'cab')
3266
3267 # Finally, no_cache should invalidate all caches for given change.
3268 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3269 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3270
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003271 def test_gerrit_description_caching(self):
3272 def gen_detail(rev, desc):
3273 return {
3274 'current_revision': rev,
3275 'revisions': {rev: {'commit': {'message': desc}}}
3276 }
3277 self.calls = [
3278 (('GetChangeDetail', 'host', '1',
3279 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3280 gen_detail('rev1', 'desc1')),
3281 (('GetChangeDetail', 'host', '1',
3282 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3283 gen_detail('rev2', 'desc2')),
3284 ]
3285
3286 self._mock_gerrit_changes_for_detail_cache()
3287 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3288 self.assertEqual(cl.GetDescription(), 'desc1')
3289 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3290 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003291
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003292 def test_print_current_creds(self):
3293 class CookiesAuthenticatorMock(object):
3294 def __init__(self):
3295 self.gitcookies = {
3296 'host.googlesource.com': ('user', 'pass'),
3297 'host-review.googlesource.com': ('user', 'pass'),
3298 }
3299 self.netrc = self
3300 self.netrc.hosts = {
3301 'github.com': ('user2', None, 'pass2'),
3302 'host2.googlesource.com': ('user3', None, 'pass'),
3303 }
3304 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3305 CookiesAuthenticatorMock)
3306 self.mock(sys, 'stdout', StringIO.StringIO())
3307 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3308 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3309 ' Host\t User\t Which file',
3310 '============================\t=====\t===========',
3311 'host-review.googlesource.com\t user\t.gitcookies',
3312 ' host.googlesource.com\t user\t.gitcookies',
3313 ' host2.googlesource.com\tuser3\t .netrc',
3314 ])
3315 sys.stdout.buf = ''
3316 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3317 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3318 ' Host\tUser\t Which file',
3319 '============================\t====\t===========',
3320 'host-review.googlesource.com\tuser\t.gitcookies',
3321 ' host.googlesource.com\tuser\t.gitcookies',
3322 ])
3323
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003324 def _common_creds_check_mocks(self):
3325 def exists_mock(path):
3326 dirname = os.path.dirname(path)
3327 if dirname == os.path.expanduser('~'):
3328 dirname = '~'
3329 base = os.path.basename(path)
3330 if base in ('.netrc', '.gitcookies'):
3331 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3332 # git cl also checks for existence other files not relevant to this test.
3333 return None
3334 self.mock(os.path, 'exists', exists_mock)
3335 self.mock(sys, 'stdout', StringIO.StringIO())
3336
3337 def test_creds_check_gitcookies_not_configured(self):
3338 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003339 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003340 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003341 self.calls = [
3342 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3343 (('os.path.exists', '~/.netrc'), True),
3344 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3345 'or Ctrl+C to abort'), ''),
3346 ((['git', 'config', '--global', 'http.cookiefile',
3347 os.path.expanduser('~/.gitcookies')], ), ''),
3348 ]
3349 self.assertEqual(0, git_cl.main(['creds-check']))
3350 self.assertRegexpMatches(
3351 sys.stdout.getvalue(),
3352 '^You seem to be using outdated .netrc for git credentials:')
3353 self.assertRegexpMatches(
3354 sys.stdout.getvalue(),
3355 '\nConfigured git to use .gitcookies from')
3356
3357 def test_creds_check_gitcookies_configured_custom_broken(self):
3358 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003359 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003360 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003361 self.calls = [
3362 ((['git', 'config', '--global', 'http.cookiefile'],),
3363 '/custom/.gitcookies'),
3364 (('os.path.exists', '/custom/.gitcookies'), False),
3365 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3366 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3367 ((['git', 'config', '--global', 'http.cookiefile',
3368 os.path.expanduser('~/.gitcookies')], ), ''),
3369 ]
3370 self.assertEqual(0, git_cl.main(['creds-check']))
3371 self.assertRegexpMatches(
3372 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003373 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003374 self.assertRegexpMatches(
3375 sys.stdout.getvalue(),
3376 'However, your configured .gitcookies file is missing.')
3377
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003378 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003379 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3380 lambda _, message: self._mocked_call('AddComment', message))
3381 self.calls = [
3382 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3383 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3384 (('AddComment', 'msg'), ''),
3385 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003386 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3387 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003388
3389 def test_git_cl_comment_add_gerrit(self):
3390 self.mock(git_cl.gerrit_util, 'SetReview',
3391 lambda host, change, msg:
3392 self._mocked_call('SetReview', host, change, msg))
3393 self.calls = [
3394 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3395 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3396 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3397 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3398 'origin/master'),
3399 ((['git', 'config', 'remote.origin.url'],),
3400 'https://chromium.googlesource.com/infra/infra'),
3401 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3402 ]
3403 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3404 '-a', 'msg']))
3405
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003406 def test_git_cl_comments_fetch_rietveld(self):
3407 self.mock(sys, 'stdout', StringIO.StringIO())
3408 self.calls = [
3409 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3410 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3411 ] * 2
3412 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3413 'messages': [
3414 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3415 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3416 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3417 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3418 # Intentionally wrong order here.
3419 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3420 'disapproval': False, 'approval': False,
3421 'sender': 'owner@example.com'},
3422 ],
3423 'owner_email': 'owner@example.com',
3424 })
3425 expected_comments_summary = [
3426 git_cl._CommentSummary(
3427 message='lgtm',
3428 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3429 disapproval=False, approval=True, sender='r@example.com'),
3430 git_cl._CommentSummary(
3431 message='not lgtm',
3432 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3433 disapproval=True, approval=False, sender='r2@example.com'),
3434 # Note: same order as in whatever Rietveld returns.
3435 git_cl._CommentSummary(
3436 message='PTAL',
3437 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3438 disapproval=False, approval=False, sender='owner@example.com'),
3439 ]
3440 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3441 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3442
3443 with git_cl.gclient_utils.temporary_directory() as tempdir:
3444 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3445 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3446 '-j', out_file]))
3447 with open(out_file) as f:
3448 read = json.load(f)
3449 self.assertEqual(len(read), 3)
3450 self.assertEqual(read[0], {
3451 'date': '2000-03-13 20:49:34.515270',
3452 'message': 'PTAL',
3453 'approval': False,
3454 'disapproval': False,
3455 'sender': 'owner@example.com'})
3456 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3457 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3458
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003459 def test_git_cl_comments_fetch_gerrit(self):
3460 self.mock(sys, 'stdout', StringIO.StringIO())
3461 self.calls = [
3462 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3463 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3464 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3465 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3466 'origin/master'),
3467 ((['git', 'config', 'remote.origin.url'],),
3468 'https://chromium.googlesource.com/infra/infra'),
3469 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3470 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003471 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003472 'messages': [
3473 {
3474 u'_revision_number': 1,
3475 u'author': {
3476 u'_account_id': 1111084,
3477 u'email': u'commit-bot@chromium.org',
3478 u'name': u'Commit Bot'
3479 },
3480 u'date': u'2017-03-15 20:08:45.000000000',
3481 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3482 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3483 u'tag': u'autogenerated:cq:dry-run'
3484 },
3485 {
3486 u'_revision_number': 2,
3487 u'author': {
3488 u'_account_id': 11151243,
3489 u'email': u'owner@example.com',
3490 u'name': u'owner'
3491 },
3492 u'date': u'2017-03-16 20:00:41.000000000',
3493 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3494 u'message': u'PTAL',
3495 },
3496 {
3497 u'_revision_number': 2,
3498 u'author': {
3499 u'_account_id': 148512 ,
3500 u'email': u'reviewer@example.com',
3501 u'name': u'reviewer'
3502 },
3503 u'date': u'2017-03-17 05:19:37.500000000',
3504 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3505 u'message': u'Patch Set 2: Code-Review+1',
3506 },
3507 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003508 }),
3509 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3510 '/COMMIT_MSG': [
3511 {
3512 'author': {'email': u'reviewer@example.com'},
3513 'updated': u'2017-03-17 05:19:37.500000000',
3514 'patch_set': 2,
3515 'side': 'REVISION',
3516 'message': 'Please include a bug link',
3517 },
3518 ],
3519 'codereview.settings': [
3520 {
3521 'author': {'email': u'owner@example.com'},
3522 'updated': u'2017-03-16 20:00:41.000000000',
3523 'patch_set': 2,
3524 'side': 'PARENT',
3525 'line': 42,
3526 'message': 'I removed this because it is bad',
3527 },
3528 ]
3529 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003530 ] * 2
3531 expected_comments_summary = [
3532 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003533 message=(
3534 u'PTAL\n' +
3535 u'\n' +
3536 u'codereview.settings\n' +
3537 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3538 u'c/1/2/codereview.settings#b42\n' +
3539 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003540 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3541 disapproval=False, approval=False, sender=u'owner@example.com'),
3542 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003543 message=(
3544 u'Patch Set 2: Code-Review+1\n' +
3545 u'\n' +
3546 u'/COMMIT_MSG\n' +
3547 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3548 u'c/1/2//COMMIT_MSG#\n' +
3549 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003550 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3551 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3552 ]
3553 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3554 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3555
3556 with git_cl.gclient_utils.temporary_directory() as tempdir:
3557 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3558 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3559 '-j', out_file]))
3560 with open(out_file) as f:
3561 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003562 self.assertEqual(len(read), 2)
3563 self.assertEqual(read[0], {
3564 u'date': u'2017-03-16 20:00:41.000000',
3565 u'message': (
3566 u'PTAL\n' +
3567 u'\n' +
3568 u'codereview.settings\n' +
3569 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3570 u'c/1/2/codereview.settings#b42\n' +
3571 u' I removed this because it is bad\n'),
3572 u'approval': False,
3573 u'disapproval': False,
3574 u'sender': u'owner@example.com'})
3575 self.assertEqual(read[1], {
3576 u'date': u'2017-03-17 05:19:37.500000',
3577 u'message': (
3578 u'Patch Set 2: Code-Review+1\n' +
3579 u'\n' +
3580 u'/COMMIT_MSG\n' +
3581 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3582 u'c/1/2//COMMIT_MSG#\n' +
3583 u' Please include a bug link\n'),
3584 u'approval': False,
3585 u'disapproval': False,
3586 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003587
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003588
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003589if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003590 logging.basicConfig(
3591 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003592 unittest.main()