blob: 7a634dd6cb41bc63ef67dba8e78a1b83e1abc174 [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'))
563 # Pathological: .period. can be either ldap OR domain, more likely domain.
564 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
565 ('note', 'period.example.com'))
566
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100567 def test_analysis_nothing(self):
568 self.c._all_hosts = []
569 self.assertFalse(self.c.has_generic_host())
570 self.assertEqual(set(), self.c.get_conflicting_hosts())
571 self.assertEqual(set(), self.c.get_duplicated_hosts())
572 self.assertEqual(set(), self.c.get_partially_configured_hosts())
573 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
574
575 def test_analysis(self):
576 self.mock_hosts_creds([
577 ('.googlesource.com', 'git-example.chromium.org'),
578
579 ('chromium', 'git-example.google.com'),
580 ('chromium-review', 'git-example.google.com'),
581 ('chrome-internal', 'git-example.chromium.org'),
582 ('chrome-internal-review', 'git-example.chromium.org'),
583 ('conflict', 'git-example.google.com'),
584 ('conflict-review', 'git-example.chromium.org'),
585 ('dup', 'git-example.google.com'),
586 ('dup', 'git-example.google.com'),
587 ('dup-review', 'git-example.google.com'),
588 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200589 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100590 ])
591 self.assertTrue(self.c.has_generic_host())
592 self.assertEqual(set(['conflict.googlesource.com']),
593 self.c.get_conflicting_hosts())
594 self.assertEqual(set(['dup.googlesource.com']),
595 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200596 self.assertEqual(set(['partial.googlesource.com',
597 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100598 self.c.get_partially_configured_hosts())
599 self.assertEqual(set(['chromium.googlesource.com',
600 'chrome-internal.googlesource.com']),
601 self.c.get_hosts_with_wrong_identities())
602
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100603 def test_report_no_problems(self):
604 self.test_analysis_nothing()
605 self.mock(sys, 'stdout', StringIO.StringIO())
606 self.assertFalse(self.c.find_and_report_problems())
607 self.assertEqual(sys.stdout.getvalue(), '')
608
609 def test_report(self):
610 self.test_analysis()
611 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200612 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
613 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100614 self.assertTrue(self.c.find_and_report_problems())
615 with open(os.path.join(os.path.dirname(__file__),
616 'git_cl_creds_check_report.txt')) as f:
617 expected = f.read()
618 def by_line(text):
619 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200620 self.maxDiff = 10000
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200621 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100622
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800623
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000624class TestGitCl(TestCase):
625 def setUp(self):
626 super(TestGitCl, self).setUp()
627 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700628 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000629 self.mock(subprocess2, 'call', self._mocked_call)
630 self.mock(subprocess2, 'check_call', self._mocked_call)
631 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700632 self.mock(subprocess2, 'communicate',
633 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000634 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000635 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000636 self.mock(git_common, 'get_or_create_merge_base',
637 lambda *a: (
638 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000639 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000640 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100641 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
642 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700643 self.mock(git_cl, 'write_json', lambda path, contents:
644 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000645 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000646 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000647 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700648 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
649 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000650 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000652 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100653 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
654 lambda *args, **kwargs: self._mocked_call(
655 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700656 self.mock(git_cl.gerrit_util, 'GetChangeComments',
657 lambda *args, **kwargs: self._mocked_call(
658 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100659 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700660 lambda h, i, reviewers, ccs, notify: self._mocked_call(
661 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700662 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700663 lambda h, i, msg=None, labels=None, notify=None:
664 self._mocked_call('SetReview', h, i, msg, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000665 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
666 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700667 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100668 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000669 # It's important to reset settings to not have inter-tests interference.
670 git_cl.settings = None
671
672 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000673 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100674 self.assertEquals([], self.calls)
675 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000676 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100677 raise
678 # Sadly, has_failed() returns True if this OR any other tests before this
679 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200680 git_cl.logging.error(
681 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100682 'There are un-consumed self.calls after this test has finished.\n'
683 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700684 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200685 'If you are already running only this test, then **first** fix the '
686 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100687 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700688 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100689 'and follow instructions above.\n' +
690 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000691 finally:
692 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000693
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000694 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000695 self.assertTrue(
696 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700697 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000698 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000699 expected_args, result = top
700
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000701 # Also logs otherwise it could get caught in a try/finally and be hard to
702 # diagnose.
703 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700704 N = 5
705 prior_calls = '\n '.join(
706 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
707 for i, c in enumerate(self._calls_done[-N:]))
708 following_calls = '\n '.join(
709 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
710 for i, c in enumerate(self.calls[:N]))
711 extended_msg = (
712 'A few prior calls:\n %s\n\n'
713 'This (expected):\n @%d: %r\n'
714 'This (actual):\n @%d: %r\n\n'
715 'A few following expected calls:\n %s' %
716 (prior_calls, len(self._calls_done), expected_args,
717 len(self._calls_done), args, following_calls))
718 git_cl.logging.error(extended_msg)
719
tandrii99a72f22016-08-17 14:33:24 -0700720 self.fail('@%d\n'
721 ' Expected: %r\n'
722 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700723 len(self._calls_done), expected_args, args))
724
725 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700726 if isinstance(result, Exception):
727 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000728 return result
729
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100730 def test_ask_for_explicit_yes_true(self):
731 self.calls = [
732 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
733 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
734 ]
735 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
736
tandrii48df5812016-10-17 03:55:37 -0700737 def test_LoadCodereviewSettingsFromFile_gerrit(self):
738 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
739 self.calls = [
740 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
741 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
742 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
743 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
744 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
745 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700746 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
747 CERR1),
748 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700749 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
750 CERR1),
751 ((['git', 'config', 'gerrit.host', 'true'],), ''),
752 ]
753 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
754
maruel@chromium.orga3353652011-11-30 14:26:57 +0000755 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000756 def _is_gerrit_calls(cls, gerrit=False):
757 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
758 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
759
760 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000761 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200762 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000763 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000764
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000765 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200766 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
767 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
768 ((['git', 'config', 'core.editor'],), ''),
769 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000770
771 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200772 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000773 if similarity is None:
774 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700775 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700776 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000777 else:
tandrii33a46ff2016-08-23 05:53:40 -0700778 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700779 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000780
781 if find_copies is None:
782 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700783 find_copies_call = ((['git', 'config', '--bool',
784 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000785 else:
tandrii5d48c322016-08-18 16:19:37 -0700786 val = str(find_copies).lower()
787 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000788 'branch.master.git-find-copies', val],), '')
789
790 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000791 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800792 '-l100000', '-C'+similarity,
793 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000794 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000795 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000796 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000797
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000798 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000799 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000800 similarity_call,
801 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
802 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000803 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000804 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700805 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
806 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000807 ((['git', 'config', 'rietveld.server'],),
808 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000809 ((['git', 'config', 'branch.master.merge'],), 'master'),
810 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000811 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000812 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000813 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000814 ((['git', 'rev-parse', '--show-cdup'],), ''),
815 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Robbie Iannucci6aaee302017-12-12 02:15:11 +0000816 ((['git', 'diff', '--name-status', '--no-renames', '-r',
817 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000818 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700819 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000820 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000821 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000822 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000823 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000824 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000825 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000826 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000827 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700828 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000829 ]
830
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000831 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000832 def _git_upload_calls(cls, private):
833 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000834 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000835 private_call = []
836 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000837 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000838 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000839 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000840
maruel@chromium.orga3353652011-11-30 14:26:57 +0000841 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000842 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000843 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000844 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800845 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000846 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700847 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000848 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000849 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000850 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700851 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000852 ] + cls._git_post_upload_calls()
853
854 @classmethod
855 def _git_post_upload_calls(cls):
856 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000857 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
858 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
859 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000860 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000861 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000862 ]
863
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000864 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000865 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000866 fake_ancestor = 'fake_ancestor'
867 fake_cl = 'fake_cl_for_patch'
868 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000869 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000870 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000871 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000872 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000873 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000874 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000875 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000876 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700877 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000878 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000879 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000880 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000881 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000882 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000883 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000884 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000885 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000886 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000887 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000888 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000889
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000890 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700891 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000892 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000893 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800894 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000895 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000896 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800897 '--cc',
898 ','.join(
899 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
900 cc),
901 ] + (['--private']
902 if private else []) + ['--git_similarity', similarity or '50'] + (
903 ['--git_no_find_copies']
904 if find_copies is False else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000905
906 def _run_reviewer_test(
907 self,
908 upload_args,
909 expected_description,
910 returned_description,
911 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000912 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700913 private=False,
914 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000915 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000916 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000917 try:
918 similarity = upload_args[upload_args.index('--similarity')+1]
919 except ValueError:
920 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000921
922 if '--find-copies' in upload_args:
923 find_copies = True
924 elif '--no-find-copies' in upload_args:
925 find_copies = False
926 else:
927 find_copies = None
928
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000929 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700930 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000931
932 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000933
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000934 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000935 self.assertEquals(
936 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000937 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000938 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000939 '#--------------------This line is 72 characters long'
940 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000941 expected_description,
942 desc)
943 return returned_description
944 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000945
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000946 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000947 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700948 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000949 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950 return 1, 2
951 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000952
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000953 git_cl.main(['upload'] + upload_args)
954
955 def test_no_reviewer(self):
956 self._run_reviewer_test(
957 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000958 'desc\n\nBUG=',
959 '# Blah blah comment.\ndesc\n\nBUG=',
960 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000961 [])
962
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000963 def test_keep_similarity(self):
964 self._run_reviewer_test(
965 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000966 'desc\n\nBUG=',
967 '# Blah blah comment.\ndesc\n\nBUG=',
968 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000969 [])
970
iannucci@chromium.org79540052012-10-19 23:15:26 +0000971 def test_keep_find_copies(self):
972 self._run_reviewer_test(
973 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000974 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000975 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000976 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000977 [])
978
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000979 def test_private(self):
980 self._run_reviewer_test(
981 ['--private'],
982 'desc\n\nBUG=',
983 '# Blah blah comment.\ndesc\n\nBUG=\n',
984 'desc\n\nBUG=',
985 [])
986
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000987 def test_reviewers_cmd_line(self):
988 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000989 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000990 self._run_reviewer_test(
991 ['-r' 'foo@example.com'],
992 description,
993 '\n%s\n' % description,
994 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000995 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000996
997 def test_reviewer_tbr_overriden(self):
998 # Reviewer is overriden with TBR
999 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001000 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001001 self._run_reviewer_test(
1002 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001003 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001004 description.strip('\n'),
1005 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001006 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001007
1008 def test_reviewer_multiple(self):
1009 # Handles multiple R= or TBR= lines.
1010 description = (
bradnelsond975b302016-10-23 12:20:23 -07001011 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1012 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001013 self._run_reviewer_test(
1014 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001015 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001016 description,
1017 description,
bradnelsond975b302016-10-23 12:20:23 -07001018 ['--reviewers=another@example.com,reviewer@example.com'],
1019 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001020
maruel@chromium.orga3353652011-11-30 14:26:57 +00001021 def test_reviewer_send_mail(self):
1022 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001023 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +00001024 self._run_reviewer_test(
1025 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001026 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +00001027 description.strip('\n'),
1028 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001029 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +00001030
1031 def test_reviewer_send_mail_no_rev(self):
1032 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001033 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +02001034 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -07001035 ((['DieWithError', 'Must specify reviewers to send email.'],),
1036 SystemExitMock())
1037 ]
1038
1039 def RunEditor(desc, _, **kwargs):
1040 return desc
1041 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1042 self.mock(sys, 'stdout', stdout)
1043 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001044 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001045 self.assertEqual(
1046 '=====================================\n'
1047 'NOTICE: Rietveld is being deprecated. '
1048 'You can upload changes to Gerrit with\n'
1049 ' git cl upload --gerrit\n'
1050 'or set Gerrit to be your default code review tool with\n'
1051 ' git config gerrit.host true\n'
1052 '=====================================\n',
1053 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001054
tandriif9aefb72016-07-01 09:06:51 -07001055 def test_bug_on_cmd(self):
1056 self._run_reviewer_test(
1057 ['--bug=500658,proj:123'],
1058 'desc\n\nBUG=500658\nBUG=proj:123',
1059 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1060 'desc\n\nBUG=500658\nBUG=proj:1234',
1061 [])
1062
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001063 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1064 parent_msg=None,
1065 new_msg=None,
1066 fail_after_parent_msg=False,
1067 fail_cherry_pick=False,
1068 fail_push_count=0,
1069 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001070 if debug:
1071 # Very useful due to finally clause in git cl land raising exceptions and
1072 # shadowing real cause of failure.
1073 self.mock(git_cl, '_IS_BEING_TESTED', True)
1074 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001075 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001076
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001077 if git_numberer_enabled:
1078 # Special mocks to check validity of timestamp.
1079 original_git_amend_head = git_cl._git_amend_head
1080 def _git_amend_head_mock(msg, tstamp):
1081 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1082 return original_git_amend_head(msg, tstamp)
1083 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1084
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001085 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1086 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001087 self.mock(RietveldMock, 'update_description', staticmethod(
1088 lambda i, d: self._mocked_call(['update_description', i, d])))
1089 self.mock(RietveldMock, 'add_comment', staticmethod(
1090 lambda i, c: self._mocked_call(['add_comment', i, c])))
1091 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001092 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1093 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1094 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1095 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1096 CERR1),
1097 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1098 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001099 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001100 ((['git', 'config', 'rietveld.server'],),
1101 'https://codereview.chromium.org'),
1102 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1103 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1104 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1105 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001106 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1107 ''), # No commits to rebase, according to local view of origin.
1108 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1109 'fake_ancestor_sha'),
1110 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1111 ((['git', 'rev-parse', '--show-cdup'],), ''),
1112 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
Robbie Iannucci6aaee302017-12-12 02:15:11 +00001113 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1114 'fake_ancestor_sha...', '.'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001115 'M\tfile1.cpp'),
1116 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1117 ((['git', 'config', 'branch.feature.rietveldserver'],),
1118 'https://codereview.chromium.org'),
1119 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1120 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1121 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1122 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001123 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001124 # file1.cpp | 53 ++++++--
1125 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1126 ''),
1127 ((['git', 'show-ref', '--quiet', '--verify',
1128 'refs/heads/git-cl-commit'],),
1129 ''), # 0 return code means branch exists.
1130 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1131 ((['git', 'show-ref', '--quiet', '--verify',
1132 'refs/heads/git-cl-cherry-pick'],),
1133 CERR1), # This means git-cl-cherry-pick branch does not exist.
1134 ((['git', 'rev-parse', '--show-cdup'],), ''),
1135 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1136 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1137 ((['git', 'commit', '-m',
1138 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001139 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001140 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1141 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1142 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001143 repo_url),
1144
1145 ((['git', 'config', 'remote.origin.url'],), repo_url),
1146 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1147 git_numberer_enabled),
1148
1149 # Auto-rebase init.
1150 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1151 ]
1152 # Auto-rebase loops.
1153 for attempt in xrange(fail_push_count + 1):
1154 self.calls += [
1155 # Auto-rebase loop start.
1156 ((['git', 'retry', 'fetch', 'origin',
1157 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1158 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1159 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1160 # different in each loop iteration for truly realistic test.
1161 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1162 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1163 callError(1, 'failed to cherry pick') if fail_cherry_pick
1164 else ''),
1165 ]
1166 if fail_cherry_pick:
1167 return
1168
1169 if git_numberer_enabled:
1170 assert parent_msg
1171 self.calls += [
1172 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1173 parent_msg),
1174 ]
1175 if fail_after_parent_msg:
1176 return
1177 assert new_msg
1178 self.calls += [
1179 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1180 '1480022355'), # Committer's unix timestamp.
1181 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1182 '1480024000'),
1183 ((['git_amend_head committer timestamp', 1480024000],), ''),
1184 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1185 ]
1186 self.calls += [
1187 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1188 CERR1 if attempt < fail_push_count else ''),
1189 ]
1190 # End of autorebase + push.
1191
1192 self.calls += [
1193 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1194 ]
1195 if git_numberer_enabled:
1196 self.calls += [
1197 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1198 ]
1199
1200 # Cleanup calls.
1201 self.calls += [
1202 ((['git', 'checkout', '-q', 'feature'],), ''),
1203 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1204 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001205 ]
1206
1207 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001208 self._land_rietveld_calls(
1209 repo_url='https://chromium.googlesource.com/infra/infra',
1210 git_numberer_enabled=False,
1211 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001212 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001213 ((['git', 'config', 'rietveld.viewvc-url'],),
1214 'https://chromium.googlesource.com/infra/infra/+/'),
1215 ((['update_description', 123,
1216 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001217 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001218 ''),
1219 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001220 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001221 ]
1222 git_cl.main(['land'])
1223
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001224 def test_land_rietveld_fail_cherry_pick(self):
1225 self._land_rietveld_calls(
1226 repo_url='https://chromium.googlesource.com/infra/infra',
1227 git_numberer_enabled=False,
1228 fail_cherry_pick=True,
1229 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001230 self.calls += [
Robbie Iannucci6aaee302017-12-12 02:15:11 +00001231 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001232 'U path/file1\n'
1233 'U file2.cpp\n'),
1234 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001235 ((['git', 'checkout', '-q', 'feature'],), ''),
1236 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001237 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1238 ]
1239 git_cl.main(['land'])
1240
1241 def test_land_rietveld_git_numberer_fail_1_push(self):
1242 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1243
1244 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1245 self._land_rietveld_calls(
1246 repo_url='https://chromium.googlesource.com/chromium/src',
1247 git_numberer_enabled=True,
1248 parent_msg=('This is parent commit.\n'
1249 '\n'
1250 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1251 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1252 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1253 '\n'
1254 'Review-Url: https://codereview.chromium.org/123 .\n'
1255 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1256 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1257 fail_push_count=fail_push_count,
1258 debug=False)
1259
1260 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001261 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001262 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001263 ((['update_description', 123,
1264 'Issue: 123\n\nR=john@chromium.org\n'
1265 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001266 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001267 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1268 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1269 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001270 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001271 ''),
1272 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001273 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001274 ]
1275 git_cl.main(['land'])
1276
1277 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001278 self._land_rietveld_calls(
1279 repo_url='https://chromium.googlesource.com/v8/v8',
1280 git_numberer_enabled=True,
1281 parent_msg='This is parent commit with no footer.',
1282 fail_after_parent_msg=True,
1283 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001284 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001285 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001286 ((['git', 'checkout', '-q', 'feature'],), ''),
1287 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001288 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001289 ]
1290 with self.assertRaises(ValueError) as cm:
1291 git_cl.main(['land'])
1292 self.assertEqual(cm.exception.message,
1293 'Unable to infer commit position from footers')
1294
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001295 def test_git_numberer_not_whitelisted_repo(self):
1296 self.calls = []
1297 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001298 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1299 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001300 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001301
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001302 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001303 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1304 self.calls = [
1305 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001306 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001307 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001308 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001309 remote_url='https://chromium.googlesource.com/chromium/src',
1310 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001311 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001312
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001313 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001314 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001315 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001316 def fake_temporary_directory(**kwargs):
1317 yield tempdir
1318 self.mock(git_cl.gclient_utils, 'temporary_directory',
1319 fake_temporary_directory)
1320 self._test_GitNumbererState_valid_configs_inner(tempdir)
1321
1322 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001323 self.calls = [
1324 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001325 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001326 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1327 '''
1328 [plugin "git-numberer"]
1329 validate-enabled-refglob = refs/else/*
1330 validate-enabled-refglob = refs/heads/*
1331 validate-disabled-refglob = refs/heads/disabled
1332 validate-disabled-refglob = refs/branch-heads/*
1333 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001334 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1335 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001336 'refs/else/*\n'
1337 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001338 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1339 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001340 'refs/heads/disabled\n'
1341 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001342 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001343
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001344 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001345 remote_url='https://chromium.googlesource.com/chromium/src',
1346 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001347 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001348
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001349 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001350 remote_url='https://chromium.googlesource.com/chromium/src',
1351 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001352 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001353
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001354 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001355 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001356 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001357 remote_url='https://chromium.googlesource.com/chromium/src',
1358 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001359 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001360
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001361 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001362 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001363 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001364 if skip_auth_check:
1365 return [((cmd, ), 'true')]
1366
tandrii5d48c322016-08-18 16:19:37 -07001367 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001368 if issue:
1369 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001370 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001371 ])
1372 calls.extend([
1373 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1374 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1375 ((['git', 'config', 'remote.origin.url'],),
1376 'https://chromium.googlesource.com/my/repo'),
1377 ((['git', 'config', 'remote.origin.url'],),
1378 'https://chromium.googlesource.com/my/repo'),
1379 ])
1380 return calls
1381
1382 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001383 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001384 fetched_status=None, other_cl_owner=None,
1385 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001386 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001387 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1388 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1389 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1390 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001391 ]
1392 calls += cls._is_gerrit_calls(True)
1393 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001394 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1395 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1396 ((['git', 'config', 'branch.master.gerritissue'],),
1397 CERR1 if issue is None else str(issue)),
1398 ]
1399
1400 if custom_cl_base:
1401 ancestor_revision = custom_cl_base
1402 else:
1403 # Determine ancestor_revision to be merge base.
1404 ancestor_revision = 'fake_ancestor_sha'
1405 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001406 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001407 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001408 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001409 'refs/remotes/origin/master'],), ancestor_revision),
1410 ]
1411
1412 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001413 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1414
1415 if issue:
1416 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001417 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001418 '123456',
1419 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001420 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001421 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001422 'change_id': '123456789',
1423 'current_revision': 'sha1_of_current_revision',
1424 'revisions': { 'sha1_of_current_revision': {
1425 'commit': {'message': fetched_description},
1426 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001427 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001428 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001429 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001430 if fetched_status == 'ABANDONED':
1431 calls += [
1432 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1433 '123456 has been abandoned, new uploads are not '
1434 'allowed'), SystemExitMock()),
1435 ]
1436 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001437 if other_cl_owner:
1438 calls += [
1439 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1440 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001441
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001442 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1443 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001444 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001445 ((['git', 'rev-parse', '--show-cdup'],), ''),
1446 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001447
Robbie Iannucci6aaee302017-12-12 02:15:11 +00001448 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1449 ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001450 'M\t.gitignore\n'),
1451 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001452 ]
1453
1454 if not issue:
1455 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001456 ((['git', 'log', '--pretty=format:%s%n%n%b',
1457 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001458 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001459 ]
1460
1461 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001462 ((['git', 'config', 'user.email'],), 'me@example.com'),
1463 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1464 ([custom_cl_base] if custom_cl_base else
1465 [ancestor_revision, 'HEAD']),),
1466 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001467 ]
1468 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001469
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001470 @classmethod
1471 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001472 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001473 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001474 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001475 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001476 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001477 if post_amend_description is None:
1478 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001479 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001480 # Determined in `_gerrit_base_calls`.
1481 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1482
1483 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001484
tandriia60502f2016-06-20 02:01:53 -07001485 if squash_mode == 'default':
1486 calls.extend([
1487 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1488 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1489 ])
1490 elif squash_mode in ('override_squash', 'override_nosquash'):
1491 calls.extend([
1492 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1493 'true' if squash_mode == 'override_squash' else 'false'),
1494 ])
1495 else:
1496 assert squash_mode in ('squash', 'nosquash')
1497
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001498 # If issue is given, then description is fetched from Gerrit instead.
1499 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001500 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001501 ((['git', 'log', '--pretty=format:%s\n\n%b',
1502 ((custom_cl_base + '..') if custom_cl_base else
1503 'fake_ancestor_sha..HEAD')],),
1504 description),
1505 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001506 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001507 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001508 else:
1509 if not title:
1510 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001511 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1512 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001513 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001514 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001515 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001516 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001517 (('DownloadGerritHook', False), ''),
1518 # Amending of commit message to get the Change-Id.
1519 ((['git', 'log', '--pretty=format:%s\n\n%b',
1520 determined_ancestor_revision + '..HEAD'],),
1521 description),
1522 ((['git', 'commit', '--amend', '-m', description],), ''),
1523 ((['git', 'log', '--pretty=format:%s\n\n%b',
1524 determined_ancestor_revision + '..HEAD'],),
1525 post_amend_description)
1526 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001527 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001528 if not issue:
1529 # Prompting to edit description on first upload.
1530 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001531 ((['git', 'config', 'core.editor'],), ''),
1532 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001533 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001534 ref_to_push = 'abcdef0123456789'
1535 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001536 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1537 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1538 ]
1539
1540 if custom_cl_base is None:
1541 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001542 ((['get_or_create_merge_base', 'master',
1543 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001544 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001545 ]
1546 parent = 'origin/master'
1547 else:
1548 calls += [
1549 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1550 'refs/remotes/origin/master'],),
1551 callError(1)), # Means not ancenstor.
1552 (('ask_for_data',
1553 'Do you take responsibility for cleaning up potential mess '
1554 'resulting from proceeding with upload? Press Enter to upload, '
1555 'or Ctrl+C to abort'), ''),
1556 ]
1557 parent = custom_cl_base
1558
1559 calls += [
1560 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1561 '0123456789abcdef'),
1562 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001563 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001564 ref_to_push),
1565 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001566 else:
1567 ref_to_push = 'HEAD'
1568
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001569 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001570 ((['git', 'rev-list',
1571 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1572 ref_to_push],),
1573 '1hashPerLine\n'),
1574 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001575
Aaron Gableafd52772017-06-27 16:40:10 -07001576 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001577 ref_suffix = '%ready,notify=ALL'
1578 else:
1579 if not issue:
1580 ref_suffix = '%wip'
1581 else:
1582 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001583
Aaron Gable70f4e242017-06-26 10:45:59 -07001584 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001585 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001586
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001587 if git_mirror is None:
1588 calls += [
1589 ((['git', 'config', 'remote.origin.url'],),
1590 'https://chromium.googlesource.com/yyy/zzz'),
1591 ]
1592 else:
1593 calls += [
1594 ((['git', 'config', 'remote.origin.url'],),
1595 '/cache/this-dir-exists'),
1596 (('os.path.isdir', '/cache/this-dir-exists'),
1597 True),
1598 # Runs in /cache/this-dir-exists.
1599 ((['git', 'config', 'remote.origin.url'],),
1600 'https://chromium.googlesource.com/yyy/zzz'),
1601 ]
1602
ukai@chromium.orge8077812012-02-03 03:41:46 +00001603 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001604 ((['git', 'push',
1605 'https://chromium.googlesource.com/yyy/zzz',
1606 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001607 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001608 'remote: Processing changes: (\)\n'
1609 'remote: Processing changes: (|)\n'
1610 'remote: Processing changes: (/)\n'
1611 'remote: Processing changes: (-)\n'
1612 'remote: Processing changes: new: 1 (/)\n'
1613 'remote: Processing changes: new: 1, done\n'
1614 'remote:\n'
1615 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001616 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1617 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001618 'remote:\n'
1619 'To https://chromium.googlesource.com/yyy/zzz\n'
1620 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001621 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001622 if squash:
1623 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001624 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001625 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001626 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001627 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001628 ((['git', 'config', 'branch.master.gerritsquashhash',
1629 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001630 ]
tandrii88189772016-09-29 04:29:57 -07001631 calls += [
1632 ((['git', 'config', 'rietveld.cc'],), ''),
Daniel Cheng7227d212017-11-17 08:12:37 -08001633 (('AddReviewers', 'chromium-review.googlesource.com', 123456
1634 if squash else None, sorted(reviewers),
1635 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1636 cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001637 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001638 if tbr:
1639 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001640 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1641 ['LABELS']), {
1642 'labels': {
1643 'Code-Review': {
1644 'default_value': 0,
1645 'all': [],
1646 'values': {
1647 '+2': 'lgtm, approved',
1648 '+1': 'lgtm, but someone else must approve',
1649 ' 0': 'No score',
1650 '-1': 'Don\'t submit as-is',
1651 }
1652 }
1653 }
1654 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001655 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001656 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001657 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001658 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001659 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001660 return calls
1661
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001662 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001663 self,
1664 upload_args,
1665 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001666 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001667 squash=True,
1668 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001669 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001670 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001671 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001672 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001673 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001674 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001675 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001676 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001677 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001678 custom_cl_base=None,
1679 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001680 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001681 if squash_mode is None:
1682 if '--no-squash' in upload_args:
1683 squash_mode = 'nosquash'
1684 elif '--squash' in upload_args:
1685 squash_mode = 'squash'
1686 else:
1687 squash_mode = 'default'
1688
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001689 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001690 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001691 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001692 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001693 CookiesAuthenticatorMockFactory(
1694 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001695 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1696 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001697 self.mock(git_cl.gclient_utils, 'RunEditor',
1698 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001699 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1700 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001701
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001702 original_os_path_isdir = os.path.isdir
1703 def selective_os_path_isdir_mock(path):
1704 if path == '/cache/this-dir-exists':
1705 return self._mocked_call('os.path.isdir', path)
1706 return original_os_path_isdir(path)
1707 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1708
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001709 self.calls = self._gerrit_base_calls(
1710 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001711 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001712 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001713 other_cl_owner=other_cl_owner,
1714 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001715 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001716 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1717 expected_content=description))
1718 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001719 self.calls += self._gerrit_upload_calls(
1720 description, reviewers, squash,
1721 squash_mode=squash_mode,
1722 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001723 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001724 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001725 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001726 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001727 # Uncomment when debugging.
1728 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001729 git_cl.main(['upload'] + upload_args)
1730
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001731 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001732 self._run_gerrit_upload_test(
1733 ['--no-squash'],
1734 'desc\n\nBUG=\n',
1735 [],
1736 squash=False,
1737 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1738
1739 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001740 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001741 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001742 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001743 [],
tandriia60502f2016-06-20 02:01:53 -07001744 squash=False,
1745 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001746 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001747
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001748 def test_gerrit_no_reviewer(self):
1749 self._run_gerrit_upload_test(
1750 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001751 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001752 [],
1753 squash=False,
1754 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001755
Nick Carter8692b182017-11-06 16:30:38 -08001756 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001757 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1758 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001759 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001760 'desc\n\nBUG=\n\nChange-Id: I123456789',
1761 squash=False,
1762 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001763 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001764
ukai@chromium.orge8077812012-02-03 03:41:46 +00001765 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001766 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001767 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001768 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001769 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001770 squash=False,
1771 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001772 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001773
1774 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001775 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001776 [],
bradnelsond975b302016-10-23 12:20:23 -07001777 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1778 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001779 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001780 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001781 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001782 cc=['more@example.com', 'people@example.com'],
1783 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001784
1785 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001786 self._run_gerrit_upload_test(
1787 [],
1788 'desc\nBUG=\n\nChange-Id: 123456789',
1789 [],
1790 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001791
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001792 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001793 self._run_gerrit_upload_test(
1794 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001795 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001796 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001797 squash=True,
1798 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001799
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001800 def test_gerrit_upload_squash_first_against_rev(self):
1801 custom_cl_base = 'custom_cl_base_rev_or_branch'
1802 self._run_gerrit_upload_test(
1803 ['--squash', custom_cl_base],
1804 'desc\nBUG=\n\nChange-Id: 123456789',
1805 [],
1806 squash=True,
1807 expected_upstream_ref='origin/master',
1808 custom_cl_base=custom_cl_base)
1809 self.assertIn(
1810 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1811 sys.stdout.getvalue())
1812
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001813 def test_gerrit_upload_squash_first_with_mirror(self):
1814 self._run_gerrit_upload_test(
1815 ['--squash'],
1816 'desc\nBUG=\n\nChange-Id: 123456789',
1817 [],
1818 squash=True,
1819 expected_upstream_ref='origin/master',
1820 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1821
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001822 def test_gerrit_upload_squash_reupload(self):
1823 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001824 self._run_gerrit_upload_test(
1825 ['--squash'],
1826 description,
1827 [],
1828 squash=True,
1829 expected_upstream_ref='origin/master',
1830 issue=123456)
1831
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001832 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1833 self.mock(git_cl, 'DieWithError',
1834 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1835 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1836 with self.assertRaises(SystemExitMock):
1837 self._run_gerrit_upload_test(
1838 ['--squash'],
1839 description,
1840 [],
1841 squash=True,
1842 expected_upstream_ref='origin/master',
1843 issue=123456,
1844 fetched_status='ABANDONED')
1845
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001846 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1847 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1848 lambda *_, **__: {'email': 'yet-another@example.com'})
1849 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1850 self._run_gerrit_upload_test(
1851 ['--squash'],
1852 description,
1853 [],
1854 squash=True,
1855 expected_upstream_ref='origin/master',
1856 issue=123456,
1857 other_cl_owner='other@example.com')
1858 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001859 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001860 'authenticate to Gerrit as yet-another@example.com.\n'
1861 'Uploading may fail due to lack of permissions',
1862 git_cl.sys.stdout.getvalue())
1863
rmistry@google.com2dd99862015-06-22 12:22:18 +00001864 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001865 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001866 def mock_run_git(*args, **_kwargs):
1867 if args[0] == ['for-each-ref',
1868 '--format=%(refname:short) %(upstream:short)',
1869 'refs/heads']:
1870 # Create a local branch dependency tree that looks like this:
1871 # test1 -> test2 -> test3 -> test4 -> test5
1872 # -> test3.1
1873 # test6 -> test0
1874 branch_deps = [
1875 'test2 test1', # test1 -> test2
1876 'test3 test2', # test2 -> test3
1877 'test3.1 test2', # test2 -> test3.1
1878 'test4 test3', # test3 -> test4
1879 'test5 test4', # test4 -> test5
1880 'test6 test0', # test0 -> test6
1881 'test7', # test7
1882 ]
1883 return '\n'.join(branch_deps)
1884 self.mock(git_cl, 'RunGit', mock_run_git)
1885
1886 class RecordCalls:
1887 times_called = 0
1888 record_calls = RecordCalls()
1889 def mock_CMDupload(*args, **_kwargs):
1890 record_calls.times_called += 1
1891 return 0
1892 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1893
1894 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001895 (('ask_for_data', 'This command will checkout all dependent branches '
1896 'and run "git cl upload". Press Enter to continue, '
1897 'or Ctrl+C to abort'), ''),
1898 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001899
1900 class MockChangelist():
1901 def __init__(self):
1902 pass
1903 def GetBranch(self):
1904 return 'test1'
1905 def GetIssue(self):
1906 return '123'
1907 def GetPatchset(self):
1908 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001909 def IsGerrit(self):
1910 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001911
1912 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1913 # CMDupload should have been called 5 times because of 5 dependent branches.
1914 self.assertEquals(5, record_calls.times_called)
1915 self.assertEquals(0, ret)
1916
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001917 def test_gerrit_change_id(self):
1918 self.calls = [
1919 ((['git', 'write-tree'], ),
1920 'hashtree'),
1921 ((['git', 'rev-parse', 'HEAD~0'], ),
1922 'branch-parent'),
1923 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1924 'A B <a@b.org> 1456848326 +0100'),
1925 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1926 'C D <c@d.org> 1456858326 +0100'),
1927 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1928 'hashchange'),
1929 ]
1930 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1931 self.assertEqual(change_id, 'Ihashchange')
1932
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001933 def test_desecription_append_footer(self):
1934 for init_desc, footer_line, expected_desc in [
1935 # Use unique desc first lines for easy test failure identification.
1936 ('foo', 'R=one', 'foo\n\nR=one'),
1937 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1938 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1939 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1940 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1941 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1942 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1943 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1944 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1945 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1946 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1947 ]:
1948 desc = git_cl.ChangeDescription(init_desc)
1949 desc.append_footer(footer_line)
1950 self.assertEqual(desc.description, expected_desc)
1951
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001952 def test_update_reviewers(self):
1953 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001954 ('foo', [], [],
1955 'foo'),
1956 ('foo\nR=xx', [], [],
1957 'foo\nR=xx'),
1958 ('foo\nTBR=xx', [], [],
1959 'foo\nTBR=xx'),
1960 ('foo', ['a@c'], [],
1961 'foo\n\nR=a@c'),
1962 ('foo\nR=xx', ['a@c'], [],
1963 'foo\n\nR=a@c, xx'),
1964 ('foo\nTBR=xx', ['a@c'], [],
1965 'foo\n\nR=a@c\nTBR=xx'),
1966 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1967 'foo\n\nR=a@c, yy\nTBR=xx'),
1968 ('foo\nBUG=', ['a@c'], [],
1969 'foo\nBUG=\nR=a@c'),
1970 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1971 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1972 ('foo', ['a@c', 'b@c'], [],
1973 'foo\n\nR=a@c, b@c'),
1974 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1975 'foo\nBar\n\nR=c@c\nBUG='),
1976 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1977 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001978 # Same as the line before, but full of whitespaces.
1979 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001980 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001981 'foo\nBar\n\nR=c@c\n BUG =',
1982 ),
1983 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001984 ('foo BUG=allo R=joe ', ['c@c'], [],
1985 'foo BUG=allo R=joe\n\nR=c@c'),
1986 # Redundant TBRs get promoted to Rs
1987 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1988 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001989 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001990 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001991 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001992 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001993 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001994 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001995 actual.append(obj.description)
1996 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001997
Nodir Turakulov23b82142017-11-16 11:04:25 -08001998 def test_get_hash_tags(self):
1999 cases = [
2000 ('', []),
2001 ('a', []),
2002 ('[a]', ['a']),
2003 ('[aa]', ['aa']),
2004 ('[a ]', ['a']),
2005 ('[a- ]', ['a']),
2006 ('[a- b]', ['a-b']),
2007 ('[a--b]', ['a-b']),
2008 ('[a', []),
2009 ('[a]x', ['a']),
2010 ('[aa]x', ['aa']),
2011 ('[a b]', ['a-b']),
2012 ('[a b]', ['a-b']),
2013 ('[a__b]', ['a-b']),
2014 ('[a] x', ['a']),
2015 ('[a][b]', ['a', 'b']),
2016 ('[a] [b]', ['a', 'b']),
2017 ('[a][b]x', ['a', 'b']),
2018 ('[a][b] x', ['a', 'b']),
2019 ('[a]\n[b]', ['a']),
2020 ('[a\nb]', []),
2021 ('[a][', ['a']),
2022 ('Revert "[a] feature"', ['a']),
2023 ('Reland "[a] feature"', ['a']),
2024 ('Revert: [a] feature', ['a']),
2025 ('Reland: [a] feature', ['a']),
2026 ('Revert "Reland: [a] feature"', ['a']),
2027 ('Foo: feature', ['foo']),
2028 ('Foo Bar: feature', ['foo-bar']),
2029 ('Revert "Foo bar: feature"', ['foo-bar']),
2030 ('Reland "Foo bar: feature"', ['foo-bar']),
2031 ]
2032 for desc, expected in cases:
2033 change_desc = git_cl.ChangeDescription(desc)
2034 actual = change_desc.get_hash_tags()
2035 self.assertEqual(
2036 actual,
2037 expected,
2038 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
2039
wittman@chromium.org455dc922015-01-26 20:15:50 +00002040 def test_get_target_ref(self):
2041 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002042 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002043 self.assertEqual(None, git_cl.GetTargetRef(None,
2044 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002045 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002046
wittman@chromium.org455dc922015-01-26 20:15:50 +00002047 # Check default target refs for branches.
2048 self.assertEqual('refs/heads/master',
2049 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002050 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002051 self.assertEqual('refs/heads/master',
2052 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002053 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002054 self.assertEqual('refs/heads/master',
2055 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002056 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002057 self.assertEqual('refs/branch-heads/123',
2058 git_cl.GetTargetRef('origin',
2059 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002060 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002061 self.assertEqual('refs/diff/test',
2062 git_cl.GetTargetRef('origin',
2063 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002064 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00002065 self.assertEqual('refs/heads/chrome/m42',
2066 git_cl.GetTargetRef('origin',
2067 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002068 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002069
2070 # Check target refs for user-specified target branch.
2071 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
2072 'refs/remotes/branch-heads/123'):
2073 self.assertEqual('refs/branch-heads/123',
2074 git_cl.GetTargetRef('origin',
2075 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002076 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002077 for branch in ('origin/master', 'remotes/origin/master',
2078 'refs/remotes/origin/master'):
2079 self.assertEqual('refs/heads/master',
2080 git_cl.GetTargetRef('origin',
2081 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002082 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002083 for branch in ('master', 'heads/master', 'refs/heads/master'):
2084 self.assertEqual('refs/heads/master',
2085 git_cl.GetTargetRef('origin',
2086 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002087 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002088
wychen@chromium.orga872e752015-04-28 23:42:18 +00002089 def test_patch_when_dirty(self):
2090 # Patch when local tree is dirty
2091 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2092 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2093
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002094 @staticmethod
2095 def _get_gerrit_codereview_server_calls(branch, value=None,
2096 git_short_host='host',
2097 detect_branch=True):
2098 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2099
2100 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2101 """
2102 calls = []
2103 if detect_branch:
2104 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
2105 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2106 CERR1 if value is None else value))
2107 if value is None:
2108 calls += [
2109 ((['git', 'config', 'branch.' + branch + '.merge'],),
2110 'refs/heads' + branch),
2111 ((['git', 'config', 'branch.' + branch + '.remote'],),
2112 'origin'),
2113 ((['git', 'config', 'remote.origin.url'],),
2114 'https://%s.googlesource.com/my/repo' % git_short_host),
2115 ]
2116 return calls
2117
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002118 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002119 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002120 detect_gerrit_server=True,
2121 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002122 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002123 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2124 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002125 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002126 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002127 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2128
tandriidf09a462016-08-18 16:23:55 -07002129 if new_branch:
2130 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002131
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002132 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002133 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002134 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002135 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002136 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2137 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2138 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2139 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002140 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002141 if default_codereview == 'gerrit':
2142 if not force_codereview:
2143 self.calls += [
2144 ((['git', 'config', 'gerrit.host'],), 'true'),
2145 ]
2146 if detect_gerrit_server:
2147 self.calls += self._get_gerrit_codereview_server_calls(
2148 'master', git_short_host=git_short_host,
2149 detect_branch=not new_branch and force_codereview)
2150 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002151
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002152 elif default_codereview == 'rietveld':
2153 self.calls += [
2154 ((['git', 'config', 'gerrit.host'],), CERR1),
2155 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2156 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2157 ]
2158 actual_codereview = 'rietveld'
2159
2160 if actual_codereview == 'rietveld':
2161 self.calls += [
2162 ((['git', 'rev-parse', '--show-cdup'],), ''),
2163 ]
2164 if not default_codereview:
2165 self.calls += [
2166 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2167 ]
2168 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002169 self.calls += [
2170 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002171 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002172 {
2173 'current_revision': '7777777777',
2174 'revisions': {
2175 '1111111111': {
2176 '_number': 1,
2177 'fetch': {'http': {
2178 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2179 'ref': 'refs/changes/56/123456/1',
2180 }},
2181 },
2182 '7777777777': {
2183 '_number': 7,
2184 'fetch': {'http': {
2185 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2186 'ref': 'refs/changes/56/123456/7',
2187 }},
2188 },
2189 },
2190 }),
2191 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002192
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002193 def _common_patch_rietveld_successful(self, **kwargs):
2194 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002195 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002196 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002197 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002198 ((['git', 'config', 'branch.master.rietveldserver',
2199 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002200 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002201 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002202 ((['git', 'commit', '-m',
2203 'Description\n\n' +
2204 'patch from issue 123456 at patchset 60001 ' +
2205 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002206 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002207
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002208 def test_patch_rietveld_default(self):
2209 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002210 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2211
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002212 def test_patch_rietveld_successful_new_branch(self):
2213 self._common_patch_rietveld_successful(default_codereview='rietveld',
2214 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002215 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2216
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002217 def test_patch_rietveld_guess_by_url(self):
2218 self._common_patch_rietveld_successful(
2219 default_codereview=None, # It doesn't matter.
2220 actual_codereview='rietveld')
2221 self.assertEqual(git_cl.main(
2222 ['patch', 'https://codereview.example.com/123456']), 0)
2223
2224 def test_patch_rietveld_conflict(self):
2225 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002226 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002227 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002228
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002229 def test_patch_gerrit_default(self):
2230 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002231 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002232 self.calls += [
2233 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2234 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002235 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002236 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002237 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002238 ((['git', 'config', 'branch.master.gerritserver',
2239 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002240 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002241 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2242 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2243 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002244 ]
2245 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2246
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002247 def test_patch_gerrit_force(self):
2248 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002249 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002250 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002251 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002252 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002253 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002254 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002255 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002256 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002257 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002258 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002259 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2260 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2261 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002262 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002263 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002264
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002265 def test_patch_gerrit_guess_by_url(self):
2266 self._patch_common(
2267 default_codereview=None, # It doesn't matter what's default.
2268 actual_codereview='gerrit',
2269 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002270 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002271 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002272 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002273 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002274 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002275 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002276 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002277 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002278 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002279 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002280 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2281 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2282 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002283 ]
2284 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002285 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002286
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002287 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2288 self._patch_common(
2289 default_codereview=None, # It doesn't matter what's default.
2290 actual_codereview='gerrit',
2291 git_short_host='else', detect_gerrit_server=False)
2292 self.calls += [
2293 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2294 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002295 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002296 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2297 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2298 ''),
2299 ((['git', 'config', 'branch.master.gerritserver',
2300 'https://else-review.googlesource.com'],), ''),
2301 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002302 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2303 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2304 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002305 ]
2306 self.assertEqual(git_cl.main(
2307 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2308
2309 def test_patch_gerrit_conflict(self):
2310 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002311 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002312 self.calls += [
2313 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002314 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002315 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2316 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2317 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002318 ]
2319 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002320 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002321
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002322 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002323 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002324 raise git_cl.gerrit_util.GerritError(404, '')
2325 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2326
tandriic2405f52016-10-10 08:13:15 -07002327 self.calls = [
2328 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002329 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2330 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2331 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2332 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002333 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2334 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2335 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2336 ((['git', 'config', 'remote.origin.url'],),
2337 'https://chromium.googlesource.com/my/repo'),
2338 ((['DieWithError',
2339 'change 123456 at https://chromium-review.googlesource.com does not '
2340 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002341 ]
2342 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002343 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002344
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002345 def _checkout_calls(self):
2346 return [
2347 ((['git', 'config', '--local', '--get-regexp',
2348 'branch\\..*\\.rietveldissue'], ),
2349 ('branch.retrying.rietveldissue 1111111111\n'
2350 'branch.some-fix.rietveldissue 2222222222\n')),
2351 ((['git', 'config', '--local', '--get-regexp',
2352 'branch\\..*\\.gerritissue'], ),
2353 ('branch.ger-branch.gerritissue 123456\n'
2354 'branch.gbranch654.gerritissue 654321\n')),
2355 ]
2356
2357 def test_checkout_gerrit(self):
2358 """Tests git cl checkout <issue>."""
2359 self.calls = self._checkout_calls()
2360 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2361 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2362
2363 def test_checkout_rietveld(self):
2364 """Tests git cl checkout <issue>."""
2365 self.calls = self._checkout_calls()
2366 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2367 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2368
2369 def test_checkout_not_found(self):
2370 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002371 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002372 self.calls = self._checkout_calls()
2373 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2374
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002375 def test_checkout_no_branch_issues(self):
2376 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002377 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002378 self.calls = [
2379 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002380 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002381 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002382 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002383 ]
2384 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2385
tandrii@chromium.org28253532016-04-14 13:46:56 +00002386 def _test_gerrit_ensure_authenticated_common(self, auth,
2387 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002388 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2389 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2390 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002391 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002392 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002393 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002394 cl.branch = 'master'
2395 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002396 cl.lookedup_issue = True
2397 return cl
2398
2399 def test_gerrit_ensure_authenticated_missing(self):
2400 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002401 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002402 })
2403 self.calls.append(
2404 ((['DieWithError',
2405 'Credentials for the following hosts are required:\n'
2406 ' chromium-review.googlesource.com\n'
2407 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002408 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002409 'https://chromium-review.googlesource.com/new-password'],), ''),)
2410 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2411
2412 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002413 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002414 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002415 'chromium.googlesource.com':
2416 ('git-one.example.com', None, 'secret1'),
2417 'chromium-review.googlesource.com':
2418 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002419 })
2420 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002421 (('ask_for_data', 'If you know what you are doing '
2422 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002423 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2424
2425 def test_gerrit_ensure_authenticated_ok(self):
2426 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002427 'chromium.googlesource.com':
2428 ('git-same.example.com', None, 'secret'),
2429 'chromium-review.googlesource.com':
2430 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002431 })
2432 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2433
tandrii@chromium.org28253532016-04-14 13:46:56 +00002434 def test_gerrit_ensure_authenticated_skipped(self):
2435 cl = self._test_gerrit_ensure_authenticated_common(
2436 auth={}, skip_auth_check=True)
2437 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2438
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002439 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002440 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2441 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002442 self.calls = [
2443 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002444 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002445 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2446 ((['git', 'config', 'rietveld.server'],), ''),
2447 ((['git', 'config', 'rietveld.server'],), ''),
2448 ((['git', 'config', 'branch.feature.rietveldserver'],),
2449 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002450 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002451 ]
2452 self.assertEqual(0, git_cl.main(['set-commit']))
2453
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002454 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002455 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002456 lambda h, i, labels, notify=None:
2457 self._mocked_call(['SetReview', h, i, labels, notify]))
2458
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002459 self.calls = [
2460 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002461 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2462 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002463 ((['git', 'config', 'branch.feature.gerritserver'],),
2464 'https://chromium-review.googlesource.com'),
2465 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002466 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002467 ]
tandriid9e5ce52016-07-13 02:32:59 -07002468
2469 def test_cmd_set_commit_gerrit_clear(self):
2470 self._cmd_set_commit_gerrit_common(0)
2471 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2472
2473 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002474 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002475 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2476
tandriid9e5ce52016-07-13 02:32:59 -07002477 def test_cmd_set_commit_gerrit(self):
2478 self._cmd_set_commit_gerrit_common(2)
2479 self.assertEqual(0, git_cl.main(['set-commit']))
2480
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002481 def test_description_display(self):
2482 out = StringIO.StringIO()
2483 self.mock(git_cl.sys, 'stdout', out)
2484
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002485 self.mock(git_cl, 'Changelist', ChangelistMock)
2486 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002487
2488 self.assertEqual(0, git_cl.main(['description', '-d']))
2489 self.assertEqual('foo\n', out.getvalue())
2490
2491 def test_description_rietveld(self):
2492 out = StringIO.StringIO()
2493 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002494 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002495
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002496 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002497 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002498 self.assertEqual('foobar\n', out.getvalue())
2499
iannucci3c972b92016-08-17 13:24:10 -07002500 def test_StatusFieldOverrideIssueMissingArgs(self):
2501 out = StringIO.StringIO()
2502 self.mock(git_cl.sys, 'stderr', out)
2503
2504 try:
2505 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2506 except SystemExit as ex:
2507 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002508 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002509
2510 out = StringIO.StringIO()
2511 self.mock(git_cl.sys, 'stderr', out)
2512
2513 try:
2514 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2515 except SystemExit as ex:
2516 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002517 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002518
2519 def test_StatusFieldOverrideIssue(self):
2520 out = StringIO.StringIO()
2521 self.mock(git_cl.sys, 'stdout', out)
2522
2523 def assertIssue(cl_self, *_args):
2524 self.assertEquals(cl_self.issue, 1)
2525 return 'foobar'
2526
2527 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2528 self.calls = [
2529 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2530 ((['git', 'config', 'rietveld.server'],), ''),
2531 ((['git', 'config', 'rietveld.server'],), ''),
2532 ]
iannuccie53c9352016-08-17 14:40:40 -07002533 self.assertEqual(
2534 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2535 0)
iannucci3c972b92016-08-17 13:24:10 -07002536 self.assertEqual(out.getvalue(), 'foobar\n')
2537
iannuccie53c9352016-08-17 14:40:40 -07002538 def test_SetCloseOverrideIssue(self):
2539 def assertIssue(cl_self, *_args):
2540 self.assertEquals(cl_self.issue, 1)
2541 return 'foobar'
2542
2543 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2544 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2545 self.calls = [
2546 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2547 ((['git', 'config', 'rietveld.server'],), ''),
2548 ((['git', 'config', 'rietveld.server'],), ''),
2549 ]
2550 self.assertEqual(
2551 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2552
2553 def test_SetCommitOverrideIssue(self):
2554 def assertIssue(cl_self, *_args):
2555 self.assertEquals(cl_self.issue, 1)
2556 return 'foobar'
2557
2558 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2559 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2560 self.calls = [
2561 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2562 ((['git', 'config', 'rietveld.server'],), ''),
2563 ((['git', 'config', 'rietveld.server'],), ''),
2564 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2565 ((['git', 'config', 'rietveld.server'],), ''),
2566 ((['git', 'config', 'rietveld.server'],), ''),
2567 ]
2568 self.assertEqual(
2569 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2570
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002571 def test_description_gerrit(self):
2572 out = StringIO.StringIO()
2573 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002574 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002575 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002576 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2577 {
2578 'current_revision': 'sha1',
2579 'revisions': {'sha1': {
2580 'commit': {'message': 'foobar'},
2581 }},
2582 }),
2583 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002584 self.assertEqual(0, git_cl.main([
2585 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2586 self.assertEqual('foobar\n', out.getvalue())
2587
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002588 def test_description_set_raw(self):
2589 out = StringIO.StringIO()
2590 self.mock(git_cl.sys, 'stdout', out)
2591
2592 self.mock(git_cl, 'Changelist', ChangelistMock)
2593 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2594
2595 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2596 self.assertEqual('hihi', ChangelistMock.desc)
2597
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002598 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002599 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002600
2601 def RunEditor(desc, _, **kwargs):
2602 self.assertEquals(
2603 '# Enter a description of the change.\n'
2604 '# This will be displayed on the codereview site.\n'
2605 '# The first line will also be used as the subject of the review.\n'
2606 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002607 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002608 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002609 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002610 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002611 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002612
dsansomee2d6fd92016-09-08 00:10:47 -07002613 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002614 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002615
2616 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2617 self.mock(git_cl.Changelist, 'GetDescription',
2618 lambda *args: current_desc)
2619 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2620 UpdateDescriptionRemote)
2621 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2622
2623 self.calls = [
2624 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002625 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002626 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2627 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002628 ((['git', 'config', 'core.editor'],), 'vi'),
2629 ]
2630 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2631
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002632 def test_description_set_stdin(self):
2633 out = StringIO.StringIO()
2634 self.mock(git_cl.sys, 'stdout', out)
2635
2636 self.mock(git_cl, 'Changelist', ChangelistMock)
2637 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2638
2639 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2640 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2641
kmarshall3bff56b2016-06-06 18:31:47 -07002642 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002643 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2644
kmarshall3bff56b2016-06-06 18:31:47 -07002645 self.calls = \
2646 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2647 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002648 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002649 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2650 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002651 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2652 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2653 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002654 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2655 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2656 ((['git', 'branch', '-D', 'foo'],), '')]
2657
kmarshall3bff56b2016-06-06 18:31:47 -07002658 self.mock(git_cl, 'get_cl_statuses',
2659 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002660 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2661 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2662 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002663
2664 self.assertEqual(0, git_cl.main(['archive', '-f']))
2665
2666 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002667 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002668 self.calls = \
2669 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2670 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002671 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002672 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2673 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002674 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2675
kmarshall9249e012016-08-23 12:02:16 -07002676 self.mock(git_cl, 'get_cl_statuses',
2677 lambda branches, fine_grained, max_processes:
2678 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2679
2680 self.assertEqual(1, git_cl.main(['archive', '-f']))
2681
2682 def test_archive_dry_run(self):
2683 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2684
2685 self.calls = \
2686 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2687 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2688 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2689 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2690 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2691 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2692 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2693 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2694 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002695
2696 self.mock(git_cl, 'get_cl_statuses',
2697 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002698 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2699 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2700 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002701
kmarshall9249e012016-08-23 12:02:16 -07002702 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2703
2704 def test_archive_no_tags(self):
2705 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2706
2707 self.calls = \
2708 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2709 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2710 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2711 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2712 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2713 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2714 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2715 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2716 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2717 ((['git', 'branch', '-D', 'foo'],), '')]
2718
2719 self.mock(git_cl, 'get_cl_statuses',
2720 lambda branches, fine_grained, max_processes:
2721 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2722 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2723 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2724
2725 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002726
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002727 def test_cmd_issue_erase_existing(self):
2728 out = StringIO.StringIO()
2729 self.mock(git_cl.sys, 'stdout', out)
2730 self.calls = [
2731 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002732 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2733 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002734 # Let this command raise exception (retcode=1) - it should be ignored.
2735 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002736 CERR1),
2737 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2738 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002739 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2740 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2741 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002742 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002743 ]
2744 self.assertEqual(0, git_cl.main(['issue', '0']))
2745
Aaron Gable400e9892017-07-12 15:31:21 -07002746 def test_cmd_issue_erase_existing_with_change_id(self):
2747 out = StringIO.StringIO()
2748 self.mock(git_cl.sys, 'stdout', out)
2749 self.mock(git_cl.Changelist, 'GetDescription',
2750 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2751 self.calls = [
2752 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2753 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2754 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002755 # Let this command raise exception (retcode=1) - it should be ignored.
2756 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2757 CERR1),
2758 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2759 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2760 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2761 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2762 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002763 ((['git', 'log', '-1', '--format=%B'],),
2764 'This is a description\n\nChange-Id: Ideadbeef'),
2765 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002766 ]
2767 self.assertEqual(0, git_cl.main(['issue', '0']))
2768
phajdan.jre328cf92016-08-22 04:12:17 -07002769 def test_cmd_issue_json(self):
2770 out = StringIO.StringIO()
2771 self.mock(git_cl.sys, 'stdout', out)
2772 self.calls = [
2773 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002774 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002775 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2776 ((['git', 'config', 'rietveld.server'],),
2777 'https://codereview.chromium.org'),
2778 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2779 (('write_json', 'output.json',
2780 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2781 ''),
2782 ]
2783 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2784
tandriide281ae2016-10-12 06:02:30 -07002785 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002786 self.mock(git_cl.Changelist, 'GetChange',
2787 lambda _, *a: (
2788 self._mocked_call(['GetChange']+list(a))))
2789 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2790 lambda *_, **__: (
2791 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002792 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2793 lambda _, s: self._mocked_call(['SetCQState', s]))
2794 self.calls = [
2795 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002796 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002797 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2798 ((['git', 'config', 'rietveld.server'],),
2799 'https://codereview.chromium.org'),
2800 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2801 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2802 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2803 ((['get_or_create_merge_base', 'feature', 'feature'],),
2804 'fake_ancestor_sha'),
2805 ((['GetChange', 'fake_ancestor_sha', None], ),
2806 git_cl.presubmit_support.GitChange(
2807 '', '', '', '', '', '', '', '')),
2808 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2809 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002810 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2811 ]
2812 out = StringIO.StringIO()
2813 self.mock(git_cl.sys, 'stdout', out)
2814 self.assertEqual(0, git_cl.main(['try']))
2815 self.assertEqual(
2816 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002817 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002818
tandrii8c5a3532016-11-04 07:52:02 -07002819 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2820 self.mock(git_cl.Changelist, 'GetChange',
2821 lambda _, *a: (
2822 self._mocked_call(['GetChange']+list(a))))
2823 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2824 lambda *_, **__: (
2825 self._mocked_call(['DoGetTryMasters'])))
2826 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2827 lambda _, s: self._mocked_call(['SetCQState', s]))
2828
tandrii8c5a3532016-11-04 07:52:02 -07002829 self.calls = [
2830 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2831 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2832 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2833 ((['git', 'config', 'branch.feature.gerritserver'],),
2834 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002835 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2836 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2837 'project': 'depot_tools',
2838 'status': 'OPEN',
2839 'owner': {'email': 'owner@e.mail'},
2840 'revisions': {
2841 'deadbeaf': {
2842 '_number': 6,
2843 },
2844 'beeeeeef': {
2845 '_number': 7,
2846 'fetch': {'http': {
2847 'url': 'https://chromium.googlesource.com/depot_tools',
2848 'ref': 'refs/changes/56/123456/7'
2849 }},
2850 },
2851 },
2852 }),
tandrii8c5a3532016-11-04 07:52:02 -07002853 ((['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),
2862 ((['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: '
tandrii8c5a3532016-11-04 07:52:02 -07002870 'https://chromium-review.googlesource.com/123456\n')
2871
2872 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2873 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2874 lambda _: {
2875 'owner_email': 'owner@e.mail',
2876 'private': False,
2877 'closed': False,
2878 'project': 'depot_tools',
2879 'patchsets': [20001],
2880 })
tandriide281ae2016-10-12 06:02:30 -07002881 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2882 self.calls = [
2883 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2884 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2885 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2886 ((['git', 'config', 'rietveld.server'],),
2887 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002888 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002889 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002890 ]
2891
2892 def _buildbucket_retry(*_, **kw):
2893 # self.maxDiff = 10000
2894 body = json.loads(kw['body'])
2895 self.assertEqual(len(body['builds']), 1)
2896 build = body['builds'][0]
2897 params = json.loads(build.pop('parameters_json'))
2898 self.assertEqual(params, {
2899 u'builder_name': u'win',
2900 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2901 u'revision': None}],
2902 u'properties': {
2903 u'category': u'git_cl_try',
2904 u'issue': 123,
2905 u'key': u'val',
2906 u'json': [{u'a': 1}, None],
2907 u'master': u'tryserver.chromium',
2908 u'patch_project': u'depot_tools',
2909 u'patch_storage': u'rietveld',
2910 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002911 u'rietveld': u'https://codereview.chromium.org',
2912 }
2913 })
2914 self.assertEqual(build, {
2915 u'bucket': u'master.tryserver.chromium',
2916 u'client_operation_id': u'uuid4',
2917 u'tags': [u'builder:win',
2918 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002919 u'user_agent:git_cl_try',
2920 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002921 })
2922
2923 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2924
2925 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2926 self.assertEqual(0, git_cl.main([
2927 'try', '-m', 'tryserver.chromium', '-b', 'win',
2928 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2929 self.assertRegexpMatches(
2930 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002931 'Tried jobs on:\nBucket: master.tryserver.chromium')
2932
tandrii8c5a3532016-11-04 07:52:02 -07002933 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2934 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2935 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2936
tandrii8c5a3532016-11-04 07:52:02 -07002937 self.calls = [
2938 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2939 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2940 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2941 ((['git', 'config', 'branch.feature.gerritserver'],),
2942 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002943 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002944 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002945 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002946 'status': 'OPEN',
2947 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002948 'revisions': {
2949 'deadbeaf': {
2950 '_number': 6,
2951 },
2952 'beeeeeef': {
2953 '_number': 7,
2954 'fetch': {'http': {
2955 'url': 'https://chromium.googlesource.com/depot_tools',
2956 'ref': 'refs/changes/56/123456/7'
2957 }},
2958 },
2959 },
2960 }),
2961 ]
2962
2963 def _buildbucket_retry(*_, **kw):
2964 # self.maxDiff = 10000
2965 body = json.loads(kw['body'])
2966 self.assertEqual(len(body['builds']), 1)
2967 build = body['builds'][0]
2968 params = json.loads(build.pop('parameters_json'))
2969 self.assertEqual(params, {
2970 u'builder_name': u'win',
2971 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2972 u'revision': None}],
2973 u'properties': {
2974 u'category': u'git_cl_try',
2975 u'key': u'val',
2976 u'json': [{u'a': 1}, None],
2977 u'master': u'tryserver.chromium',
2978
2979 u'patch_gerrit_url':
2980 u'https://chromium-review.googlesource.com',
2981 u'patch_issue': 123456,
2982 u'patch_project': u'depot_tools',
2983 u'patch_ref': u'refs/changes/56/123456/7',
2984 u'patch_repository_url':
2985 u'https://chromium.googlesource.com/depot_tools',
2986 u'patch_set': 7,
2987 u'patch_storage': u'gerrit',
2988 }
2989 })
2990 self.assertEqual(build, {
2991 u'bucket': u'master.tryserver.chromium',
2992 u'client_operation_id': u'uuid4',
2993 u'tags': [
2994 u'builder:win',
2995 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2996 u'user_agent:git_cl_try',
2997 u'master:tryserver.chromium'],
2998 })
2999
3000 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3001
3002 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3003 self.assertEqual(0, git_cl.main([
3004 'try', '-m', 'tryserver.chromium', '-b', 'win',
3005 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3006 self.assertRegexpMatches(
3007 git_cl.sys.stdout.getvalue(),
3008 'Tried jobs on:\nBucket: master.tryserver.chromium')
3009
borenet6c0efe62016-10-19 08:13:29 -07003010 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07003011 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
3012 lambda _: {
3013 'owner_email': 'owner@e.mail',
3014 'private': False,
3015 'closed': False,
3016 'project': 'depot_tools',
3017 'patchsets': [20001],
3018 })
borenet6c0efe62016-10-19 08:13:29 -07003019 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
3020 self.calls = [
3021 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3022 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3023 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3024 ((['git', 'config', 'rietveld.server'],),
3025 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07003026 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07003027 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07003028 ]
3029
3030 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07003031 body = json.loads(kw['body'])
3032 self.assertEqual(len(body['builds']), 1)
3033 build = body['builds'][0]
3034 params = json.loads(build.pop('parameters_json'))
3035 self.assertEqual(params, {
3036 u'builder_name': u'win',
3037 u'changes': [{u'author': {u'email': u'owner@e.mail'},
3038 u'revision': None}],
3039 u'properties': {
3040 u'category': u'git_cl_try',
3041 u'issue': 123,
3042 u'patch_project': u'depot_tools',
3043 u'patch_storage': u'rietveld',
3044 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07003045 u'rietveld': u'https://codereview.chromium.org',
3046 }
3047 })
3048 self.assertEqual(build, {
3049 u'bucket': u'test.bucket',
3050 u'client_operation_id': u'uuid4',
3051 u'tags': [u'builder:win',
3052 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
3053 u'user_agent:git_cl_try'],
3054 })
3055
3056 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3057
3058 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3059 self.assertEqual(0, git_cl.main([
3060 'try', '-B', 'test.bucket', '-b', 'win']))
3061 self.assertRegexpMatches(
3062 git_cl.sys.stdout.getvalue(),
3063 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07003064
qyearsley123a4682016-10-26 09:12:17 -07003065 def test_git_cl_try_bots_on_multiple_masters(self):
3066 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
3067 self.calls = [
3068 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3069 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3070 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3071 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07003072 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07003073 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
3074 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3075 ]
3076
3077 def _buildbucket_retry(*_, **kw):
3078 body = json.loads(kw['body'])
3079 self.assertEqual(len(body['builds']), 2)
3080
3081 first_build_params = json.loads(body['builds'][0]['parameters_json'])
3082 self.assertEqual(first_build_params['builder_name'], 'builder1')
3083 self.assertEqual(first_build_params['properties']['master'], 'master1')
3084
3085 first_build_params = json.loads(body['builds'][1]['parameters_json'])
3086 self.assertEqual(first_build_params['builder_name'], 'builder2')
3087 self.assertEqual(first_build_params['properties']['master'], 'master2')
3088
3089 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3090
3091 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
3092 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3093
3094 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3095 self.assertEqual(
3096 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3097 self.assertEqual(
3098 git_cl.sys.stdout.getvalue(),
3099 'Tried jobs on:\n'
3100 'Bucket: master.master1\n'
3101 ' builder1: []\n'
3102 'Bucket: master.master2\n'
3103 ' builder2: []\n'
3104 'To see results here, run: git cl try-results\n'
3105 'To see results in browser, run: git cl web\n')
3106
tandrii16e0b4e2016-06-07 10:34:28 -07003107 def _common_GerritCommitMsgHookCheck(self):
3108 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3109 self.mock(git_cl.os.path, 'abspath',
3110 lambda path: self._mocked_call(['abspath', path]))
3111 self.mock(git_cl.os.path, 'exists',
3112 lambda path: self._mocked_call(['exists', path]))
3113 self.mock(git_cl.gclient_utils, 'FileRead',
3114 lambda path: self._mocked_call(['FileRead', path]))
3115 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3116 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3117 self.calls = [
3118 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3119 ((['abspath', '../'],), '/abs/git_repo_root'),
3120 ]
3121 return git_cl.Changelist(codereview='gerrit', issue=123)
3122
3123 def test_GerritCommitMsgHookCheck_custom_hook(self):
3124 cl = self._common_GerritCommitMsgHookCheck()
3125 self.calls += [
3126 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3127 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3128 '#!/bin/sh\necho "custom hook"')
3129 ]
3130 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3131
3132 def test_GerritCommitMsgHookCheck_not_exists(self):
3133 cl = self._common_GerritCommitMsgHookCheck()
3134 self.calls += [
3135 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3136 ]
3137 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3138
3139 def test_GerritCommitMsgHookCheck(self):
3140 cl = self._common_GerritCommitMsgHookCheck()
3141 self.calls += [
3142 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3143 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3144 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003145 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003146 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3147 ''),
3148 ]
3149 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3150
tandriic4344b52016-08-29 06:04:54 -07003151 def test_GerritCmdLand(self):
3152 self.calls += [
3153 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3154 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3155 'deadbeaf'),
3156 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3157 ((['git', 'config', 'branch.feature.gerritserver'],),
3158 'chromium-review.googlesource.com'),
3159 ]
3160 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3161 cl._codereview_impl._GetChangeDetail = lambda _: {
3162 'labels': {},
3163 'current_revision': 'deadbeaf',
3164 }
agable32978d92016-11-01 12:55:02 -07003165 cl._codereview_impl._GetChangeCommit = lambda: {
3166 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003167 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003168 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3169 }
tandriic4344b52016-08-29 06:04:54 -07003170 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003171 out = StringIO.StringIO()
3172 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003173 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003174 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003175 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003176
tandrii221ab252016-10-06 08:12:04 -07003177 BUILDBUCKET_BUILDS_MAP = {
3178 '9000': {
3179 'id': '9000',
3180 'status': 'STARTED',
3181 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3182 'result_details_json': '{"properties": {}}',
3183 'bucket': 'master.x.y',
3184 'created_by': 'user:someone@chromium.org',
3185 'created_ts': '147200002222000',
3186 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3187 },
3188 '8000': {
3189 'id': '8000',
3190 'status': 'COMPLETED',
3191 'result': 'FAILURE',
3192 'failure_reason': 'BUILD_FAILURE',
3193 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3194 'result_details_json': '{"properties": {}}',
3195 'bucket': 'master.x.y',
3196 'created_by': 'user:someone@chromium.org',
3197 'created_ts': '147200001111000',
3198 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3199 },
3200 }
3201
3202 def test_write_try_results_json(self):
3203 expected_output = [
3204 {
3205 'buildbucket_id': '8000',
3206 'bucket': 'master.x.y',
3207 'builder_name': 'my-builder',
3208 'status': 'COMPLETED',
3209 'result': 'FAILURE',
3210 'failure_reason': 'BUILD_FAILURE',
3211 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3212 },
3213 {
3214 'buildbucket_id': '9000',
3215 'bucket': 'master.x.y',
3216 'builder_name': 'my-builder',
3217 'status': 'STARTED',
3218 'result': None,
3219 'failure_reason': None,
3220 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3221 }
3222 ]
3223 self.calls = [(('write_json', 'output.json', expected_output), '')]
3224 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3225
tandrii45b2a582016-10-11 03:14:16 -07003226 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003227 out = StringIO.StringIO()
3228 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003229 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3230 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003231 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3232 self._mocked_call(['get_authenticator_for_host', host]))
3233 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3234 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003235
3236 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3237 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003238 self.calls += [
3239 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3240 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3241 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3242 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3243 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3244 ((['git', 'config', 'branch.feature.rietveldserver'],),
3245 'codereview.example.com'),
3246 ((['get_authenticator_for_host', 'codereview.example.com'],),
3247 AuthenticatorMock()),
3248 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3249
3250 def test_fetch_try_jobs_none_rietveld(self):
3251 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003252 # Simulate that user isn't logged in.
3253 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003254 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003255 self.assertRegexpMatches(sys.stdout.getvalue(),
3256 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003257 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3258
3259 def test_fetch_try_jobs_some_rietveld(self):
3260 self._setup_fetch_try_jobs_rietveld({
3261 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3262 })
3263 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003264 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3265 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3266 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3267
3268 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3269 self._setup_fetch_try_jobs(most_recent_patchset=13)
3270 self.calls += [
3271 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3272 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3273 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003274 # TODO(tandrii): Uncomment the below if we decide to support checking
3275 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003276 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003277 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003278 ((['git', 'config', 'branch.feature.gerritserver'],),
3279 'https://x-review.googlesource.com'),
3280 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3281 AuthenticatorMock()),
3282 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3283
3284 def test_fetch_try_jobs_none_gerrit(self):
3285 self._setup_fetch_try_jobs_gerrit({})
3286 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003287 # TODO(tandrii): Uncomment the below if we decide to support checking
3288 # patchsets for Gerrit.
3289 # self.assertRegexpMatches(
3290 # sys.stdout.getvalue(),
3291 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003292 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3293
3294 def test_fetch_try_jobs_some_gerrit(self):
3295 self._setup_fetch_try_jobs_gerrit({
3296 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3297 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003298 # TODO(tandrii): Uncomment the below if we decide to support checking
3299 # patchsets for Gerrit.
3300 # self.calls.remove(
3301 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003302 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3303
3304 # ... and doesn't result in warning.
3305 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3306 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003307 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3308 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3309
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003310 def _mock_gerrit_changes_for_detail_cache(self):
3311 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003312
3313 def test_gerrit_change_detail_cache_normalize(self):
3314 self._mock_gerrit_changes_for_detail_cache()
3315 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003316 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003317 ]
3318 cl = git_cl.Changelist(codereview='gerrit')
3319 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3320 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3321 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3322 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3323
3324 def test_gerrit_change_detail_cache_simple(self):
3325 self._mock_gerrit_changes_for_detail_cache()
3326 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003327 (('GetChangeDetail', 'host', '1', []), 'a'),
3328 (('GetChangeDetail', 'host', '2', []), 'b'),
3329 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003330 ]
3331 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3332 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3333 self.assertEqual(cl._GetChangeDetail(), 'a')
3334 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003335 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003336 self.assertEqual(cl._GetChangeDetail(), 'a')
3337 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3338
3339 def test_gerrit_change_detail_cache_options(self):
3340 self._mock_gerrit_changes_for_detail_cache()
3341 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003342 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3343 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3344 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3345 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003346 ]
3347 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3348 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3349 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3350 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3351 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3352 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3353 self.assertEqual(cl._GetChangeDetail(), 'cab')
3354
3355 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3356 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3357 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3358 self.assertEqual(cl._GetChangeDetail(), 'cab')
3359
3360 # Finally, no_cache should invalidate all caches for given change.
3361 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3362 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3363
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003364 def test_gerrit_description_caching(self):
3365 def gen_detail(rev, desc):
3366 return {
3367 'current_revision': rev,
3368 'revisions': {rev: {'commit': {'message': desc}}}
3369 }
3370 self.calls = [
3371 (('GetChangeDetail', 'host', '1',
3372 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3373 gen_detail('rev1', 'desc1')),
3374 (('GetChangeDetail', 'host', '1',
3375 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3376 gen_detail('rev2', 'desc2')),
3377 ]
3378
3379 self._mock_gerrit_changes_for_detail_cache()
3380 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3381 self.assertEqual(cl.GetDescription(), 'desc1')
3382 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3383 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003384
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003385 def test_print_current_creds(self):
3386 class CookiesAuthenticatorMock(object):
3387 def __init__(self):
3388 self.gitcookies = {
3389 'host.googlesource.com': ('user', 'pass'),
3390 'host-review.googlesource.com': ('user', 'pass'),
3391 }
3392 self.netrc = self
3393 self.netrc.hosts = {
3394 'github.com': ('user2', None, 'pass2'),
3395 'host2.googlesource.com': ('user3', None, 'pass'),
3396 }
3397 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3398 CookiesAuthenticatorMock)
3399 self.mock(sys, 'stdout', StringIO.StringIO())
3400 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3401 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3402 ' Host\t User\t Which file',
3403 '============================\t=====\t===========',
3404 'host-review.googlesource.com\t user\t.gitcookies',
3405 ' host.googlesource.com\t user\t.gitcookies',
3406 ' host2.googlesource.com\tuser3\t .netrc',
3407 ])
3408 sys.stdout.buf = ''
3409 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3410 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3411 ' Host\tUser\t Which file',
3412 '============================\t====\t===========',
3413 'host-review.googlesource.com\tuser\t.gitcookies',
3414 ' host.googlesource.com\tuser\t.gitcookies',
3415 ])
3416
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003417 def _common_creds_check_mocks(self):
3418 def exists_mock(path):
3419 dirname = os.path.dirname(path)
3420 if dirname == os.path.expanduser('~'):
3421 dirname = '~'
3422 base = os.path.basename(path)
3423 if base in ('.netrc', '.gitcookies'):
3424 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3425 # git cl also checks for existence other files not relevant to this test.
3426 return None
3427 self.mock(os.path, 'exists', exists_mock)
3428 self.mock(sys, 'stdout', StringIO.StringIO())
3429
3430 def test_creds_check_gitcookies_not_configured(self):
3431 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003432 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003433 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003434 self.calls = [
3435 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3436 (('os.path.exists', '~/.netrc'), True),
3437 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3438 'or Ctrl+C to abort'), ''),
3439 ((['git', 'config', '--global', 'http.cookiefile',
3440 os.path.expanduser('~/.gitcookies')], ), ''),
3441 ]
3442 self.assertEqual(0, git_cl.main(['creds-check']))
3443 self.assertRegexpMatches(
3444 sys.stdout.getvalue(),
3445 '^You seem to be using outdated .netrc for git credentials:')
3446 self.assertRegexpMatches(
3447 sys.stdout.getvalue(),
3448 '\nConfigured git to use .gitcookies from')
3449
3450 def test_creds_check_gitcookies_configured_custom_broken(self):
3451 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003452 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003453 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003454 self.calls = [
3455 ((['git', 'config', '--global', 'http.cookiefile'],),
3456 '/custom/.gitcookies'),
3457 (('os.path.exists', '/custom/.gitcookies'), False),
3458 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3459 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3460 ((['git', 'config', '--global', 'http.cookiefile',
3461 os.path.expanduser('~/.gitcookies')], ), ''),
3462 ]
3463 self.assertEqual(0, git_cl.main(['creds-check']))
3464 self.assertRegexpMatches(
3465 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003466 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003467 self.assertRegexpMatches(
3468 sys.stdout.getvalue(),
3469 'However, your configured .gitcookies file is missing.')
3470
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003471 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003472 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003473 lambda _, message, publish: self._mocked_call(
3474 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003475 self.calls = [
3476 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3477 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003478 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003479 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003480 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3481 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003482
3483 def test_git_cl_comment_add_gerrit(self):
3484 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003485 lambda host, change, msg, ready:
3486 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003487 self.calls = [
3488 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3489 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3490 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3491 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3492 'origin/master'),
3493 ((['git', 'config', 'remote.origin.url'],),
3494 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003495 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3496 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003497 ]
3498 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3499 '-a', 'msg']))
3500
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003501 def test_git_cl_comments_fetch_rietveld(self):
3502 self.mock(sys, 'stdout', StringIO.StringIO())
3503 self.calls = [
3504 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3505 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3506 ] * 2
3507 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3508 'messages': [
3509 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3510 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3511 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3512 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3513 # Intentionally wrong order here.
3514 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3515 'disapproval': False, 'approval': False,
3516 'sender': 'owner@example.com'},
3517 ],
3518 'owner_email': 'owner@example.com',
3519 })
3520 expected_comments_summary = [
3521 git_cl._CommentSummary(
3522 message='lgtm',
3523 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3524 disapproval=False, approval=True, sender='r@example.com'),
3525 git_cl._CommentSummary(
3526 message='not lgtm',
3527 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3528 disapproval=True, approval=False, sender='r2@example.com'),
3529 # Note: same order as in whatever Rietveld returns.
3530 git_cl._CommentSummary(
3531 message='PTAL',
3532 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3533 disapproval=False, approval=False, sender='owner@example.com'),
3534 ]
3535 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3536 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3537
3538 with git_cl.gclient_utils.temporary_directory() as tempdir:
3539 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3540 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3541 '-j', out_file]))
3542 with open(out_file) as f:
3543 read = json.load(f)
3544 self.assertEqual(len(read), 3)
3545 self.assertEqual(read[0], {
3546 'date': '2000-03-13 20:49:34.515270',
3547 'message': 'PTAL',
3548 'approval': False,
3549 'disapproval': False,
3550 'sender': 'owner@example.com'})
3551 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3552 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3553
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003554 def test_git_cl_comments_fetch_gerrit(self):
3555 self.mock(sys, 'stdout', StringIO.StringIO())
3556 self.calls = [
3557 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3558 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3559 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3560 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3561 'origin/master'),
3562 ((['git', 'config', 'remote.origin.url'],),
3563 'https://chromium.googlesource.com/infra/infra'),
3564 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3565 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003566 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003567 'messages': [
3568 {
3569 u'_revision_number': 1,
3570 u'author': {
3571 u'_account_id': 1111084,
3572 u'email': u'commit-bot@chromium.org',
3573 u'name': u'Commit Bot'
3574 },
3575 u'date': u'2017-03-15 20:08:45.000000000',
3576 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003577 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003578 u'tag': u'autogenerated:cq:dry-run'
3579 },
3580 {
3581 u'_revision_number': 2,
3582 u'author': {
3583 u'_account_id': 11151243,
3584 u'email': u'owner@example.com',
3585 u'name': u'owner'
3586 },
3587 u'date': u'2017-03-16 20:00:41.000000000',
3588 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3589 u'message': u'PTAL',
3590 },
3591 {
3592 u'_revision_number': 2,
3593 u'author': {
3594 u'_account_id': 148512 ,
3595 u'email': u'reviewer@example.com',
3596 u'name': u'reviewer'
3597 },
3598 u'date': u'2017-03-17 05:19:37.500000000',
3599 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3600 u'message': u'Patch Set 2: Code-Review+1',
3601 },
3602 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003603 }),
3604 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3605 '/COMMIT_MSG': [
3606 {
3607 'author': {'email': u'reviewer@example.com'},
3608 'updated': u'2017-03-17 05:19:37.500000000',
3609 'patch_set': 2,
3610 'side': 'REVISION',
3611 'message': 'Please include a bug link',
3612 },
3613 ],
3614 'codereview.settings': [
3615 {
3616 'author': {'email': u'owner@example.com'},
3617 'updated': u'2017-03-16 20:00:41.000000000',
3618 'patch_set': 2,
3619 'side': 'PARENT',
3620 'line': 42,
3621 'message': 'I removed this because it is bad',
3622 },
3623 ]
3624 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003625 ] * 2
3626 expected_comments_summary = [
3627 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003628 message=(
3629 u'PTAL\n' +
3630 u'\n' +
3631 u'codereview.settings\n' +
3632 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3633 u'c/1/2/codereview.settings#b42\n' +
3634 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003635 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3636 disapproval=False, approval=False, sender=u'owner@example.com'),
3637 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003638 message=(
3639 u'Patch Set 2: Code-Review+1\n' +
3640 u'\n' +
3641 u'/COMMIT_MSG\n' +
3642 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3643 u'c/1/2//COMMIT_MSG#\n' +
3644 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003645 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3646 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3647 ]
3648 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3649 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3650
3651 with git_cl.gclient_utils.temporary_directory() as tempdir:
3652 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3653 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3654 '-j', out_file]))
3655 with open(out_file) as f:
3656 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003657 self.assertEqual(len(read), 2)
3658 self.assertEqual(read[0], {
3659 u'date': u'2017-03-16 20:00:41.000000',
3660 u'message': (
3661 u'PTAL\n' +
3662 u'\n' +
3663 u'codereview.settings\n' +
3664 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3665 u'c/1/2/codereview.settings#b42\n' +
3666 u' I removed this because it is bad\n'),
3667 u'approval': False,
3668 u'disapproval': False,
3669 u'sender': u'owner@example.com'})
3670 self.assertEqual(read[1], {
3671 u'date': u'2017-03-17 05:19:37.500000',
3672 u'message': (
3673 u'Patch Set 2: Code-Review+1\n' +
3674 u'\n' +
3675 u'/COMMIT_MSG\n' +
3676 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3677 u'c/1/2//COMMIT_MSG#\n' +
3678 u' Please include a bug link\n'),
3679 u'approval': False,
3680 u'disapproval': False,
3681 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003682
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003683
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003684if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003685 logging.basicConfig(
3686 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003687 unittest.main()