blob: 6a5de0f3c434efdf0d9d98070ec150945b8b2ac8 [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
Aaron Gable9a03ae02017-11-03 11:31:07 -070015import tempfile
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000017import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000018
19sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
20
21from testing_support.auto_stub import TestCase
22
23import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000024import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000025import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000027
tandrii5d48c322016-08-18 16:19:37 -070028def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
29 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
30
31
32CERR1 = callError(1)
33
34
Aaron Gable9a03ae02017-11-03 11:31:07 -070035def MakeNamedTemporaryFileMock(expected_content):
36 class NamedTemporaryFileMock(object):
37 def __init__(self, *args, **kwargs):
38 self.name = '/tmp/named'
39 self.expected_content = expected_content
40
41 def __enter__(self):
42 return self
43
44 def __exit__(self, _type, _value, _tb):
45 pass
46
47 def write(self, content):
48 if self.expected_content:
49 assert content == self.expected_content
50
51 def close(self):
52 pass
53
54 return NamedTemporaryFileMock
55
56
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000057class ChangelistMock(object):
58 # A class variable so we can access it when we don't have access to the
59 # instance that's being set.
60 desc = ""
61 def __init__(self, **kwargs):
62 pass
63 def GetIssue(self):
64 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080065 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000066 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070067 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000068 ChangelistMock.desc = desc
69
tandrii5d48c322016-08-18 16:19:37 -070070
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000071class PresubmitMock(object):
72 def __init__(self, *args, **kwargs):
73 self.reviewers = []
Daniel Cheng7227d212017-11-17 08:12:37 -080074 self.more_cc = ['chromium-reviews+test-more-cc@chromium.org']
75
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000076 @staticmethod
77 def should_continue():
78 return True
79
80
81class RietveldMock(object):
82 def __init__(self, *args, **kwargs):
83 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000084
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000085 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080086 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000087 return 'Issue: %d' % issue
88
maruel@chromium.org78936cb2013-04-11 00:17:52 +000089 @staticmethod
90 def get_issue_properties(_issue, _messages):
91 return {
92 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
93 'messages': [
94 {
95 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070096 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000097 'sender': 'john@chromium.org',
98 },
99 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100100 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000101 }
102
iannuccie53c9352016-08-17 14:40:40 -0700103 @staticmethod
104 def close_issue(_issue):
105 return 'Closed'
106
skobes6468b902016-10-24 08:45:10 -0700107 @staticmethod
108 def get_patch(issue, patchset):
109 return 'patch set from issue %s patchset %s' % (issue, patchset)
110
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100111 @staticmethod
112 def update_description(_issue, _description):
113 return 'Updated'
114
115 @staticmethod
116 def add_comment(_issue, _comment):
117 return 'Commented'
118
119
skobes6468b902016-10-24 08:45:10 -0700120class GitCheckoutMock(object):
121 def __init__(self, *args, **kwargs):
122 pass
123
124 @staticmethod
125 def reset():
126 GitCheckoutMock.conflict = False
127
128 def apply_patch(self, p):
129 if GitCheckoutMock.conflict:
130 raise Exception('failed')
131
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000132
133class WatchlistsMock(object):
134 def __init__(self, _):
135 pass
136 @staticmethod
137 def GetWatchersForPaths(_):
138 return ['joe@example.com']
139
140
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000141class CodereviewSettingsFileMock(object):
142 def __init__(self):
143 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800144 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000145 def read(self):
146 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000147 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000148
149
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000150class AuthenticatorMock(object):
151 def __init__(self, *_args):
152 pass
153 def has_cached_credentials(self):
154 return True
tandrii221ab252016-10-06 08:12:04 -0700155 def authorize(self, http):
156 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000157
158
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100159def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000160 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
161
162 Usage:
163 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100164 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000165
166 OR
167 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100168 CookiesAuthenticatorMockFactory(
169 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000170 """
171 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800172 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000173 # Intentionally not calling super() because it reads actual cookie files.
174 pass
175 @classmethod
176 def get_gitcookies_path(cls):
177 return '~/.gitcookies'
178 @classmethod
179 def get_netrc_path(cls):
180 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100181 def _get_auth_for_host(self, host):
182 if same_auth:
183 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000184 return (hosts_with_creds or {}).get(host)
185 return CookiesAuthenticatorMock
186
Aaron Gable9a03ae02017-11-03 11:31:07 -0700187
kmarshall9249e012016-08-23 12:02:16 -0700188class MockChangelistWithBranchAndIssue():
189 def __init__(self, branch, issue):
190 self.branch = branch
191 self.issue = issue
192 def GetBranch(self):
193 return self.branch
194 def GetIssue(self):
195 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000196
tandriic2405f52016-10-10 08:13:15 -0700197
198class SystemExitMock(Exception):
199 pass
200
201
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000202class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100203 def test_get_description(self):
204 cl = git_cl.Changelist(issue=1, codereview='rietveld',
205 codereview_host='host')
206 cl.description = 'x'
207 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800208 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100209 self.assertEquals(cl.GetDescription(), 'x')
210 self.assertEquals(cl.GetDescription(force=True), 'y')
211 self.assertEquals(cl.GetDescription(), 'y')
212
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700213 def test_description_footers(self):
214 cl = git_cl.Changelist(issue=1, codereview='gerrit',
215 codereview_host='host')
216 cl.description = '\n'.join([
217 'This is some message',
218 '',
219 'It has some lines',
220 'and, also',
221 '',
222 'Some: Really',
223 'Awesome: Footers',
224 ])
225 cl.has_description = True
226 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
227 msg, footers = cl.GetDescriptionFooters()
228 self.assertEquals(
229 msg, ['This is some message', '', 'It has some lines', 'and, also'])
230 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
231
232 msg.append('wut')
233 footers.append(('gnarly-dude', 'beans'))
234 cl.UpdateDescriptionFooters(msg, footers)
235 self.assertEquals(cl.GetDescription().splitlines(), [
236 'This is some message',
237 '',
238 'It has some lines',
239 'and, also',
240 'wut'
241 '',
242 'Some: Really',
243 'Awesome: Footers',
244 'Gnarly-Dude: beans',
245 ])
246
tandriif9aefb72016-07-01 09:06:51 -0700247 def test_get_bug_line_values(self):
248 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
249 self.assertEqual(f('', ''), [])
250 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
251 self.assertEqual(f('v8', '456'), ['v8:456'])
252 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
253 # Not nice, but not worth carying.
254 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
255 ['v8:456', 'chromium:123', 'v8:123'])
256
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100257 def _test_git_number(self, parent_msg, dest_ref, child_msg,
258 parent_hash='parenthash'):
259 desc = git_cl.ChangeDescription(child_msg)
260 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
261 return desc.description
262
263 def assertEqualByLine(self, actual, expected):
264 self.assertEqual(actual.splitlines(), expected.splitlines())
265
266 def test_git_number_bad_parent(self):
267 with self.assertRaises(ValueError):
268 self._test_git_number('Parent', 'refs/heads/master', 'Child')
269
270 def test_git_number_bad_parent_footer(self):
271 with self.assertRaises(AssertionError):
272 self._test_git_number(
273 'Parent\n'
274 '\n'
275 'Cr-Commit-Position: wrong',
276 'refs/heads/master', 'Child')
277
278 def test_git_number_bad_lineage_ignored(self):
279 actual = self._test_git_number(
280 'Parent\n'
281 '\n'
282 'Cr-Commit-Position: refs/heads/master@{#1}\n'
283 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
284 'refs/heads/master', 'Child')
285 self.assertEqualByLine(
286 actual,
287 'Child\n'
288 '\n'
289 'Cr-Commit-Position: refs/heads/master@{#2}\n'
290 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
291
292 def test_git_number_same_branch(self):
293 actual = self._test_git_number(
294 'Parent\n'
295 '\n'
296 'Cr-Commit-Position: refs/heads/master@{#12}',
297 dest_ref='refs/heads/master',
298 child_msg='Child')
299 self.assertEqualByLine(
300 actual,
301 'Child\n'
302 '\n'
303 'Cr-Commit-Position: refs/heads/master@{#13}')
304
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200305 def test_git_number_same_branch_mixed_footers(self):
306 actual = self._test_git_number(
307 'Parent\n'
308 '\n'
309 'Cr-Commit-Position: refs/heads/master@{#12}',
310 dest_ref='refs/heads/master',
311 child_msg='Child\n'
312 '\n'
313 'Broken-by: design\n'
314 'BUG=123')
315 self.assertEqualByLine(
316 actual,
317 'Child\n'
318 '\n'
319 'Broken-by: design\n'
320 'BUG=123\n'
321 'Cr-Commit-Position: refs/heads/master@{#13}')
322
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100323 def test_git_number_same_branch_with_originals(self):
324 actual = self._test_git_number(
325 'Parent\n'
326 '\n'
327 'Cr-Commit-Position: refs/heads/master@{#12}',
328 dest_ref='refs/heads/master',
329 child_msg='Child\n'
330 '\n'
331 'Some users are smart and insert their own footers\n'
332 '\n'
333 'Cr-Whatever: value\n'
334 'Cr-Commit-Position: refs/copy/paste@{#22}')
335 self.assertEqualByLine(
336 actual,
337 'Child\n'
338 '\n'
339 'Some users are smart and insert their own footers\n'
340 '\n'
341 'Cr-Original-Whatever: value\n'
342 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
343 'Cr-Commit-Position: refs/heads/master@{#13}')
344
345 def test_git_number_new_branch(self):
346 actual = self._test_git_number(
347 'Parent\n'
348 '\n'
349 'Cr-Commit-Position: refs/heads/master@{#12}',
350 dest_ref='refs/heads/branch',
351 child_msg='Child')
352 self.assertEqualByLine(
353 actual,
354 'Child\n'
355 '\n'
356 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
357 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
358
359 def test_git_number_lineage(self):
360 actual = self._test_git_number(
361 'Parent\n'
362 '\n'
363 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
364 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
365 dest_ref='refs/heads/branch',
366 child_msg='Child')
367 self.assertEqualByLine(
368 actual,
369 'Child\n'
370 '\n'
371 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
372 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
373
374 def test_git_number_moooooooore_lineage(self):
375 actual = self._test_git_number(
376 'Parent\n'
377 '\n'
378 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
379 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
380 dest_ref='refs/heads/mooore',
381 child_msg='Child')
382 self.assertEqualByLine(
383 actual,
384 'Child\n'
385 '\n'
386 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
387 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
388 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
389
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100390 def test_git_number_ever_moooooooore_lineage(self):
391 self.maxDiff = 10000
392 actual = self._test_git_number(
393 'CQ commit on fresh new branch + numbering.\n'
394 '\n'
395 'NOTRY=True\n'
396 'NOPRESUBMIT=True\n'
397 'BUG=\n'
398 '\n'
399 'Review-Url: https://codereview.chromium.org/2577703003\n'
400 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
401 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
402 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
403 dest_ref='refs/heads/gnumb-test/cl',
404 child_msg='git cl on fresh new branch + numbering.\n'
405 '\n'
406 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
407 self.assertEqualByLine(
408 actual,
409 'git cl on fresh new branch + numbering.\n'
410 '\n'
411 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
412 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
413 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
414 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
415 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100416
417 def test_git_number_cherry_pick(self):
418 actual = self._test_git_number(
419 'Parent\n'
420 '\n'
421 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
422 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
423 dest_ref='refs/heads/branch',
424 child_msg='Child, which is cherry-pick from master\n'
425 '\n'
426 'Cr-Commit-Position: refs/heads/master@{#100}\n'
427 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
428 self.assertEqualByLine(
429 actual,
430 'Child, which is cherry-pick from master\n'
431 '\n'
432 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
433 '\n'
434 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
435 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
436 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
437
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000438
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200439class TestParseIssueURL(unittest.TestCase):
440 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
441 codereview=None, fail=False):
442 self.assertIsNotNone(parsed)
443 if fail:
444 self.assertFalse(parsed.valid)
445 return
446 self.assertTrue(parsed.valid)
447 self.assertEqual(parsed.issue, issue)
448 self.assertEqual(parsed.patchset, patchset)
449 self.assertEqual(parsed.hostname, hostname)
450 self.assertEqual(parsed.codereview, codereview)
451
452 def _run_and_validate(self, func, url, *args, **kwargs):
453 result = func(urlparse.urlparse(url))
454 if kwargs.pop('fail', False):
455 self.assertIsNone(result)
456 return None
457 self._validate(result, *args, fail=False, **kwargs)
458
459 def test_rietveld(self):
460 def test(url, *args, **kwargs):
461 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
462 *args, codereview='rietveld', **kwargs)
463
464 test('http://codereview.chromium.org/123',
465 123, None, 'codereview.chromium.org')
466 test('https://codereview.chromium.org/123',
467 123, None, 'codereview.chromium.org')
468 test('https://codereview.chromium.org/123/',
469 123, None, 'codereview.chromium.org')
470 test('https://codereview.chromium.org/123/whatever',
471 123, None, 'codereview.chromium.org')
472 test('https://codereview.chromium.org/123/#ps20001',
473 123, 20001, 'codereview.chromium.org')
474 test('http://codereview.chromium.org/download/issue123_4.diff',
475 123, 4, 'codereview.chromium.org')
476 # This looks like bad Gerrit, but is actually valid Rietveld, too.
477 test('https://chrome-review.source.com/123/4/',
478 123, None, 'chrome-review.source.com')
479
480 test('https://codereview.chromium.org/deadbeaf', fail=True)
481 test('https://codereview.chromium.org/api/123', fail=True)
482 test('bad://codereview.chromium.org/123', fail=True)
483 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
484
485 def test_gerrit(self):
486 def test(url, issue=None, patchset=None, hostname=None, fail=None):
487 self._test_ParseIssueUrl(
488 git_cl._GerritChangelistImpl.ParseIssueURL,
489 url, issue, patchset, hostname, fail)
490 def test(url, *args, **kwargs):
491 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
492 *args, codereview='gerrit', **kwargs)
493
494 test('http://chrome-review.source.com/c/123',
495 123, None, 'chrome-review.source.com')
496 test('https://chrome-review.source.com/c/123/',
497 123, None, 'chrome-review.source.com')
498 test('https://chrome-review.source.com/c/123/4',
499 123, 4, 'chrome-review.source.com')
500 test('https://chrome-review.source.com/#/c/123/4',
501 123, 4, 'chrome-review.source.com')
502 test('https://chrome-review.source.com/c/123/4',
503 123, 4, 'chrome-review.source.com')
504 test('https://chrome-review.source.com/123',
505 123, None, 'chrome-review.source.com')
506 test('https://chrome-review.source.com/123/4',
507 123, 4, 'chrome-review.source.com')
508
509 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
510 test('https://chrome-review.source.com/c/abc/', fail=True)
511 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
512
513 def test_ParseIssueNumberArgument(self):
514 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200515 codereview_hint = kwargs.pop('hint', None)
516 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
517 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200518
519 test('123', 123)
520 test('', fail=True)
521 test('abc', fail=True)
522 test('123/1', fail=True)
523 test('123a', fail=True)
524 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
525 # Rietveld.
526 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200527 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200528 test('https://codereview.source.com/123',
529 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200530 # Matches both, but we take Gerrit if specifically requested.
531 test('https://codereview.source.com/123',
532 123, None, 'codereview.source.com', 'gerrit',
533 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200534 # Gerrrit.
535 test('https://chrome-review.source.com/c/123/4',
536 123, 4, 'chrome-review.source.com', 'gerrit')
537 test('https://chrome-review.source.com/bad/123/4', fail=True)
538
539
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100540class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100541 def setUp(self):
542 super(GitCookiesCheckerTest, self).setUp()
543 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100544 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100545
546 def mock_hosts_creds(self, subhost_identity_pairs):
547 def ensure_googlesource(h):
548 if not h.endswith(self.c._GOOGLESOURCE):
549 assert not h.endswith('.')
550 return h + '.' + self.c._GOOGLESOURCE
551 return h
552 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
553 for h, i in subhost_identity_pairs]
554
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200555 def test_identity_parsing(self):
556 self.assertEqual(self.c._parse_identity('ldap.google.com'),
557 ('ldap', 'google.com'))
558 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
559 ('ldap', 'example.com'))
560 # Specical case because we know there are no subdomains in chromium.org.
561 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
562 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800563 # Pathological: ".period." can be either username OR domain, more likely
564 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200565 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
566 ('note', 'period.example.com'))
567
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100568 def test_analysis_nothing(self):
569 self.c._all_hosts = []
570 self.assertFalse(self.c.has_generic_host())
571 self.assertEqual(set(), self.c.get_conflicting_hosts())
572 self.assertEqual(set(), self.c.get_duplicated_hosts())
573 self.assertEqual(set(), self.c.get_partially_configured_hosts())
574 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
575
576 def test_analysis(self):
577 self.mock_hosts_creds([
578 ('.googlesource.com', 'git-example.chromium.org'),
579
580 ('chromium', 'git-example.google.com'),
581 ('chromium-review', 'git-example.google.com'),
582 ('chrome-internal', 'git-example.chromium.org'),
583 ('chrome-internal-review', 'git-example.chromium.org'),
584 ('conflict', 'git-example.google.com'),
585 ('conflict-review', 'git-example.chromium.org'),
586 ('dup', 'git-example.google.com'),
587 ('dup', 'git-example.google.com'),
588 ('dup-review', 'git-example.google.com'),
589 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200590 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100591 ])
592 self.assertTrue(self.c.has_generic_host())
593 self.assertEqual(set(['conflict.googlesource.com']),
594 self.c.get_conflicting_hosts())
595 self.assertEqual(set(['dup.googlesource.com']),
596 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200597 self.assertEqual(set(['partial.googlesource.com',
598 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100599 self.c.get_partially_configured_hosts())
600 self.assertEqual(set(['chromium.googlesource.com',
601 'chrome-internal.googlesource.com']),
602 self.c.get_hosts_with_wrong_identities())
603
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100604 def test_report_no_problems(self):
605 self.test_analysis_nothing()
606 self.mock(sys, 'stdout', StringIO.StringIO())
607 self.assertFalse(self.c.find_and_report_problems())
608 self.assertEqual(sys.stdout.getvalue(), '')
609
610 def test_report(self):
611 self.test_analysis()
612 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200613 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
614 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100615 self.assertTrue(self.c.find_and_report_problems())
616 with open(os.path.join(os.path.dirname(__file__),
617 'git_cl_creds_check_report.txt')) as f:
618 expected = f.read()
619 def by_line(text):
620 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200621 self.maxDiff = 10000
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200622 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100623
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800624
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000625class TestGitCl(TestCase):
626 def setUp(self):
627 super(TestGitCl, self).setUp()
628 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700629 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000630 self.mock(subprocess2, 'call', self._mocked_call)
631 self.mock(subprocess2, 'check_call', self._mocked_call)
632 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700633 self.mock(subprocess2, 'communicate',
634 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000635 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000636 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000637 self.mock(git_common, 'get_or_create_merge_base',
638 lambda *a: (
639 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000640 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000641 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100642 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
643 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700644 self.mock(git_cl, 'write_json', lambda path, contents:
645 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000646 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000647 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000648 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700649 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
650 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000652 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000653 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100654 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
655 lambda *args, **kwargs: self._mocked_call(
656 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700657 self.mock(git_cl.gerrit_util, 'GetChangeComments',
658 lambda *args, **kwargs: self._mocked_call(
659 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100660 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700661 lambda h, i, reviewers, ccs, notify: self._mocked_call(
662 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700663 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700664 lambda h, i, msg=None, labels=None, notify=None:
665 self._mocked_call('SetReview', h, i, msg, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000666 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
667 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700668 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100669 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000670 # It's important to reset settings to not have inter-tests interference.
671 git_cl.settings = None
672
673 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000674 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100675 self.assertEquals([], self.calls)
676 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000677 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100678 raise
679 # Sadly, has_failed() returns True if this OR any other tests before this
680 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200681 git_cl.logging.error(
682 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100683 'There are un-consumed self.calls after this test has finished.\n'
684 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700685 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200686 'If you are already running only this test, then **first** fix the '
687 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100688 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700689 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100690 'and follow instructions above.\n' +
691 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000692 finally:
693 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000695 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000696 self.assertTrue(
697 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700698 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000699 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000700 expected_args, result = top
701
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000702 # Also logs otherwise it could get caught in a try/finally and be hard to
703 # diagnose.
704 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700705 N = 5
706 prior_calls = '\n '.join(
707 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
708 for i, c in enumerate(self._calls_done[-N:]))
709 following_calls = '\n '.join(
710 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
711 for i, c in enumerate(self.calls[:N]))
712 extended_msg = (
713 'A few prior calls:\n %s\n\n'
714 'This (expected):\n @%d: %r\n'
715 'This (actual):\n @%d: %r\n\n'
716 'A few following expected calls:\n %s' %
717 (prior_calls, len(self._calls_done), expected_args,
718 len(self._calls_done), args, following_calls))
719 git_cl.logging.error(extended_msg)
720
tandrii99a72f22016-08-17 14:33:24 -0700721 self.fail('@%d\n'
722 ' Expected: %r\n'
723 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700724 len(self._calls_done), expected_args, args))
725
726 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700727 if isinstance(result, Exception):
728 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000729 return result
730
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100731 def test_ask_for_explicit_yes_true(self):
732 self.calls = [
733 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
734 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
735 ]
736 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
737
tandrii48df5812016-10-17 03:55:37 -0700738 def test_LoadCodereviewSettingsFromFile_gerrit(self):
739 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
740 self.calls = [
741 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
742 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
743 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
744 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
745 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700747 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
748 CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700750 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
751 CERR1),
752 ((['git', 'config', 'gerrit.host', 'true'],), ''),
753 ]
754 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
755
maruel@chromium.orga3353652011-11-30 14:26:57 +0000756 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000757 def _is_gerrit_calls(cls, gerrit=False):
758 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
759 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
760
761 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000762 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200763 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000764 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000765
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000766 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200767 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
768 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
769 ((['git', 'config', 'core.editor'],), ''),
770 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000771
772 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200773 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000774 if similarity is None:
775 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700776 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700777 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000778 else:
tandrii33a46ff2016-08-23 05:53:40 -0700779 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700780 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000781
782 if find_copies is None:
783 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700784 find_copies_call = ((['git', 'config', '--bool',
785 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000786 else:
tandrii5d48c322016-08-18 16:19:37 -0700787 val = str(find_copies).lower()
788 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000789 'branch.master.git-find-copies', val],), '')
790
791 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000792 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800793 '-l100000', '-C'+similarity,
794 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000795 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000796 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000797 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000798
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000799 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000800 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000801 similarity_call,
802 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
803 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000804 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000805 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700806 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
807 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000808 ((['git', 'config', 'rietveld.server'],),
809 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000810 ((['git', 'config', 'branch.master.merge'],), 'master'),
811 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000812 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000813 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000814 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000815 ((['git', 'rev-parse', '--show-cdup'],), ''),
816 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Aaron Gable7817f022017-12-12 09:43:17 -0800817 ((['git', '-c', 'core.quotePath=false', 'diff',
818 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000819 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700820 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000821 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000822 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000823 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000825 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000826 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000827 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000828 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700829 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000830 ]
831
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000832 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000833 def _git_upload_calls(cls, private):
834 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000835 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000836 private_call = []
837 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000838 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000839 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000840 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000841
maruel@chromium.orga3353652011-11-30 14:26:57 +0000842 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000844 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800846 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000847 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700848 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000849 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000850 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000851 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700852 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000853 ] + cls._git_post_upload_calls()
854
855 @classmethod
856 def _git_post_upload_calls(cls):
857 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000858 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
859 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
860 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000861 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000862 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000863 ]
864
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000865 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000866 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000867 fake_ancestor = 'fake_ancestor'
868 fake_cl = 'fake_cl_for_patch'
869 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000870 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000871 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000872 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000873 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000874 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000875 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000876 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000877 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700878 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000879 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000880 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000881 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000882 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000883 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000884 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000885 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000886 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000887 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000888 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000889 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000890
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000891 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700892 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000893 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000894 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800895 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000896 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800898 '--cc',
899 ','.join(
900 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
901 cc),
902 ] + (['--private']
903 if private else []) + ['--git_similarity', similarity or '50'] + (
904 ['--git_no_find_copies']
905 if find_copies is False else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000906
907 def _run_reviewer_test(
908 self,
909 upload_args,
910 expected_description,
911 returned_description,
912 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000913 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700914 private=False,
915 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000916 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000917 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000918 try:
919 similarity = upload_args[upload_args.index('--similarity')+1]
920 except ValueError:
921 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000922
923 if '--find-copies' in upload_args:
924 find_copies = True
925 elif '--no-find-copies' in upload_args:
926 find_copies = False
927 else:
928 find_copies = None
929
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000930 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700931 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000932
933 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000934
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000935 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000936 self.assertEquals(
937 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000938 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000939 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000940 '#--------------------This line is 72 characters long'
941 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000942 expected_description,
943 desc)
944 return returned_description
945 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000946
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000948 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700949 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000950 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000951 return 1, 2
952 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000953
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000954 git_cl.main(['upload'] + upload_args)
955
956 def test_no_reviewer(self):
957 self._run_reviewer_test(
958 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000959 'desc\n\nBUG=',
960 '# Blah blah comment.\ndesc\n\nBUG=',
961 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000962 [])
963
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000964 def test_keep_similarity(self):
965 self._run_reviewer_test(
966 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000967 'desc\n\nBUG=',
968 '# Blah blah comment.\ndesc\n\nBUG=',
969 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000970 [])
971
iannucci@chromium.org79540052012-10-19 23:15:26 +0000972 def test_keep_find_copies(self):
973 self._run_reviewer_test(
974 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000975 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000976 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000977 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000978 [])
979
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000980 def test_private(self):
981 self._run_reviewer_test(
982 ['--private'],
983 'desc\n\nBUG=',
984 '# Blah blah comment.\ndesc\n\nBUG=\n',
985 'desc\n\nBUG=',
986 [])
987
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000988 def test_reviewers_cmd_line(self):
989 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000990 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000991 self._run_reviewer_test(
992 ['-r' 'foo@example.com'],
993 description,
994 '\n%s\n' % description,
995 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000996 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000997
998 def test_reviewer_tbr_overriden(self):
999 # Reviewer is overriden with TBR
1000 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001001 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001002 self._run_reviewer_test(
1003 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001004 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001005 description.strip('\n'),
1006 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001007 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001008
1009 def test_reviewer_multiple(self):
1010 # Handles multiple R= or TBR= lines.
1011 description = (
bradnelsond975b302016-10-23 12:20:23 -07001012 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1013 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001014 self._run_reviewer_test(
1015 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001016 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001017 description,
1018 description,
bradnelsond975b302016-10-23 12:20:23 -07001019 ['--reviewers=another@example.com,reviewer@example.com'],
1020 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001021
maruel@chromium.orga3353652011-11-30 14:26:57 +00001022 def test_reviewer_send_mail(self):
1023 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001024 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +00001025 self._run_reviewer_test(
1026 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001027 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +00001028 description.strip('\n'),
1029 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001030 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +00001031
1032 def test_reviewer_send_mail_no_rev(self):
1033 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001034 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +02001035 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -07001036 ((['DieWithError', 'Must specify reviewers to send email.'],),
1037 SystemExitMock())
1038 ]
1039
1040 def RunEditor(desc, _, **kwargs):
1041 return desc
1042 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1043 self.mock(sys, 'stdout', stdout)
1044 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001045 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001046 self.assertEqual(
1047 '=====================================\n'
1048 'NOTICE: Rietveld is being deprecated. '
1049 'You can upload changes to Gerrit with\n'
1050 ' git cl upload --gerrit\n'
1051 'or set Gerrit to be your default code review tool with\n'
1052 ' git config gerrit.host true\n'
1053 '=====================================\n',
1054 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001055
tandriif9aefb72016-07-01 09:06:51 -07001056 def test_bug_on_cmd(self):
1057 self._run_reviewer_test(
1058 ['--bug=500658,proj:123'],
1059 'desc\n\nBUG=500658\nBUG=proj:123',
1060 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1061 'desc\n\nBUG=500658\nBUG=proj:1234',
1062 [])
1063
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001064 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1065 parent_msg=None,
1066 new_msg=None,
1067 fail_after_parent_msg=False,
1068 fail_cherry_pick=False,
1069 fail_push_count=0,
1070 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001071 if debug:
1072 # Very useful due to finally clause in git cl land raising exceptions and
1073 # shadowing real cause of failure.
1074 self.mock(git_cl, '_IS_BEING_TESTED', True)
1075 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001076 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001077
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001078 if git_numberer_enabled:
1079 # Special mocks to check validity of timestamp.
1080 original_git_amend_head = git_cl._git_amend_head
1081 def _git_amend_head_mock(msg, tstamp):
1082 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1083 return original_git_amend_head(msg, tstamp)
1084 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1085
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001086 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1087 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001088 self.mock(RietveldMock, 'update_description', staticmethod(
1089 lambda i, d: self._mocked_call(['update_description', i, d])))
1090 self.mock(RietveldMock, 'add_comment', staticmethod(
1091 lambda i, c: self._mocked_call(['add_comment', i, c])))
1092 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001093 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1094 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1095 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1096 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1097 CERR1),
1098 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1099 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001100 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001101 ((['git', 'config', 'rietveld.server'],),
1102 'https://codereview.chromium.org'),
1103 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1104 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1105 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1106 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001107 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1108 ''), # No commits to rebase, according to local view of origin.
1109 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1110 'fake_ancestor_sha'),
1111 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1112 ((['git', 'rev-parse', '--show-cdup'],), ''),
1113 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
Aaron Gable7817f022017-12-12 09:43:17 -08001114 ((['git', '-c', 'core.quotePath=false', 'diff',
1115 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001116 'M\tfile1.cpp'),
1117 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1118 ((['git', 'config', 'branch.feature.rietveldserver'],),
1119 'https://codereview.chromium.org'),
1120 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1121 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1122 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1123 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001124 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001125 # file1.cpp | 53 ++++++--
1126 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1127 ''),
1128 ((['git', 'show-ref', '--quiet', '--verify',
1129 'refs/heads/git-cl-commit'],),
1130 ''), # 0 return code means branch exists.
1131 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1132 ((['git', 'show-ref', '--quiet', '--verify',
1133 'refs/heads/git-cl-cherry-pick'],),
1134 CERR1), # This means git-cl-cherry-pick branch does not exist.
1135 ((['git', 'rev-parse', '--show-cdup'],), ''),
1136 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1137 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1138 ((['git', 'commit', '-m',
1139 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001140 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001141 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1142 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1143 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001144 repo_url),
1145
1146 ((['git', 'config', 'remote.origin.url'],), repo_url),
1147 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1148 git_numberer_enabled),
1149
1150 # Auto-rebase init.
1151 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1152 ]
1153 # Auto-rebase loops.
1154 for attempt in xrange(fail_push_count + 1):
1155 self.calls += [
1156 # Auto-rebase loop start.
1157 ((['git', 'retry', 'fetch', 'origin',
1158 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1159 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1160 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1161 # different in each loop iteration for truly realistic test.
1162 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1163 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1164 callError(1, 'failed to cherry pick') if fail_cherry_pick
1165 else ''),
1166 ]
1167 if fail_cherry_pick:
1168 return
1169
1170 if git_numberer_enabled:
1171 assert parent_msg
1172 self.calls += [
1173 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1174 parent_msg),
1175 ]
1176 if fail_after_parent_msg:
1177 return
1178 assert new_msg
1179 self.calls += [
1180 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1181 '1480022355'), # Committer's unix timestamp.
1182 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1183 '1480024000'),
1184 ((['git_amend_head committer timestamp', 1480024000],), ''),
1185 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1186 ]
1187 self.calls += [
1188 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1189 CERR1 if attempt < fail_push_count else ''),
1190 ]
1191 # End of autorebase + push.
1192
1193 self.calls += [
1194 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1195 ]
1196 if git_numberer_enabled:
1197 self.calls += [
1198 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1199 ]
1200
1201 # Cleanup calls.
1202 self.calls += [
1203 ((['git', 'checkout', '-q', 'feature'],), ''),
1204 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1205 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001206 ]
1207
1208 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001209 self._land_rietveld_calls(
1210 repo_url='https://chromium.googlesource.com/infra/infra',
1211 git_numberer_enabled=False,
1212 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001213 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001214 ((['git', 'config', 'rietveld.viewvc-url'],),
1215 'https://chromium.googlesource.com/infra/infra/+/'),
1216 ((['update_description', 123,
1217 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001218 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001219 ''),
1220 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001221 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001222 ]
1223 git_cl.main(['land'])
1224
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001225 def test_land_rietveld_fail_cherry_pick(self):
1226 self._land_rietveld_calls(
1227 repo_url='https://chromium.googlesource.com/infra/infra',
1228 git_numberer_enabled=False,
1229 fail_cherry_pick=True,
1230 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001231 self.calls += [
Aaron Gable7817f022017-12-12 09:43:17 -08001232 ((['git', '-c', 'core.quotePath=false', 'diff',
1233 '--name-status', '--diff-filter=U'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001234 'U path/file1\n'
1235 'U file2.cpp\n'),
1236 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001237 ((['git', 'checkout', '-q', 'feature'],), ''),
1238 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001239 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1240 ]
1241 git_cl.main(['land'])
1242
1243 def test_land_rietveld_git_numberer_fail_1_push(self):
1244 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1245
1246 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1247 self._land_rietveld_calls(
1248 repo_url='https://chromium.googlesource.com/chromium/src',
1249 git_numberer_enabled=True,
1250 parent_msg=('This is parent commit.\n'
1251 '\n'
1252 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1253 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1254 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1255 '\n'
1256 'Review-Url: https://codereview.chromium.org/123 .\n'
1257 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1258 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1259 fail_push_count=fail_push_count,
1260 debug=False)
1261
1262 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001263 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001264 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001265 ((['update_description', 123,
1266 'Issue: 123\n\nR=john@chromium.org\n'
1267 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001268 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001269 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1270 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1271 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001272 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001273 ''),
1274 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001275 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001276 ]
1277 git_cl.main(['land'])
1278
1279 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001280 self._land_rietveld_calls(
1281 repo_url='https://chromium.googlesource.com/v8/v8',
1282 git_numberer_enabled=True,
1283 parent_msg='This is parent commit with no footer.',
1284 fail_after_parent_msg=True,
1285 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001286 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001287 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001288 ((['git', 'checkout', '-q', 'feature'],), ''),
1289 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001290 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001291 ]
1292 with self.assertRaises(ValueError) as cm:
1293 git_cl.main(['land'])
1294 self.assertEqual(cm.exception.message,
1295 'Unable to infer commit position from footers')
1296
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001297 def test_git_numberer_not_whitelisted_repo(self):
1298 self.calls = []
1299 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001300 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1301 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001302 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001303
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001304 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001305 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1306 self.calls = [
1307 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001308 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001309 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001310 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001311 remote_url='https://chromium.googlesource.com/chromium/src',
1312 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001313 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001314
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001315 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001316 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001317 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001318 def fake_temporary_directory(**kwargs):
1319 yield tempdir
1320 self.mock(git_cl.gclient_utils, 'temporary_directory',
1321 fake_temporary_directory)
1322 self._test_GitNumbererState_valid_configs_inner(tempdir)
1323
1324 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001325 self.calls = [
1326 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001327 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001328 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1329 '''
1330 [plugin "git-numberer"]
1331 validate-enabled-refglob = refs/else/*
1332 validate-enabled-refglob = refs/heads/*
1333 validate-disabled-refglob = refs/heads/disabled
1334 validate-disabled-refglob = refs/branch-heads/*
1335 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001336 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1337 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001338 'refs/else/*\n'
1339 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001340 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1341 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001342 'refs/heads/disabled\n'
1343 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001344 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001345
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001346 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001347 remote_url='https://chromium.googlesource.com/chromium/src',
1348 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001349 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001350
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001351 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001352 remote_url='https://chromium.googlesource.com/chromium/src',
1353 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001354 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001355
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001356 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001357 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001358 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001359 remote_url='https://chromium.googlesource.com/chromium/src',
1360 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001361 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001362
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001363 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001364 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001365 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001366 if skip_auth_check:
1367 return [((cmd, ), 'true')]
1368
tandrii5d48c322016-08-18 16:19:37 -07001369 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001370 if issue:
1371 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001372 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001373 ])
1374 calls.extend([
1375 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1376 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1377 ((['git', 'config', 'remote.origin.url'],),
1378 'https://chromium.googlesource.com/my/repo'),
1379 ((['git', 'config', 'remote.origin.url'],),
1380 'https://chromium.googlesource.com/my/repo'),
1381 ])
1382 return calls
1383
1384 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001385 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001386 fetched_status=None, other_cl_owner=None,
1387 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001388 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001389 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1390 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1391 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1392 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001393 ]
1394 calls += cls._is_gerrit_calls(True)
1395 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001396 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1397 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1398 ((['git', 'config', 'branch.master.gerritissue'],),
1399 CERR1 if issue is None else str(issue)),
1400 ]
1401
1402 if custom_cl_base:
1403 ancestor_revision = custom_cl_base
1404 else:
1405 # Determine ancestor_revision to be merge base.
1406 ancestor_revision = 'fake_ancestor_sha'
1407 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001408 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001409 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001410 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001411 'refs/remotes/origin/master'],), ancestor_revision),
1412 ]
1413
1414 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001415 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1416
1417 if issue:
1418 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001419 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001420 '123456',
1421 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001422 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001423 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001424 'change_id': '123456789',
1425 'current_revision': 'sha1_of_current_revision',
1426 'revisions': { 'sha1_of_current_revision': {
1427 'commit': {'message': fetched_description},
1428 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001429 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001430 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001431 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001432 if fetched_status == 'ABANDONED':
1433 calls += [
1434 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1435 '123456 has been abandoned, new uploads are not '
1436 'allowed'), SystemExitMock()),
1437 ]
1438 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001439 if other_cl_owner:
1440 calls += [
1441 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1442 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001443
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001444 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1445 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001446 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001447 ((['git', 'rev-parse', '--show-cdup'],), ''),
1448 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001449
Aaron Gable7817f022017-12-12 09:43:17 -08001450 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1451 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001452 'M\t.gitignore\n'),
1453 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001454 ]
1455
1456 if not issue:
1457 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001458 ((['git', 'log', '--pretty=format:%s%n%n%b',
1459 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001460 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001461 ]
1462
1463 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001464 ((['git', 'config', 'user.email'],), 'me@example.com'),
1465 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1466 ([custom_cl_base] if custom_cl_base else
1467 [ancestor_revision, 'HEAD']),),
1468 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001469 ]
1470 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001471
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001472 @classmethod
1473 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001474 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001475 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001476 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001477 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001478 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001479 if post_amend_description is None:
1480 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001481 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001482 # Determined in `_gerrit_base_calls`.
1483 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1484
1485 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001486
tandriia60502f2016-06-20 02:01:53 -07001487 if squash_mode == 'default':
1488 calls.extend([
1489 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1490 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1491 ])
1492 elif squash_mode in ('override_squash', 'override_nosquash'):
1493 calls.extend([
1494 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1495 'true' if squash_mode == 'override_squash' else 'false'),
1496 ])
1497 else:
1498 assert squash_mode in ('squash', 'nosquash')
1499
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001500 # If issue is given, then description is fetched from Gerrit instead.
1501 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001502 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001503 ((['git', 'log', '--pretty=format:%s\n\n%b',
1504 ((custom_cl_base + '..') if custom_cl_base else
1505 'fake_ancestor_sha..HEAD')],),
1506 description),
1507 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001508 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001509 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001510 else:
1511 if not title:
1512 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001513 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1514 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001515 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001516 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001517 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001518 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001519 (('DownloadGerritHook', False), ''),
1520 # Amending of commit message to get the Change-Id.
1521 ((['git', 'log', '--pretty=format:%s\n\n%b',
1522 determined_ancestor_revision + '..HEAD'],),
1523 description),
1524 ((['git', 'commit', '--amend', '-m', description],), ''),
1525 ((['git', 'log', '--pretty=format:%s\n\n%b',
1526 determined_ancestor_revision + '..HEAD'],),
1527 post_amend_description)
1528 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001529 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001530 if not issue:
1531 # Prompting to edit description on first upload.
1532 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001533 ((['git', 'config', 'core.editor'],), ''),
1534 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001535 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001536 ref_to_push = 'abcdef0123456789'
1537 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001538 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1539 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1540 ]
1541
1542 if custom_cl_base is None:
1543 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001544 ((['get_or_create_merge_base', 'master',
1545 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001546 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001547 ]
1548 parent = 'origin/master'
1549 else:
1550 calls += [
1551 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1552 'refs/remotes/origin/master'],),
1553 callError(1)), # Means not ancenstor.
1554 (('ask_for_data',
1555 'Do you take responsibility for cleaning up potential mess '
1556 'resulting from proceeding with upload? Press Enter to upload, '
1557 'or Ctrl+C to abort'), ''),
1558 ]
1559 parent = custom_cl_base
1560
1561 calls += [
1562 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1563 '0123456789abcdef'),
1564 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001565 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001566 ref_to_push),
1567 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001568 else:
1569 ref_to_push = 'HEAD'
1570
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001571 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001572 ((['git', 'rev-list',
1573 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1574 ref_to_push],),
1575 '1hashPerLine\n'),
1576 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001577
Aaron Gableafd52772017-06-27 16:40:10 -07001578 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001579 ref_suffix = '%ready,notify=ALL'
1580 else:
1581 if not issue:
1582 ref_suffix = '%wip'
1583 else:
1584 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001585
Aaron Gable70f4e242017-06-26 10:45:59 -07001586 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001587 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001588
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001589 if git_mirror is None:
1590 calls += [
1591 ((['git', 'config', 'remote.origin.url'],),
1592 'https://chromium.googlesource.com/yyy/zzz'),
1593 ]
1594 else:
1595 calls += [
1596 ((['git', 'config', 'remote.origin.url'],),
1597 '/cache/this-dir-exists'),
1598 (('os.path.isdir', '/cache/this-dir-exists'),
1599 True),
1600 # Runs in /cache/this-dir-exists.
1601 ((['git', 'config', 'remote.origin.url'],),
1602 'https://chromium.googlesource.com/yyy/zzz'),
1603 ]
1604
ukai@chromium.orge8077812012-02-03 03:41:46 +00001605 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001606 ((['git', 'push',
1607 'https://chromium.googlesource.com/yyy/zzz',
1608 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001609 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001610 'remote: Processing changes: (\)\n'
1611 'remote: Processing changes: (|)\n'
1612 'remote: Processing changes: (/)\n'
1613 'remote: Processing changes: (-)\n'
1614 'remote: Processing changes: new: 1 (/)\n'
1615 'remote: Processing changes: new: 1, done\n'
1616 'remote:\n'
1617 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001618 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1619 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001620 'remote:\n'
1621 'To https://chromium.googlesource.com/yyy/zzz\n'
1622 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001623 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001624 if squash:
1625 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001626 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001627 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001628 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001629 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001630 ((['git', 'config', 'branch.master.gerritsquashhash',
1631 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001632 ]
tandrii88189772016-09-29 04:29:57 -07001633 calls += [
1634 ((['git', 'config', 'rietveld.cc'],), ''),
Daniel Cheng7227d212017-11-17 08:12:37 -08001635 (('AddReviewers', 'chromium-review.googlesource.com', 123456
1636 if squash else None, sorted(reviewers),
1637 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1638 cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001639 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001640 if tbr:
1641 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001642 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1643 ['LABELS']), {
1644 'labels': {
1645 'Code-Review': {
1646 'default_value': 0,
1647 'all': [],
1648 'values': {
1649 '+2': 'lgtm, approved',
1650 '+1': 'lgtm, but someone else must approve',
1651 ' 0': 'No score',
1652 '-1': 'Don\'t submit as-is',
1653 }
1654 }
1655 }
1656 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001657 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001658 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001659 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001660 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001661 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001662 return calls
1663
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001664 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001665 self,
1666 upload_args,
1667 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001668 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001669 squash=True,
1670 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001671 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001672 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001673 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001674 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001675 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001676 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001677 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001678 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001679 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001680 custom_cl_base=None,
1681 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001682 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001683 if squash_mode is None:
1684 if '--no-squash' in upload_args:
1685 squash_mode = 'nosquash'
1686 elif '--squash' in upload_args:
1687 squash_mode = 'squash'
1688 else:
1689 squash_mode = 'default'
1690
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001691 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001692 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001693 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001694 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001695 CookiesAuthenticatorMockFactory(
1696 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001697 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1698 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001699 self.mock(git_cl.gclient_utils, 'RunEditor',
1700 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001701 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1702 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001703
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001704 original_os_path_isdir = os.path.isdir
1705 def selective_os_path_isdir_mock(path):
1706 if path == '/cache/this-dir-exists':
1707 return self._mocked_call('os.path.isdir', path)
1708 return original_os_path_isdir(path)
1709 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1710
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001711 self.calls = self._gerrit_base_calls(
1712 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001713 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001714 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001715 other_cl_owner=other_cl_owner,
1716 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001717 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001718 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1719 expected_content=description))
1720 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001721 self.calls += self._gerrit_upload_calls(
1722 description, reviewers, squash,
1723 squash_mode=squash_mode,
1724 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001725 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001726 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001727 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001728 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001729 # Uncomment when debugging.
1730 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001731 git_cl.main(['upload'] + upload_args)
1732
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001733 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001734 self._run_gerrit_upload_test(
1735 ['--no-squash'],
1736 'desc\n\nBUG=\n',
1737 [],
1738 squash=False,
1739 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1740
1741 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001742 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001743 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001744 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001745 [],
tandriia60502f2016-06-20 02:01:53 -07001746 squash=False,
1747 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001748 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001749
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001750 def test_gerrit_no_reviewer(self):
1751 self._run_gerrit_upload_test(
1752 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001753 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001754 [],
1755 squash=False,
1756 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001757
Nick Carter8692b182017-11-06 16:30:38 -08001758 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001759 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1760 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001761 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001762 'desc\n\nBUG=\n\nChange-Id: I123456789',
1763 squash=False,
1764 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001765 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001766
ukai@chromium.orge8077812012-02-03 03:41:46 +00001767 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001768 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001769 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001770 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001771 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001772 squash=False,
1773 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001774 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001775
1776 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001777 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001778 [],
bradnelsond975b302016-10-23 12:20:23 -07001779 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1780 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001781 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001782 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001783 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001784 cc=['more@example.com', 'people@example.com'],
1785 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001786
1787 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001788 self._run_gerrit_upload_test(
1789 [],
1790 'desc\nBUG=\n\nChange-Id: 123456789',
1791 [],
1792 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001793
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001794 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001795 self._run_gerrit_upload_test(
1796 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001797 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001798 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001799 squash=True,
1800 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001801
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001802 def test_gerrit_upload_squash_first_against_rev(self):
1803 custom_cl_base = 'custom_cl_base_rev_or_branch'
1804 self._run_gerrit_upload_test(
1805 ['--squash', custom_cl_base],
1806 'desc\nBUG=\n\nChange-Id: 123456789',
1807 [],
1808 squash=True,
1809 expected_upstream_ref='origin/master',
1810 custom_cl_base=custom_cl_base)
1811 self.assertIn(
1812 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1813 sys.stdout.getvalue())
1814
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001815 def test_gerrit_upload_squash_first_with_mirror(self):
1816 self._run_gerrit_upload_test(
1817 ['--squash'],
1818 'desc\nBUG=\n\nChange-Id: 123456789',
1819 [],
1820 squash=True,
1821 expected_upstream_ref='origin/master',
1822 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1823
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001824 def test_gerrit_upload_squash_reupload(self):
1825 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001826 self._run_gerrit_upload_test(
1827 ['--squash'],
1828 description,
1829 [],
1830 squash=True,
1831 expected_upstream_ref='origin/master',
1832 issue=123456)
1833
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001834 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1835 self.mock(git_cl, 'DieWithError',
1836 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1837 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1838 with self.assertRaises(SystemExitMock):
1839 self._run_gerrit_upload_test(
1840 ['--squash'],
1841 description,
1842 [],
1843 squash=True,
1844 expected_upstream_ref='origin/master',
1845 issue=123456,
1846 fetched_status='ABANDONED')
1847
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001848 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1849 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1850 lambda *_, **__: {'email': 'yet-another@example.com'})
1851 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1852 self._run_gerrit_upload_test(
1853 ['--squash'],
1854 description,
1855 [],
1856 squash=True,
1857 expected_upstream_ref='origin/master',
1858 issue=123456,
1859 other_cl_owner='other@example.com')
1860 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001861 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001862 'authenticate to Gerrit as yet-another@example.com.\n'
1863 'Uploading may fail due to lack of permissions',
1864 git_cl.sys.stdout.getvalue())
1865
rmistry@google.com2dd99862015-06-22 12:22:18 +00001866 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001867 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001868 def mock_run_git(*args, **_kwargs):
1869 if args[0] == ['for-each-ref',
1870 '--format=%(refname:short) %(upstream:short)',
1871 'refs/heads']:
1872 # Create a local branch dependency tree that looks like this:
1873 # test1 -> test2 -> test3 -> test4 -> test5
1874 # -> test3.1
1875 # test6 -> test0
1876 branch_deps = [
1877 'test2 test1', # test1 -> test2
1878 'test3 test2', # test2 -> test3
1879 'test3.1 test2', # test2 -> test3.1
1880 'test4 test3', # test3 -> test4
1881 'test5 test4', # test4 -> test5
1882 'test6 test0', # test0 -> test6
1883 'test7', # test7
1884 ]
1885 return '\n'.join(branch_deps)
1886 self.mock(git_cl, 'RunGit', mock_run_git)
1887
1888 class RecordCalls:
1889 times_called = 0
1890 record_calls = RecordCalls()
1891 def mock_CMDupload(*args, **_kwargs):
1892 record_calls.times_called += 1
1893 return 0
1894 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1895
1896 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001897 (('ask_for_data', 'This command will checkout all dependent branches '
1898 'and run "git cl upload". Press Enter to continue, '
1899 'or Ctrl+C to abort'), ''),
1900 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001901
1902 class MockChangelist():
1903 def __init__(self):
1904 pass
1905 def GetBranch(self):
1906 return 'test1'
1907 def GetIssue(self):
1908 return '123'
1909 def GetPatchset(self):
1910 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001911 def IsGerrit(self):
1912 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001913
1914 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1915 # CMDupload should have been called 5 times because of 5 dependent branches.
1916 self.assertEquals(5, record_calls.times_called)
1917 self.assertEquals(0, ret)
1918
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001919 def test_gerrit_change_id(self):
1920 self.calls = [
1921 ((['git', 'write-tree'], ),
1922 'hashtree'),
1923 ((['git', 'rev-parse', 'HEAD~0'], ),
1924 'branch-parent'),
1925 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1926 'A B <a@b.org> 1456848326 +0100'),
1927 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1928 'C D <c@d.org> 1456858326 +0100'),
1929 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1930 'hashchange'),
1931 ]
1932 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1933 self.assertEqual(change_id, 'Ihashchange')
1934
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001935 def test_desecription_append_footer(self):
1936 for init_desc, footer_line, expected_desc in [
1937 # Use unique desc first lines for easy test failure identification.
1938 ('foo', 'R=one', 'foo\n\nR=one'),
1939 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1940 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1941 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1942 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1943 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1944 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1945 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1946 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1947 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1948 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1949 ]:
1950 desc = git_cl.ChangeDescription(init_desc)
1951 desc.append_footer(footer_line)
1952 self.assertEqual(desc.description, expected_desc)
1953
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001954 def test_update_reviewers(self):
1955 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001956 ('foo', [], [],
1957 'foo'),
1958 ('foo\nR=xx', [], [],
1959 'foo\nR=xx'),
1960 ('foo\nTBR=xx', [], [],
1961 'foo\nTBR=xx'),
1962 ('foo', ['a@c'], [],
1963 'foo\n\nR=a@c'),
1964 ('foo\nR=xx', ['a@c'], [],
1965 'foo\n\nR=a@c, xx'),
1966 ('foo\nTBR=xx', ['a@c'], [],
1967 'foo\n\nR=a@c\nTBR=xx'),
1968 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1969 'foo\n\nR=a@c, yy\nTBR=xx'),
1970 ('foo\nBUG=', ['a@c'], [],
1971 'foo\nBUG=\nR=a@c'),
1972 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1973 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1974 ('foo', ['a@c', 'b@c'], [],
1975 'foo\n\nR=a@c, b@c'),
1976 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1977 'foo\nBar\n\nR=c@c\nBUG='),
1978 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1979 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001980 # Same as the line before, but full of whitespaces.
1981 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001982 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001983 'foo\nBar\n\nR=c@c\n BUG =',
1984 ),
1985 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001986 ('foo BUG=allo R=joe ', ['c@c'], [],
1987 'foo BUG=allo R=joe\n\nR=c@c'),
1988 # Redundant TBRs get promoted to Rs
1989 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1990 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001991 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001992 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001993 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001994 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001995 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001996 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001997 actual.append(obj.description)
1998 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001999
Nodir Turakulov23b82142017-11-16 11:04:25 -08002000 def test_get_hash_tags(self):
2001 cases = [
2002 ('', []),
2003 ('a', []),
2004 ('[a]', ['a']),
2005 ('[aa]', ['aa']),
2006 ('[a ]', ['a']),
2007 ('[a- ]', ['a']),
2008 ('[a- b]', ['a-b']),
2009 ('[a--b]', ['a-b']),
2010 ('[a', []),
2011 ('[a]x', ['a']),
2012 ('[aa]x', ['aa']),
2013 ('[a b]', ['a-b']),
2014 ('[a b]', ['a-b']),
2015 ('[a__b]', ['a-b']),
2016 ('[a] x', ['a']),
2017 ('[a][b]', ['a', 'b']),
2018 ('[a] [b]', ['a', 'b']),
2019 ('[a][b]x', ['a', 'b']),
2020 ('[a][b] x', ['a', 'b']),
2021 ('[a]\n[b]', ['a']),
2022 ('[a\nb]', []),
2023 ('[a][', ['a']),
2024 ('Revert "[a] feature"', ['a']),
2025 ('Reland "[a] feature"', ['a']),
2026 ('Revert: [a] feature', ['a']),
2027 ('Reland: [a] feature', ['a']),
2028 ('Revert "Reland: [a] feature"', ['a']),
2029 ('Foo: feature', ['foo']),
2030 ('Foo Bar: feature', ['foo-bar']),
2031 ('Revert "Foo bar: feature"', ['foo-bar']),
2032 ('Reland "Foo bar: feature"', ['foo-bar']),
2033 ]
2034 for desc, expected in cases:
2035 change_desc = git_cl.ChangeDescription(desc)
2036 actual = change_desc.get_hash_tags()
2037 self.assertEqual(
2038 actual,
2039 expected,
2040 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
2041
wittman@chromium.org455dc922015-01-26 20:15:50 +00002042 def test_get_target_ref(self):
2043 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002044 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002045 self.assertEqual(None, git_cl.GetTargetRef(None,
2046 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002047 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002048
wittman@chromium.org455dc922015-01-26 20:15:50 +00002049 # Check default target refs for branches.
2050 self.assertEqual('refs/heads/master',
2051 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002052 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002053 self.assertEqual('refs/heads/master',
2054 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002055 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002056 self.assertEqual('refs/heads/master',
2057 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002058 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002059 self.assertEqual('refs/branch-heads/123',
2060 git_cl.GetTargetRef('origin',
2061 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002062 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002063 self.assertEqual('refs/diff/test',
2064 git_cl.GetTargetRef('origin',
2065 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002066 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00002067 self.assertEqual('refs/heads/chrome/m42',
2068 git_cl.GetTargetRef('origin',
2069 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002070 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002071
2072 # Check target refs for user-specified target branch.
2073 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
2074 'refs/remotes/branch-heads/123'):
2075 self.assertEqual('refs/branch-heads/123',
2076 git_cl.GetTargetRef('origin',
2077 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002078 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002079 for branch in ('origin/master', 'remotes/origin/master',
2080 'refs/remotes/origin/master'):
2081 self.assertEqual('refs/heads/master',
2082 git_cl.GetTargetRef('origin',
2083 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002084 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002085 for branch in ('master', 'heads/master', 'refs/heads/master'):
2086 self.assertEqual('refs/heads/master',
2087 git_cl.GetTargetRef('origin',
2088 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002089 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002090
wychen@chromium.orga872e752015-04-28 23:42:18 +00002091 def test_patch_when_dirty(self):
2092 # Patch when local tree is dirty
2093 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2094 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2095
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002096 @staticmethod
2097 def _get_gerrit_codereview_server_calls(branch, value=None,
2098 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08002099 detect_branch=True,
2100 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002101 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2102
2103 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2104 """
2105 calls = []
2106 if detect_branch:
2107 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08002108 if detect_server:
2109 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2110 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002111 if value is None:
2112 calls += [
2113 ((['git', 'config', 'branch.' + branch + '.merge'],),
2114 'refs/heads' + branch),
2115 ((['git', 'config', 'branch.' + branch + '.remote'],),
2116 'origin'),
2117 ((['git', 'config', 'remote.origin.url'],),
2118 'https://%s.googlesource.com/my/repo' % git_short_host),
2119 ]
2120 return calls
2121
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002122 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002123 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002124 detect_gerrit_server=True,
2125 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002126 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002127 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2128 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002129 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002130 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002131 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2132
tandriidf09a462016-08-18 16:23:55 -07002133 if new_branch:
2134 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002135
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002136 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002137 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002138 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002139 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002140 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2141 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2142 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2143 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002144 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002145 if default_codereview == 'gerrit':
2146 if not force_codereview:
2147 self.calls += [
2148 ((['git', 'config', 'gerrit.host'],), 'true'),
2149 ]
2150 if detect_gerrit_server:
2151 self.calls += self._get_gerrit_codereview_server_calls(
2152 'master', git_short_host=git_short_host,
2153 detect_branch=not new_branch and force_codereview)
2154 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002155
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002156 elif default_codereview == 'rietveld':
2157 self.calls += [
2158 ((['git', 'config', 'gerrit.host'],), CERR1),
2159 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2160 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2161 ]
2162 actual_codereview = 'rietveld'
2163
2164 if actual_codereview == 'rietveld':
2165 self.calls += [
2166 ((['git', 'rev-parse', '--show-cdup'],), ''),
2167 ]
2168 if not default_codereview:
2169 self.calls += [
2170 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2171 ]
2172 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002173 self.calls += [
2174 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002175 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002176 {
2177 'current_revision': '7777777777',
2178 'revisions': {
2179 '1111111111': {
2180 '_number': 1,
2181 'fetch': {'http': {
2182 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2183 'ref': 'refs/changes/56/123456/1',
2184 }},
2185 },
2186 '7777777777': {
2187 '_number': 7,
2188 'fetch': {'http': {
2189 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2190 'ref': 'refs/changes/56/123456/7',
2191 }},
2192 },
2193 },
2194 }),
2195 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002196
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002197 def _common_patch_rietveld_successful(self, **kwargs):
2198 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002199 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002200 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002201 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002202 ((['git', 'config', 'branch.master.rietveldserver',
2203 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002204 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002205 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002206 ((['git', 'commit', '-m',
2207 'Description\n\n' +
2208 'patch from issue 123456 at patchset 60001 ' +
2209 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002210 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002211
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002212 def test_patch_rietveld_default(self):
2213 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002214 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2215
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002216 def test_patch_rietveld_successful_new_branch(self):
2217 self._common_patch_rietveld_successful(default_codereview='rietveld',
2218 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002219 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2220
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002221 def test_patch_rietveld_guess_by_url(self):
2222 self._common_patch_rietveld_successful(
2223 default_codereview=None, # It doesn't matter.
2224 actual_codereview='rietveld')
2225 self.assertEqual(git_cl.main(
2226 ['patch', 'https://codereview.example.com/123456']), 0)
2227
2228 def test_patch_rietveld_conflict(self):
2229 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002230 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002231 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002232
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002233 def test_patch_gerrit_default(self):
2234 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002235 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002236 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002237 ((['git', 'config', 'remote.origin.url'],),
2238 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002239 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2240 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002241 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002242 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08002243 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002244 ((['git', 'config', 'branch.master.gerritserver',
2245 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002246 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002247 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2248 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2249 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002250 ]
2251 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2252
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002253 def test_patch_gerrit_force(self):
2254 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002255 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002256 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002257 ((['git', 'config', 'remote.origin.url'],),
2258 'https://host.googlesource.com/my/repo'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002259 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002260 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002261 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002262 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002263 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002264 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002265 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002266 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002267 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2268 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2269 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002270 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002271 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002272
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002273 def test_patch_gerrit_guess_by_url(self):
2274 self._patch_common(
2275 default_codereview=None, # It doesn't matter what's default.
2276 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08002277 git_short_host='else')
2278 self.calls += self._get_gerrit_codereview_server_calls(
2279 'master', git_short_host='else', detect_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002280 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002281 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002282 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002283 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002284 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002285 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002286 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002287 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002288 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002289 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2290 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2291 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002292 ]
2293 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002294 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002295
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002296 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2297 self._patch_common(
2298 default_codereview=None, # It doesn't matter what's default.
2299 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08002300 git_short_host='else')
2301 self.calls += self._get_gerrit_codereview_server_calls(
2302 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002303 self.calls += [
2304 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2305 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002306 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002307 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2308 ''),
2309 ((['git', 'config', 'branch.master.gerritserver',
2310 'https://else-review.googlesource.com'],), ''),
2311 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002312 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2313 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2314 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002315 ]
2316 self.assertEqual(git_cl.main(
2317 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2318
Aaron Gable697a91b2018-01-19 15:20:15 -08002319 def test_patch_gerrit_guess_by_url_with_repo(self):
2320 self._patch_common(
2321 default_codereview=None, # It doesn't matter what's default.
2322 actual_codereview='gerrit',
2323 git_short_host='else')
2324 self.calls += self._get_gerrit_codereview_server_calls(
2325 'master', git_short_host='else', detect_server=False)
2326 self.calls += [
2327 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2328 'refs/changes/56/123456/1'],), ''),
2329 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2330 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2331 ''),
2332 ((['git', 'config', 'branch.master.gerritserver',
2333 'https://else-review.googlesource.com'],), ''),
2334 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2335 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2336 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2337 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
2338 ]
2339 self.assertEqual(git_cl.main(
2340 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
2341 0)
2342
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002343 def test_patch_gerrit_conflict(self):
2344 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002345 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002346 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002347 ((['git', 'config', 'remote.origin.url'],),
2348 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002349 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002350 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002351 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2352 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2353 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002354 ]
2355 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002356 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002357
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002358 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002359 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002360 raise git_cl.gerrit_util.GerritError(404, '')
2361 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2362
tandriic2405f52016-10-10 08:13:15 -07002363 self.calls = [
2364 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002365 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2366 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2367 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2368 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002369 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2370 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2371 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2372 ((['git', 'config', 'remote.origin.url'],),
2373 'https://chromium.googlesource.com/my/repo'),
2374 ((['DieWithError',
2375 'change 123456 at https://chromium-review.googlesource.com does not '
2376 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002377 ]
2378 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002379 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002380
Aaron Gable697a91b2018-01-19 15:20:15 -08002381 def test_patch_gerrit_wrong_repo(self):
2382 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
2383 detect_gerrit_server=True)
2384 self.calls += [
2385 ((['git', 'config', 'remote.origin.url'],),
2386 'https://chromium.googlesource.com/wrong/repo'),
2387 ((['DieWithError',
2388 'Trying to patch a change from '
2389 'https://chromium.googlesource.com/my/repo but this repo appears '
2390 'to be https://chromium.googlesource.com/wrong/repo.'],),
2391 SystemExitMock()),
2392 ]
2393 with self.assertRaises(SystemExitMock):
2394 self.assertEqual(1, git_cl.main(['patch', '123456']))
2395
2396
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002397 def _checkout_calls(self):
2398 return [
2399 ((['git', 'config', '--local', '--get-regexp',
2400 'branch\\..*\\.rietveldissue'], ),
2401 ('branch.retrying.rietveldissue 1111111111\n'
2402 'branch.some-fix.rietveldissue 2222222222\n')),
2403 ((['git', 'config', '--local', '--get-regexp',
2404 'branch\\..*\\.gerritissue'], ),
2405 ('branch.ger-branch.gerritissue 123456\n'
2406 'branch.gbranch654.gerritissue 654321\n')),
2407 ]
2408
2409 def test_checkout_gerrit(self):
2410 """Tests git cl checkout <issue>."""
2411 self.calls = self._checkout_calls()
2412 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2413 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2414
2415 def test_checkout_rietveld(self):
2416 """Tests git cl checkout <issue>."""
2417 self.calls = self._checkout_calls()
2418 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2419 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2420
2421 def test_checkout_not_found(self):
2422 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002423 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002424 self.calls = self._checkout_calls()
2425 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2426
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002427 def test_checkout_no_branch_issues(self):
2428 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002429 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002430 self.calls = [
2431 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002432 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002433 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002434 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002435 ]
2436 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2437
tandrii@chromium.org28253532016-04-14 13:46:56 +00002438 def _test_gerrit_ensure_authenticated_common(self, auth,
2439 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002440 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2441 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2442 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002443 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002444 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002445 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002446 cl.branch = 'master'
2447 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002448 cl.lookedup_issue = True
2449 return cl
2450
2451 def test_gerrit_ensure_authenticated_missing(self):
2452 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002453 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002454 })
2455 self.calls.append(
2456 ((['DieWithError',
2457 'Credentials for the following hosts are required:\n'
2458 ' chromium-review.googlesource.com\n'
2459 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002460 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002461 'https://chromium-review.googlesource.com/new-password'],), ''),)
2462 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2463
2464 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002465 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002466 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002467 'chromium.googlesource.com':
2468 ('git-one.example.com', None, 'secret1'),
2469 'chromium-review.googlesource.com':
2470 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002471 })
2472 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002473 (('ask_for_data', 'If you know what you are doing '
2474 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002475 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2476
2477 def test_gerrit_ensure_authenticated_ok(self):
2478 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002479 'chromium.googlesource.com':
2480 ('git-same.example.com', None, 'secret'),
2481 'chromium-review.googlesource.com':
2482 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002483 })
2484 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2485
tandrii@chromium.org28253532016-04-14 13:46:56 +00002486 def test_gerrit_ensure_authenticated_skipped(self):
2487 cl = self._test_gerrit_ensure_authenticated_common(
2488 auth={}, skip_auth_check=True)
2489 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2490
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002491 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002492 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2493 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002494 self.calls = [
2495 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002496 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002497 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2498 ((['git', 'config', 'rietveld.server'],), ''),
2499 ((['git', 'config', 'rietveld.server'],), ''),
2500 ((['git', 'config', 'branch.feature.rietveldserver'],),
2501 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002502 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002503 ]
2504 self.assertEqual(0, git_cl.main(['set-commit']))
2505
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002506 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002507 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002508 lambda h, i, labels, notify=None:
2509 self._mocked_call(['SetReview', h, i, labels, notify]))
2510
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002511 self.calls = [
2512 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002513 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2514 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002515 ((['git', 'config', 'branch.feature.gerritserver'],),
2516 'https://chromium-review.googlesource.com'),
2517 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002518 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002519 ]
tandriid9e5ce52016-07-13 02:32:59 -07002520
2521 def test_cmd_set_commit_gerrit_clear(self):
2522 self._cmd_set_commit_gerrit_common(0)
2523 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2524
2525 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002526 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002527 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2528
tandriid9e5ce52016-07-13 02:32:59 -07002529 def test_cmd_set_commit_gerrit(self):
2530 self._cmd_set_commit_gerrit_common(2)
2531 self.assertEqual(0, git_cl.main(['set-commit']))
2532
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002533 def test_description_display(self):
2534 out = StringIO.StringIO()
2535 self.mock(git_cl.sys, 'stdout', out)
2536
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002537 self.mock(git_cl, 'Changelist', ChangelistMock)
2538 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002539
2540 self.assertEqual(0, git_cl.main(['description', '-d']))
2541 self.assertEqual('foo\n', out.getvalue())
2542
2543 def test_description_rietveld(self):
2544 out = StringIO.StringIO()
2545 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002546 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002547
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002548 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002549 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002550 self.assertEqual('foobar\n', out.getvalue())
2551
iannucci3c972b92016-08-17 13:24:10 -07002552 def test_StatusFieldOverrideIssueMissingArgs(self):
2553 out = StringIO.StringIO()
2554 self.mock(git_cl.sys, 'stderr', out)
2555
2556 try:
2557 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2558 except SystemExit as ex:
2559 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002560 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002561
2562 out = StringIO.StringIO()
2563 self.mock(git_cl.sys, 'stderr', out)
2564
2565 try:
2566 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2567 except SystemExit as ex:
2568 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002569 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002570
2571 def test_StatusFieldOverrideIssue(self):
2572 out = StringIO.StringIO()
2573 self.mock(git_cl.sys, 'stdout', out)
2574
2575 def assertIssue(cl_self, *_args):
2576 self.assertEquals(cl_self.issue, 1)
2577 return 'foobar'
2578
2579 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2580 self.calls = [
2581 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2582 ((['git', 'config', 'rietveld.server'],), ''),
2583 ((['git', 'config', 'rietveld.server'],), ''),
2584 ]
iannuccie53c9352016-08-17 14:40:40 -07002585 self.assertEqual(
2586 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2587 0)
iannucci3c972b92016-08-17 13:24:10 -07002588 self.assertEqual(out.getvalue(), 'foobar\n')
2589
iannuccie53c9352016-08-17 14:40:40 -07002590 def test_SetCloseOverrideIssue(self):
2591 def assertIssue(cl_self, *_args):
2592 self.assertEquals(cl_self.issue, 1)
2593 return 'foobar'
2594
2595 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2596 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2597 self.calls = [
2598 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2599 ((['git', 'config', 'rietveld.server'],), ''),
2600 ((['git', 'config', 'rietveld.server'],), ''),
2601 ]
2602 self.assertEqual(
2603 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2604
2605 def test_SetCommitOverrideIssue(self):
2606 def assertIssue(cl_self, *_args):
2607 self.assertEquals(cl_self.issue, 1)
2608 return 'foobar'
2609
2610 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2611 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2612 self.calls = [
2613 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2614 ((['git', 'config', 'rietveld.server'],), ''),
2615 ((['git', 'config', 'rietveld.server'],), ''),
2616 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2617 ((['git', 'config', 'rietveld.server'],), ''),
2618 ((['git', 'config', 'rietveld.server'],), ''),
2619 ]
2620 self.assertEqual(
2621 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2622
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002623 def test_description_gerrit(self):
2624 out = StringIO.StringIO()
2625 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002626 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002627 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002628 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2629 {
2630 'current_revision': 'sha1',
2631 'revisions': {'sha1': {
2632 'commit': {'message': 'foobar'},
2633 }},
2634 }),
2635 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002636 self.assertEqual(0, git_cl.main([
2637 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2638 self.assertEqual('foobar\n', out.getvalue())
2639
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002640 def test_description_set_raw(self):
2641 out = StringIO.StringIO()
2642 self.mock(git_cl.sys, 'stdout', out)
2643
2644 self.mock(git_cl, 'Changelist', ChangelistMock)
2645 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2646
2647 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2648 self.assertEqual('hihi', ChangelistMock.desc)
2649
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002650 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002651 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002652
2653 def RunEditor(desc, _, **kwargs):
2654 self.assertEquals(
2655 '# Enter a description of the change.\n'
2656 '# This will be displayed on the codereview site.\n'
2657 '# The first line will also be used as the subject of the review.\n'
2658 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002659 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002660 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002661 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002662 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002663 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002664
dsansomee2d6fd92016-09-08 00:10:47 -07002665 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002666 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002667
2668 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2669 self.mock(git_cl.Changelist, 'GetDescription',
2670 lambda *args: current_desc)
2671 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2672 UpdateDescriptionRemote)
2673 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2674
2675 self.calls = [
2676 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002677 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002678 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2679 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002680 ((['git', 'config', 'core.editor'],), 'vi'),
2681 ]
2682 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2683
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002684 def test_description_set_stdin(self):
2685 out = StringIO.StringIO()
2686 self.mock(git_cl.sys, 'stdout', out)
2687
2688 self.mock(git_cl, 'Changelist', ChangelistMock)
2689 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2690
2691 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2692 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2693
kmarshall3bff56b2016-06-06 18:31:47 -07002694 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002695 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2696
kmarshall3bff56b2016-06-06 18:31:47 -07002697 self.calls = \
2698 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2699 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002700 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002701 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2702 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002703 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2704 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2705 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002706 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2707 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2708 ((['git', 'branch', '-D', 'foo'],), '')]
2709
kmarshall3bff56b2016-06-06 18:31:47 -07002710 self.mock(git_cl, 'get_cl_statuses',
2711 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002712 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2713 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2714 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002715
2716 self.assertEqual(0, git_cl.main(['archive', '-f']))
2717
2718 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002719 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002720 self.calls = \
2721 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2722 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002723 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002724 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2725 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002726 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2727
kmarshall9249e012016-08-23 12:02:16 -07002728 self.mock(git_cl, 'get_cl_statuses',
2729 lambda branches, fine_grained, max_processes:
2730 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2731
2732 self.assertEqual(1, git_cl.main(['archive', '-f']))
2733
2734 def test_archive_dry_run(self):
2735 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2736
2737 self.calls = \
2738 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2739 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2740 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2741 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2742 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2743 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2744 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2745 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2746 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002747
2748 self.mock(git_cl, 'get_cl_statuses',
2749 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002750 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2751 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2752 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002753
kmarshall9249e012016-08-23 12:02:16 -07002754 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2755
2756 def test_archive_no_tags(self):
2757 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2758
2759 self.calls = \
2760 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2761 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2762 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2763 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2764 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2765 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2766 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2767 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2768 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2769 ((['git', 'branch', '-D', 'foo'],), '')]
2770
2771 self.mock(git_cl, 'get_cl_statuses',
2772 lambda branches, fine_grained, max_processes:
2773 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2774 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2775 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2776
2777 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002778
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002779 def test_cmd_issue_erase_existing(self):
2780 out = StringIO.StringIO()
2781 self.mock(git_cl.sys, 'stdout', out)
2782 self.calls = [
2783 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002784 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2785 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002786 # Let this command raise exception (retcode=1) - it should be ignored.
2787 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002788 CERR1),
2789 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2790 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002791 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2792 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2793 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002794 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002795 ]
2796 self.assertEqual(0, git_cl.main(['issue', '0']))
2797
Aaron Gable400e9892017-07-12 15:31:21 -07002798 def test_cmd_issue_erase_existing_with_change_id(self):
2799 out = StringIO.StringIO()
2800 self.mock(git_cl.sys, 'stdout', out)
2801 self.mock(git_cl.Changelist, 'GetDescription',
2802 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2803 self.calls = [
2804 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2805 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2806 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002807 # Let this command raise exception (retcode=1) - it should be ignored.
2808 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2809 CERR1),
2810 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2811 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2812 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2813 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2814 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002815 ((['git', 'log', '-1', '--format=%B'],),
2816 'This is a description\n\nChange-Id: Ideadbeef'),
2817 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002818 ]
2819 self.assertEqual(0, git_cl.main(['issue', '0']))
2820
phajdan.jre328cf92016-08-22 04:12:17 -07002821 def test_cmd_issue_json(self):
2822 out = StringIO.StringIO()
2823 self.mock(git_cl.sys, 'stdout', out)
2824 self.calls = [
2825 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002826 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002827 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2828 ((['git', 'config', 'rietveld.server'],),
2829 'https://codereview.chromium.org'),
2830 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2831 (('write_json', 'output.json',
2832 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2833 ''),
2834 ]
2835 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2836
tandriide281ae2016-10-12 06:02:30 -07002837 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002838 self.mock(git_cl.Changelist, 'GetChange',
2839 lambda _, *a: (
2840 self._mocked_call(['GetChange']+list(a))))
2841 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2842 lambda *_, **__: (
2843 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002844 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2845 lambda _, s: self._mocked_call(['SetCQState', s]))
2846 self.calls = [
2847 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002848 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002849 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2850 ((['git', 'config', 'rietveld.server'],),
2851 'https://codereview.chromium.org'),
2852 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2853 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2854 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2855 ((['get_or_create_merge_base', 'feature', 'feature'],),
2856 'fake_ancestor_sha'),
2857 ((['GetChange', 'fake_ancestor_sha', None], ),
2858 git_cl.presubmit_support.GitChange(
2859 '', '', '', '', '', '', '', '')),
2860 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2861 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002862 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2863 ]
2864 out = StringIO.StringIO()
2865 self.mock(git_cl.sys, 'stdout', out)
2866 self.assertEqual(0, git_cl.main(['try']))
2867 self.assertEqual(
2868 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002869 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002870
tandrii8c5a3532016-11-04 07:52:02 -07002871 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2872 self.mock(git_cl.Changelist, 'GetChange',
2873 lambda _, *a: (
2874 self._mocked_call(['GetChange']+list(a))))
2875 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2876 lambda *_, **__: (
2877 self._mocked_call(['DoGetTryMasters'])))
2878 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2879 lambda _, s: self._mocked_call(['SetCQState', s]))
2880
tandrii8c5a3532016-11-04 07:52:02 -07002881 self.calls = [
2882 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2883 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2884 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2885 ((['git', 'config', 'branch.feature.gerritserver'],),
2886 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002887 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2888 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2889 'project': 'depot_tools',
2890 'status': 'OPEN',
2891 'owner': {'email': 'owner@e.mail'},
2892 'revisions': {
2893 'deadbeaf': {
2894 '_number': 6,
2895 },
2896 'beeeeeef': {
2897 '_number': 7,
2898 'fetch': {'http': {
2899 'url': 'https://chromium.googlesource.com/depot_tools',
2900 'ref': 'refs/changes/56/123456/7'
2901 }},
2902 },
2903 },
2904 }),
tandrii8c5a3532016-11-04 07:52:02 -07002905 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2906 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2907 ((['get_or_create_merge_base', 'feature', 'feature'],),
2908 'fake_ancestor_sha'),
2909 ((['GetChange', 'fake_ancestor_sha', None], ),
2910 git_cl.presubmit_support.GitChange(
2911 '', '', '', '', '', '', '', '')),
2912 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2913 ((['DoGetTryMasters'], ), None),
2914 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2915 ]
2916 out = StringIO.StringIO()
2917 self.mock(git_cl.sys, 'stdout', out)
2918 self.assertEqual(0, git_cl.main(['try']))
2919 self.assertEqual(
2920 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002921 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002922 'https://chromium-review.googlesource.com/123456\n')
2923
2924 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2925 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2926 lambda _: {
2927 'owner_email': 'owner@e.mail',
2928 'private': False,
2929 'closed': False,
2930 'project': 'depot_tools',
2931 'patchsets': [20001],
2932 })
tandriide281ae2016-10-12 06:02:30 -07002933 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2934 self.calls = [
2935 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2936 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2937 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2938 ((['git', 'config', 'rietveld.server'],),
2939 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002940 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002941 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002942 ]
2943
2944 def _buildbucket_retry(*_, **kw):
2945 # self.maxDiff = 10000
2946 body = json.loads(kw['body'])
2947 self.assertEqual(len(body['builds']), 1)
2948 build = body['builds'][0]
2949 params = json.loads(build.pop('parameters_json'))
2950 self.assertEqual(params, {
2951 u'builder_name': u'win',
2952 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2953 u'revision': None}],
2954 u'properties': {
2955 u'category': u'git_cl_try',
2956 u'issue': 123,
2957 u'key': u'val',
2958 u'json': [{u'a': 1}, None],
2959 u'master': u'tryserver.chromium',
2960 u'patch_project': u'depot_tools',
2961 u'patch_storage': u'rietveld',
2962 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002963 u'rietveld': u'https://codereview.chromium.org',
2964 }
2965 })
2966 self.assertEqual(build, {
2967 u'bucket': u'master.tryserver.chromium',
2968 u'client_operation_id': u'uuid4',
2969 u'tags': [u'builder:win',
2970 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002971 u'user_agent:git_cl_try',
2972 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002973 })
2974
2975 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2976
2977 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2978 self.assertEqual(0, git_cl.main([
2979 'try', '-m', 'tryserver.chromium', '-b', 'win',
2980 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2981 self.assertRegexpMatches(
2982 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002983 'Tried jobs on:\nBucket: master.tryserver.chromium')
2984
tandrii8c5a3532016-11-04 07:52:02 -07002985 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2986 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2987 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2988
tandrii8c5a3532016-11-04 07:52:02 -07002989 self.calls = [
2990 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2991 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2992 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2993 ((['git', 'config', 'branch.feature.gerritserver'],),
2994 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002995 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002996 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002997 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002998 'status': 'OPEN',
2999 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07003000 'revisions': {
3001 'deadbeaf': {
3002 '_number': 6,
3003 },
3004 'beeeeeef': {
3005 '_number': 7,
3006 'fetch': {'http': {
3007 'url': 'https://chromium.googlesource.com/depot_tools',
3008 'ref': 'refs/changes/56/123456/7'
3009 }},
3010 },
3011 },
3012 }),
3013 ]
3014
3015 def _buildbucket_retry(*_, **kw):
3016 # self.maxDiff = 10000
3017 body = json.loads(kw['body'])
3018 self.assertEqual(len(body['builds']), 1)
3019 build = body['builds'][0]
3020 params = json.loads(build.pop('parameters_json'))
3021 self.assertEqual(params, {
3022 u'builder_name': u'win',
3023 u'changes': [{u'author': {u'email': u'owner@e.mail'},
3024 u'revision': None}],
3025 u'properties': {
3026 u'category': u'git_cl_try',
3027 u'key': u'val',
3028 u'json': [{u'a': 1}, None],
3029 u'master': u'tryserver.chromium',
3030
3031 u'patch_gerrit_url':
3032 u'https://chromium-review.googlesource.com',
3033 u'patch_issue': 123456,
3034 u'patch_project': u'depot_tools',
3035 u'patch_ref': u'refs/changes/56/123456/7',
3036 u'patch_repository_url':
3037 u'https://chromium.googlesource.com/depot_tools',
3038 u'patch_set': 7,
3039 u'patch_storage': u'gerrit',
3040 }
3041 })
3042 self.assertEqual(build, {
3043 u'bucket': u'master.tryserver.chromium',
3044 u'client_operation_id': u'uuid4',
3045 u'tags': [
3046 u'builder:win',
3047 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
3048 u'user_agent:git_cl_try',
3049 u'master:tryserver.chromium'],
3050 })
3051
3052 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3053
3054 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3055 self.assertEqual(0, git_cl.main([
3056 'try', '-m', 'tryserver.chromium', '-b', 'win',
3057 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3058 self.assertRegexpMatches(
3059 git_cl.sys.stdout.getvalue(),
3060 'Tried jobs on:\nBucket: master.tryserver.chromium')
3061
borenet6c0efe62016-10-19 08:13:29 -07003062 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07003063 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
3064 lambda _: {
3065 'owner_email': 'owner@e.mail',
3066 'private': False,
3067 'closed': False,
3068 'project': 'depot_tools',
3069 'patchsets': [20001],
3070 })
borenet6c0efe62016-10-19 08:13:29 -07003071 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
3072 self.calls = [
3073 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3074 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3075 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3076 ((['git', 'config', 'rietveld.server'],),
3077 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07003078 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07003079 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07003080 ]
3081
3082 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07003083 body = json.loads(kw['body'])
3084 self.assertEqual(len(body['builds']), 1)
3085 build = body['builds'][0]
3086 params = json.loads(build.pop('parameters_json'))
3087 self.assertEqual(params, {
3088 u'builder_name': u'win',
3089 u'changes': [{u'author': {u'email': u'owner@e.mail'},
3090 u'revision': None}],
3091 u'properties': {
3092 u'category': u'git_cl_try',
3093 u'issue': 123,
3094 u'patch_project': u'depot_tools',
3095 u'patch_storage': u'rietveld',
3096 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07003097 u'rietveld': u'https://codereview.chromium.org',
3098 }
3099 })
3100 self.assertEqual(build, {
3101 u'bucket': u'test.bucket',
3102 u'client_operation_id': u'uuid4',
3103 u'tags': [u'builder:win',
3104 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
3105 u'user_agent:git_cl_try'],
3106 })
3107
3108 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3109
3110 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3111 self.assertEqual(0, git_cl.main([
3112 'try', '-B', 'test.bucket', '-b', 'win']))
3113 self.assertRegexpMatches(
3114 git_cl.sys.stdout.getvalue(),
3115 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07003116
qyearsley123a4682016-10-26 09:12:17 -07003117 def test_git_cl_try_bots_on_multiple_masters(self):
3118 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
3119 self.calls = [
3120 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3121 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3122 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3123 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07003124 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07003125 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
3126 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3127 ]
3128
3129 def _buildbucket_retry(*_, **kw):
3130 body = json.loads(kw['body'])
3131 self.assertEqual(len(body['builds']), 2)
3132
3133 first_build_params = json.loads(body['builds'][0]['parameters_json'])
3134 self.assertEqual(first_build_params['builder_name'], 'builder1')
3135 self.assertEqual(first_build_params['properties']['master'], 'master1')
3136
3137 first_build_params = json.loads(body['builds'][1]['parameters_json'])
3138 self.assertEqual(first_build_params['builder_name'], 'builder2')
3139 self.assertEqual(first_build_params['properties']['master'], 'master2')
3140
3141 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3142
3143 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
3144 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3145
3146 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3147 self.assertEqual(
3148 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3149 self.assertEqual(
3150 git_cl.sys.stdout.getvalue(),
3151 'Tried jobs on:\n'
3152 'Bucket: master.master1\n'
3153 ' builder1: []\n'
3154 'Bucket: master.master2\n'
3155 ' builder2: []\n'
3156 'To see results here, run: git cl try-results\n'
3157 'To see results in browser, run: git cl web\n')
3158
tandrii16e0b4e2016-06-07 10:34:28 -07003159 def _common_GerritCommitMsgHookCheck(self):
3160 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3161 self.mock(git_cl.os.path, 'abspath',
3162 lambda path: self._mocked_call(['abspath', path]))
3163 self.mock(git_cl.os.path, 'exists',
3164 lambda path: self._mocked_call(['exists', path]))
3165 self.mock(git_cl.gclient_utils, 'FileRead',
3166 lambda path: self._mocked_call(['FileRead', path]))
3167 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3168 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3169 self.calls = [
3170 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3171 ((['abspath', '../'],), '/abs/git_repo_root'),
3172 ]
3173 return git_cl.Changelist(codereview='gerrit', issue=123)
3174
3175 def test_GerritCommitMsgHookCheck_custom_hook(self):
3176 cl = self._common_GerritCommitMsgHookCheck()
3177 self.calls += [
3178 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3179 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3180 '#!/bin/sh\necho "custom hook"')
3181 ]
3182 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3183
3184 def test_GerritCommitMsgHookCheck_not_exists(self):
3185 cl = self._common_GerritCommitMsgHookCheck()
3186 self.calls += [
3187 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3188 ]
3189 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3190
3191 def test_GerritCommitMsgHookCheck(self):
3192 cl = self._common_GerritCommitMsgHookCheck()
3193 self.calls += [
3194 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3195 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3196 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003197 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003198 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3199 ''),
3200 ]
3201 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3202
tandriic4344b52016-08-29 06:04:54 -07003203 def test_GerritCmdLand(self):
3204 self.calls += [
3205 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3206 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3207 'deadbeaf'),
3208 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3209 ((['git', 'config', 'branch.feature.gerritserver'],),
3210 'chromium-review.googlesource.com'),
3211 ]
3212 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3213 cl._codereview_impl._GetChangeDetail = lambda _: {
3214 'labels': {},
3215 'current_revision': 'deadbeaf',
3216 }
agable32978d92016-11-01 12:55:02 -07003217 cl._codereview_impl._GetChangeCommit = lambda: {
3218 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003219 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003220 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3221 }
tandriic4344b52016-08-29 06:04:54 -07003222 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003223 out = StringIO.StringIO()
3224 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003225 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003226 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003227 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003228
tandrii221ab252016-10-06 08:12:04 -07003229 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08003230 '9000': {
3231 'id': '9000',
3232 'bucket': 'master.x.y',
3233 'created_by': 'user:someone@chromium.org',
3234 'created_ts': '147200002222000',
3235 'experimental': False,
3236 'parameters_json': json.dumps({
3237 'builder_name': 'my-bot',
3238 'properties': {'category': 'cq'},
3239 }),
3240 'status': 'STARTED',
3241 'tags': [
3242 'build_address:x.y/my-bot/2',
3243 'builder:my-bot',
3244 'experimental:false',
3245 'user_agent:cq',
3246 ],
3247 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3248 },
3249 '8000': {
3250 'id': '8000',
3251 'bucket': 'master.x.y',
3252 'created_by': 'user:someone@chromium.org',
3253 'created_ts': '147200001111000',
3254 'experimental': False,
3255 'failure_reason': 'BUILD_FAILURE',
3256 'parameters_json': json.dumps({
3257 'builder_name': 'my-bot',
3258 'properties': {'category': 'cq'},
3259 }),
3260 'result_details_json': json.dumps({
3261 'properties': {'buildnumber': 1},
3262 }),
3263 'result': 'FAILURE',
3264 'status': 'COMPLETED',
3265 'tags': [
3266 'build_address:x.y/my-bot/1',
3267 'builder:my-bot',
3268 'experimental:false',
3269 'user_agent:cq',
3270 ],
3271 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3272 },
3273 }
tandrii221ab252016-10-06 08:12:04 -07003274
3275 def test_write_try_results_json(self):
3276 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08003277 {
3278 'bucket': 'master.x.y',
3279 'buildbucket_id': '8000',
3280 'builder_name': 'my-bot',
3281 'created_ts': '147200001111000',
3282 'experimental': False,
3283 'failure_reason': 'BUILD_FAILURE',
3284 'result': 'FAILURE',
3285 'status': 'COMPLETED',
3286 'tags': [
3287 'build_address:x.y/my-bot/1',
3288 'builder:my-bot',
3289 'experimental:false',
3290 'user_agent:cq',
3291 ],
3292 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3293 },
3294 {
3295 'bucket': 'master.x.y',
3296 'buildbucket_id': '9000',
3297 'builder_name': 'my-bot',
3298 'created_ts': '147200002222000',
3299 'experimental': False,
3300 'failure_reason': None,
3301 'result': None,
3302 'status': 'STARTED',
3303 'tags': [
3304 'build_address:x.y/my-bot/2',
3305 'builder:my-bot',
3306 'experimental:false',
3307 'user_agent:cq',
3308 ],
3309 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3310 },
tandrii221ab252016-10-06 08:12:04 -07003311 ]
3312 self.calls = [(('write_json', 'output.json', expected_output), '')]
3313 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3314
tandrii45b2a582016-10-11 03:14:16 -07003315 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003316 out = StringIO.StringIO()
3317 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003318 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3319 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003320 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3321 self._mocked_call(['get_authenticator_for_host', host]))
3322 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3323 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003324
3325 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3326 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003327 self.calls += [
3328 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3329 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3330 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3331 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3332 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3333 ((['git', 'config', 'branch.feature.rietveldserver'],),
3334 'codereview.example.com'),
3335 ((['get_authenticator_for_host', 'codereview.example.com'],),
3336 AuthenticatorMock()),
3337 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3338
3339 def test_fetch_try_jobs_none_rietveld(self):
3340 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003341 # Simulate that user isn't logged in.
3342 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003343 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003344 self.assertRegexpMatches(sys.stdout.getvalue(),
3345 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003346 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3347
3348 def test_fetch_try_jobs_some_rietveld(self):
3349 self._setup_fetch_try_jobs_rietveld({
3350 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3351 })
3352 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003353 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3354 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3355 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3356
3357 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3358 self._setup_fetch_try_jobs(most_recent_patchset=13)
3359 self.calls += [
3360 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3361 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3362 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003363 # TODO(tandrii): Uncomment the below if we decide to support checking
3364 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003365 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003366 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003367 ((['git', 'config', 'branch.feature.gerritserver'],),
3368 'https://x-review.googlesource.com'),
3369 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3370 AuthenticatorMock()),
3371 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3372
3373 def test_fetch_try_jobs_none_gerrit(self):
3374 self._setup_fetch_try_jobs_gerrit({})
3375 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003376 # TODO(tandrii): Uncomment the below if we decide to support checking
3377 # patchsets for Gerrit.
3378 # self.assertRegexpMatches(
3379 # sys.stdout.getvalue(),
3380 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003381 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3382
3383 def test_fetch_try_jobs_some_gerrit(self):
3384 self._setup_fetch_try_jobs_gerrit({
3385 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3386 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003387 # TODO(tandrii): Uncomment the below if we decide to support checking
3388 # patchsets for Gerrit.
3389 # self.calls.remove(
3390 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003391 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3392
3393 # ... and doesn't result in warning.
3394 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3395 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003396 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3397 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3398
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003399 def _mock_gerrit_changes_for_detail_cache(self):
3400 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003401
3402 def test_gerrit_change_detail_cache_normalize(self):
3403 self._mock_gerrit_changes_for_detail_cache()
3404 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003405 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003406 ]
3407 cl = git_cl.Changelist(codereview='gerrit')
3408 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3409 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3410 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3411 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3412
3413 def test_gerrit_change_detail_cache_simple(self):
3414 self._mock_gerrit_changes_for_detail_cache()
3415 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003416 (('GetChangeDetail', 'host', '1', []), 'a'),
3417 (('GetChangeDetail', 'host', '2', []), 'b'),
3418 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003419 ]
3420 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3421 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3422 self.assertEqual(cl._GetChangeDetail(), 'a')
3423 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003424 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003425 self.assertEqual(cl._GetChangeDetail(), 'a')
3426 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3427
3428 def test_gerrit_change_detail_cache_options(self):
3429 self._mock_gerrit_changes_for_detail_cache()
3430 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003431 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3432 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3433 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3434 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003435 ]
3436 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3437 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3438 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3439 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3440 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3441 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3442 self.assertEqual(cl._GetChangeDetail(), 'cab')
3443
3444 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3445 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3446 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3447 self.assertEqual(cl._GetChangeDetail(), 'cab')
3448
3449 # Finally, no_cache should invalidate all caches for given change.
3450 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3451 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3452
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003453 def test_gerrit_description_caching(self):
3454 def gen_detail(rev, desc):
3455 return {
3456 'current_revision': rev,
3457 'revisions': {rev: {'commit': {'message': desc}}}
3458 }
3459 self.calls = [
3460 (('GetChangeDetail', 'host', '1',
3461 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3462 gen_detail('rev1', 'desc1')),
3463 (('GetChangeDetail', 'host', '1',
3464 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3465 gen_detail('rev2', 'desc2')),
3466 ]
3467
3468 self._mock_gerrit_changes_for_detail_cache()
3469 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3470 self.assertEqual(cl.GetDescription(), 'desc1')
3471 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3472 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003473
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003474 def test_print_current_creds(self):
3475 class CookiesAuthenticatorMock(object):
3476 def __init__(self):
3477 self.gitcookies = {
3478 'host.googlesource.com': ('user', 'pass'),
3479 'host-review.googlesource.com': ('user', 'pass'),
3480 }
3481 self.netrc = self
3482 self.netrc.hosts = {
3483 'github.com': ('user2', None, 'pass2'),
3484 'host2.googlesource.com': ('user3', None, 'pass'),
3485 }
3486 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3487 CookiesAuthenticatorMock)
3488 self.mock(sys, 'stdout', StringIO.StringIO())
3489 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3490 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3491 ' Host\t User\t Which file',
3492 '============================\t=====\t===========',
3493 'host-review.googlesource.com\t user\t.gitcookies',
3494 ' host.googlesource.com\t user\t.gitcookies',
3495 ' host2.googlesource.com\tuser3\t .netrc',
3496 ])
3497 sys.stdout.buf = ''
3498 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3499 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3500 ' Host\tUser\t Which file',
3501 '============================\t====\t===========',
3502 'host-review.googlesource.com\tuser\t.gitcookies',
3503 ' host.googlesource.com\tuser\t.gitcookies',
3504 ])
3505
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003506 def _common_creds_check_mocks(self):
3507 def exists_mock(path):
3508 dirname = os.path.dirname(path)
3509 if dirname == os.path.expanduser('~'):
3510 dirname = '~'
3511 base = os.path.basename(path)
3512 if base in ('.netrc', '.gitcookies'):
3513 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3514 # git cl also checks for existence other files not relevant to this test.
3515 return None
3516 self.mock(os.path, 'exists', exists_mock)
3517 self.mock(sys, 'stdout', StringIO.StringIO())
3518
3519 def test_creds_check_gitcookies_not_configured(self):
3520 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003521 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003522 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003523 self.calls = [
3524 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3525 (('os.path.exists', '~/.netrc'), True),
3526 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3527 'or Ctrl+C to abort'), ''),
3528 ((['git', 'config', '--global', 'http.cookiefile',
3529 os.path.expanduser('~/.gitcookies')], ), ''),
3530 ]
3531 self.assertEqual(0, git_cl.main(['creds-check']))
3532 self.assertRegexpMatches(
3533 sys.stdout.getvalue(),
3534 '^You seem to be using outdated .netrc for git credentials:')
3535 self.assertRegexpMatches(
3536 sys.stdout.getvalue(),
3537 '\nConfigured git to use .gitcookies from')
3538
3539 def test_creds_check_gitcookies_configured_custom_broken(self):
3540 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003541 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003542 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003543 self.calls = [
3544 ((['git', 'config', '--global', 'http.cookiefile'],),
3545 '/custom/.gitcookies'),
3546 (('os.path.exists', '/custom/.gitcookies'), False),
3547 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3548 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3549 ((['git', 'config', '--global', 'http.cookiefile',
3550 os.path.expanduser('~/.gitcookies')], ), ''),
3551 ]
3552 self.assertEqual(0, git_cl.main(['creds-check']))
3553 self.assertRegexpMatches(
3554 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003555 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003556 self.assertRegexpMatches(
3557 sys.stdout.getvalue(),
3558 'However, your configured .gitcookies file is missing.')
3559
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003560 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003561 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003562 lambda _, message, publish: self._mocked_call(
3563 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003564 self.calls = [
3565 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3566 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003567 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003568 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003569 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3570 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003571
3572 def test_git_cl_comment_add_gerrit(self):
3573 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003574 lambda host, change, msg, ready:
3575 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003576 self.calls = [
3577 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3578 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3579 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3580 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3581 'origin/master'),
3582 ((['git', 'config', 'remote.origin.url'],),
3583 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003584 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3585 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003586 ]
3587 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3588 '-a', 'msg']))
3589
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003590 def test_git_cl_comments_fetch_rietveld(self):
3591 self.mock(sys, 'stdout', StringIO.StringIO())
3592 self.calls = [
3593 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3594 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3595 ] * 2
3596 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3597 'messages': [
3598 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3599 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3600 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3601 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3602 # Intentionally wrong order here.
3603 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3604 'disapproval': False, 'approval': False,
3605 'sender': 'owner@example.com'},
3606 ],
3607 'owner_email': 'owner@example.com',
3608 })
3609 expected_comments_summary = [
3610 git_cl._CommentSummary(
3611 message='lgtm',
3612 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3613 disapproval=False, approval=True, sender='r@example.com'),
3614 git_cl._CommentSummary(
3615 message='not lgtm',
3616 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3617 disapproval=True, approval=False, sender='r2@example.com'),
3618 # Note: same order as in whatever Rietveld returns.
3619 git_cl._CommentSummary(
3620 message='PTAL',
3621 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3622 disapproval=False, approval=False, sender='owner@example.com'),
3623 ]
3624 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3625 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3626
3627 with git_cl.gclient_utils.temporary_directory() as tempdir:
3628 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3629 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3630 '-j', out_file]))
3631 with open(out_file) as f:
3632 read = json.load(f)
3633 self.assertEqual(len(read), 3)
3634 self.assertEqual(read[0], {
3635 'date': '2000-03-13 20:49:34.515270',
3636 'message': 'PTAL',
3637 'approval': False,
3638 'disapproval': False,
3639 'sender': 'owner@example.com'})
3640 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3641 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3642
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003643 def test_git_cl_comments_fetch_gerrit(self):
3644 self.mock(sys, 'stdout', StringIO.StringIO())
3645 self.calls = [
3646 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3647 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3648 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3649 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3650 'origin/master'),
3651 ((['git', 'config', 'remote.origin.url'],),
3652 'https://chromium.googlesource.com/infra/infra'),
3653 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3654 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003655 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003656 'messages': [
3657 {
3658 u'_revision_number': 1,
3659 u'author': {
3660 u'_account_id': 1111084,
3661 u'email': u'commit-bot@chromium.org',
3662 u'name': u'Commit Bot'
3663 },
3664 u'date': u'2017-03-15 20:08:45.000000000',
3665 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003666 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003667 u'tag': u'autogenerated:cq:dry-run'
3668 },
3669 {
3670 u'_revision_number': 2,
3671 u'author': {
3672 u'_account_id': 11151243,
3673 u'email': u'owner@example.com',
3674 u'name': u'owner'
3675 },
3676 u'date': u'2017-03-16 20:00:41.000000000',
3677 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3678 u'message': u'PTAL',
3679 },
3680 {
3681 u'_revision_number': 2,
3682 u'author': {
3683 u'_account_id': 148512 ,
3684 u'email': u'reviewer@example.com',
3685 u'name': u'reviewer'
3686 },
3687 u'date': u'2017-03-17 05:19:37.500000000',
3688 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3689 u'message': u'Patch Set 2: Code-Review+1',
3690 },
3691 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003692 }),
3693 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3694 '/COMMIT_MSG': [
3695 {
3696 'author': {'email': u'reviewer@example.com'},
3697 'updated': u'2017-03-17 05:19:37.500000000',
3698 'patch_set': 2,
3699 'side': 'REVISION',
3700 'message': 'Please include a bug link',
3701 },
3702 ],
3703 'codereview.settings': [
3704 {
3705 'author': {'email': u'owner@example.com'},
3706 'updated': u'2017-03-16 20:00:41.000000000',
3707 'patch_set': 2,
3708 'side': 'PARENT',
3709 'line': 42,
3710 'message': 'I removed this because it is bad',
3711 },
3712 ]
3713 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003714 ] * 2
3715 expected_comments_summary = [
3716 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003717 message=(
3718 u'PTAL\n' +
3719 u'\n' +
3720 u'codereview.settings\n' +
3721 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3722 u'c/1/2/codereview.settings#b42\n' +
3723 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003724 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3725 disapproval=False, approval=False, sender=u'owner@example.com'),
3726 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003727 message=(
3728 u'Patch Set 2: Code-Review+1\n' +
3729 u'\n' +
3730 u'/COMMIT_MSG\n' +
3731 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3732 u'c/1/2//COMMIT_MSG#\n' +
3733 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003734 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3735 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3736 ]
3737 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3738 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3739
3740 with git_cl.gclient_utils.temporary_directory() as tempdir:
3741 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3742 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3743 '-j', out_file]))
3744 with open(out_file) as f:
3745 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003746 self.assertEqual(len(read), 2)
3747 self.assertEqual(read[0], {
3748 u'date': u'2017-03-16 20:00:41.000000',
3749 u'message': (
3750 u'PTAL\n' +
3751 u'\n' +
3752 u'codereview.settings\n' +
3753 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3754 u'c/1/2/codereview.settings#b42\n' +
3755 u' I removed this because it is bad\n'),
3756 u'approval': False,
3757 u'disapproval': False,
3758 u'sender': u'owner@example.com'})
3759 self.assertEqual(read[1], {
3760 u'date': u'2017-03-17 05:19:37.500000',
3761 u'message': (
3762 u'Patch Set 2: Code-Review+1\n' +
3763 u'\n' +
3764 u'/COMMIT_MSG\n' +
3765 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3766 u'c/1/2//COMMIT_MSG#\n' +
3767 u' Please include a bug link\n'),
3768 u'approval': False,
3769 u'disapproval': False,
3770 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003771
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003772
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003773if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003774 logging.basicConfig(
3775 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003776 unittest.main()