blob: 60f29305702a46f21916428e25eb5bf39e60a114 [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'),
Aaron Gable7817f022017-12-12 09:43:17 -0800816 ((['git', '-c', 'core.quotePath=false', 'diff',
817 '--name-status', '--no-renames', '-r', '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'),
Aaron Gable7817f022017-12-12 09:43:17 -08001113 ((['git', '-c', 'core.quotePath=false', 'diff',
1114 '--name-status', '--no-renames', '-r', '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 += [
Aaron Gable7817f022017-12-12 09:43:17 -08001231 ((['git', '-c', 'core.quotePath=false', 'diff',
1232 '--name-status', '--diff-filter=U'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001233 'U path/file1\n'
1234 'U file2.cpp\n'),
1235 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001236 ((['git', 'checkout', '-q', 'feature'],), ''),
1237 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001238 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1239 ]
1240 git_cl.main(['land'])
1241
1242 def test_land_rietveld_git_numberer_fail_1_push(self):
1243 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1244
1245 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1246 self._land_rietveld_calls(
1247 repo_url='https://chromium.googlesource.com/chromium/src',
1248 git_numberer_enabled=True,
1249 parent_msg=('This is parent commit.\n'
1250 '\n'
1251 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1252 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1253 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1254 '\n'
1255 'Review-Url: https://codereview.chromium.org/123 .\n'
1256 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1257 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1258 fail_push_count=fail_push_count,
1259 debug=False)
1260
1261 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001262 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001263 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001264 ((['update_description', 123,
1265 'Issue: 123\n\nR=john@chromium.org\n'
1266 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001267 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001268 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1269 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1270 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001271 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001272 ''),
1273 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001274 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001275 ]
1276 git_cl.main(['land'])
1277
1278 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001279 self._land_rietveld_calls(
1280 repo_url='https://chromium.googlesource.com/v8/v8',
1281 git_numberer_enabled=True,
1282 parent_msg='This is parent commit with no footer.',
1283 fail_after_parent_msg=True,
1284 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001285 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001286 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001287 ((['git', 'checkout', '-q', 'feature'],), ''),
1288 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001289 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001290 ]
1291 with self.assertRaises(ValueError) as cm:
1292 git_cl.main(['land'])
1293 self.assertEqual(cm.exception.message,
1294 'Unable to infer commit position from footers')
1295
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001296 def test_git_numberer_not_whitelisted_repo(self):
1297 self.calls = []
1298 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001299 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1300 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001301 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001302
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001303 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001304 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1305 self.calls = [
1306 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001307 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001308 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001309 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001310 remote_url='https://chromium.googlesource.com/chromium/src',
1311 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001312 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001313
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001314 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001315 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001316 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001317 def fake_temporary_directory(**kwargs):
1318 yield tempdir
1319 self.mock(git_cl.gclient_utils, 'temporary_directory',
1320 fake_temporary_directory)
1321 self._test_GitNumbererState_valid_configs_inner(tempdir)
1322
1323 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001324 self.calls = [
1325 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001326 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001327 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1328 '''
1329 [plugin "git-numberer"]
1330 validate-enabled-refglob = refs/else/*
1331 validate-enabled-refglob = refs/heads/*
1332 validate-disabled-refglob = refs/heads/disabled
1333 validate-disabled-refglob = refs/branch-heads/*
1334 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001335 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1336 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001337 'refs/else/*\n'
1338 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001339 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1340 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001341 'refs/heads/disabled\n'
1342 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001343 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001344
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001345 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001346 remote_url='https://chromium.googlesource.com/chromium/src',
1347 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001348 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001349
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001350 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001351 remote_url='https://chromium.googlesource.com/chromium/src',
1352 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001353 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001354
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001355 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001356 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001357 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001358 remote_url='https://chromium.googlesource.com/chromium/src',
1359 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001360 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001361
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001362 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001363 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001364 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001365 if skip_auth_check:
1366 return [((cmd, ), 'true')]
1367
tandrii5d48c322016-08-18 16:19:37 -07001368 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001369 if issue:
1370 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001371 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001372 ])
1373 calls.extend([
1374 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1375 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1376 ((['git', 'config', 'remote.origin.url'],),
1377 'https://chromium.googlesource.com/my/repo'),
1378 ((['git', 'config', 'remote.origin.url'],),
1379 'https://chromium.googlesource.com/my/repo'),
1380 ])
1381 return calls
1382
1383 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001384 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001385 fetched_status=None, other_cl_owner=None,
1386 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001387 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1389 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1390 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1391 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001392 ]
1393 calls += cls._is_gerrit_calls(True)
1394 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001395 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1396 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1397 ((['git', 'config', 'branch.master.gerritissue'],),
1398 CERR1 if issue is None else str(issue)),
1399 ]
1400
1401 if custom_cl_base:
1402 ancestor_revision = custom_cl_base
1403 else:
1404 # Determine ancestor_revision to be merge base.
1405 ancestor_revision = 'fake_ancestor_sha'
1406 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001407 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001408 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001409 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001410 'refs/remotes/origin/master'],), ancestor_revision),
1411 ]
1412
1413 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001414 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1415
1416 if issue:
1417 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001418 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001419 '123456',
1420 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001421 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001422 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001423 'change_id': '123456789',
1424 'current_revision': 'sha1_of_current_revision',
1425 'revisions': { 'sha1_of_current_revision': {
1426 'commit': {'message': fetched_description},
1427 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001428 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001429 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001430 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001431 if fetched_status == 'ABANDONED':
1432 calls += [
1433 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1434 '123456 has been abandoned, new uploads are not '
1435 'allowed'), SystemExitMock()),
1436 ]
1437 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001438 if other_cl_owner:
1439 calls += [
1440 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1441 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001442
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001443 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1444 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001445 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001446 ((['git', 'rev-parse', '--show-cdup'],), ''),
1447 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001448
Aaron Gable7817f022017-12-12 09:43:17 -08001449 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1450 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001451 'M\t.gitignore\n'),
1452 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001453 ]
1454
1455 if not issue:
1456 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001457 ((['git', 'log', '--pretty=format:%s%n%n%b',
1458 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001459 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001460 ]
1461
1462 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001463 ((['git', 'config', 'user.email'],), 'me@example.com'),
1464 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1465 ([custom_cl_base] if custom_cl_base else
1466 [ancestor_revision, 'HEAD']),),
1467 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001468 ]
1469 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001470
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001471 @classmethod
1472 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001473 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001474 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001475 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001476 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001477 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001478 if post_amend_description is None:
1479 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001480 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001481 # Determined in `_gerrit_base_calls`.
1482 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1483
1484 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001485
tandriia60502f2016-06-20 02:01:53 -07001486 if squash_mode == 'default':
1487 calls.extend([
1488 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1489 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1490 ])
1491 elif squash_mode in ('override_squash', 'override_nosquash'):
1492 calls.extend([
1493 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1494 'true' if squash_mode == 'override_squash' else 'false'),
1495 ])
1496 else:
1497 assert squash_mode in ('squash', 'nosquash')
1498
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001499 # If issue is given, then description is fetched from Gerrit instead.
1500 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001501 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001502 ((['git', 'log', '--pretty=format:%s\n\n%b',
1503 ((custom_cl_base + '..') if custom_cl_base else
1504 'fake_ancestor_sha..HEAD')],),
1505 description),
1506 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001507 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001508 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001509 else:
1510 if not title:
1511 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001512 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1513 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001514 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001515 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001516 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001517 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001518 (('DownloadGerritHook', False), ''),
1519 # Amending of commit message to get the Change-Id.
1520 ((['git', 'log', '--pretty=format:%s\n\n%b',
1521 determined_ancestor_revision + '..HEAD'],),
1522 description),
1523 ((['git', 'commit', '--amend', '-m', description],), ''),
1524 ((['git', 'log', '--pretty=format:%s\n\n%b',
1525 determined_ancestor_revision + '..HEAD'],),
1526 post_amend_description)
1527 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001528 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001529 if not issue:
1530 # Prompting to edit description on first upload.
1531 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001532 ((['git', 'config', 'core.editor'],), ''),
1533 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001534 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001535 ref_to_push = 'abcdef0123456789'
1536 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001537 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1538 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1539 ]
1540
1541 if custom_cl_base is None:
1542 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001543 ((['get_or_create_merge_base', 'master',
1544 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001545 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001546 ]
1547 parent = 'origin/master'
1548 else:
1549 calls += [
1550 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1551 'refs/remotes/origin/master'],),
1552 callError(1)), # Means not ancenstor.
1553 (('ask_for_data',
1554 'Do you take responsibility for cleaning up potential mess '
1555 'resulting from proceeding with upload? Press Enter to upload, '
1556 'or Ctrl+C to abort'), ''),
1557 ]
1558 parent = custom_cl_base
1559
1560 calls += [
1561 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1562 '0123456789abcdef'),
1563 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001564 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001565 ref_to_push),
1566 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001567 else:
1568 ref_to_push = 'HEAD'
1569
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001570 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001571 ((['git', 'rev-list',
1572 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1573 ref_to_push],),
1574 '1hashPerLine\n'),
1575 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001576
Aaron Gableafd52772017-06-27 16:40:10 -07001577 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001578 ref_suffix = '%ready,notify=ALL'
1579 else:
1580 if not issue:
1581 ref_suffix = '%wip'
1582 else:
1583 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001584
Aaron Gable70f4e242017-06-26 10:45:59 -07001585 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001586 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001587
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001588 if git_mirror is None:
1589 calls += [
1590 ((['git', 'config', 'remote.origin.url'],),
1591 'https://chromium.googlesource.com/yyy/zzz'),
1592 ]
1593 else:
1594 calls += [
1595 ((['git', 'config', 'remote.origin.url'],),
1596 '/cache/this-dir-exists'),
1597 (('os.path.isdir', '/cache/this-dir-exists'),
1598 True),
1599 # Runs in /cache/this-dir-exists.
1600 ((['git', 'config', 'remote.origin.url'],),
1601 'https://chromium.googlesource.com/yyy/zzz'),
1602 ]
1603
ukai@chromium.orge8077812012-02-03 03:41:46 +00001604 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001605 ((['git', 'push',
1606 'https://chromium.googlesource.com/yyy/zzz',
1607 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001608 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001609 'remote: Processing changes: (\)\n'
1610 'remote: Processing changes: (|)\n'
1611 'remote: Processing changes: (/)\n'
1612 'remote: Processing changes: (-)\n'
1613 'remote: Processing changes: new: 1 (/)\n'
1614 'remote: Processing changes: new: 1, done\n'
1615 'remote:\n'
1616 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001617 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1618 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001619 'remote:\n'
1620 'To https://chromium.googlesource.com/yyy/zzz\n'
1621 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001622 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001623 if squash:
1624 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001625 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001626 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001627 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001628 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001629 ((['git', 'config', 'branch.master.gerritsquashhash',
1630 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001631 ]
tandrii88189772016-09-29 04:29:57 -07001632 calls += [
1633 ((['git', 'config', 'rietveld.cc'],), ''),
Daniel Cheng7227d212017-11-17 08:12:37 -08001634 (('AddReviewers', 'chromium-review.googlesource.com', 123456
1635 if squash else None, sorted(reviewers),
1636 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1637 cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001638 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001639 if tbr:
1640 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001641 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1642 ['LABELS']), {
1643 'labels': {
1644 'Code-Review': {
1645 'default_value': 0,
1646 'all': [],
1647 'values': {
1648 '+2': 'lgtm, approved',
1649 '+1': 'lgtm, but someone else must approve',
1650 ' 0': 'No score',
1651 '-1': 'Don\'t submit as-is',
1652 }
1653 }
1654 }
1655 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001656 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001657 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001658 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001659 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001660 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001661 return calls
1662
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001663 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001664 self,
1665 upload_args,
1666 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001667 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001668 squash=True,
1669 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001670 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001671 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001672 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001673 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001674 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001675 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001676 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001677 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001678 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001679 custom_cl_base=None,
1680 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001681 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001682 if squash_mode is None:
1683 if '--no-squash' in upload_args:
1684 squash_mode = 'nosquash'
1685 elif '--squash' in upload_args:
1686 squash_mode = 'squash'
1687 else:
1688 squash_mode = 'default'
1689
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001690 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001691 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001692 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001693 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001694 CookiesAuthenticatorMockFactory(
1695 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001696 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1697 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001698 self.mock(git_cl.gclient_utils, 'RunEditor',
1699 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001700 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1701 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001702
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001703 original_os_path_isdir = os.path.isdir
1704 def selective_os_path_isdir_mock(path):
1705 if path == '/cache/this-dir-exists':
1706 return self._mocked_call('os.path.isdir', path)
1707 return original_os_path_isdir(path)
1708 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1709
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001710 self.calls = self._gerrit_base_calls(
1711 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001712 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001713 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001714 other_cl_owner=other_cl_owner,
1715 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001716 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001717 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1718 expected_content=description))
1719 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001720 self.calls += self._gerrit_upload_calls(
1721 description, reviewers, squash,
1722 squash_mode=squash_mode,
1723 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001724 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001725 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001726 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001727 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001728 # Uncomment when debugging.
1729 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001730 git_cl.main(['upload'] + upload_args)
1731
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001732 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001733 self._run_gerrit_upload_test(
1734 ['--no-squash'],
1735 'desc\n\nBUG=\n',
1736 [],
1737 squash=False,
1738 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1739
1740 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001741 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001742 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001743 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001744 [],
tandriia60502f2016-06-20 02:01:53 -07001745 squash=False,
1746 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001747 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001748
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001749 def test_gerrit_no_reviewer(self):
1750 self._run_gerrit_upload_test(
1751 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001752 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001753 [],
1754 squash=False,
1755 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001756
Nick Carter8692b182017-11-06 16:30:38 -08001757 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001758 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1759 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001760 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001761 'desc\n\nBUG=\n\nChange-Id: I123456789',
1762 squash=False,
1763 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001764 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001765
ukai@chromium.orge8077812012-02-03 03:41:46 +00001766 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001767 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001768 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001769 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001770 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001771 squash=False,
1772 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001773 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001774
1775 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001776 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001777 [],
bradnelsond975b302016-10-23 12:20:23 -07001778 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1779 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001780 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001781 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001782 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001783 cc=['more@example.com', 'people@example.com'],
1784 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001785
1786 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001787 self._run_gerrit_upload_test(
1788 [],
1789 'desc\nBUG=\n\nChange-Id: 123456789',
1790 [],
1791 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001792
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001793 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001794 self._run_gerrit_upload_test(
1795 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001796 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001797 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001798 squash=True,
1799 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001800
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001801 def test_gerrit_upload_squash_first_against_rev(self):
1802 custom_cl_base = 'custom_cl_base_rev_or_branch'
1803 self._run_gerrit_upload_test(
1804 ['--squash', custom_cl_base],
1805 'desc\nBUG=\n\nChange-Id: 123456789',
1806 [],
1807 squash=True,
1808 expected_upstream_ref='origin/master',
1809 custom_cl_base=custom_cl_base)
1810 self.assertIn(
1811 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1812 sys.stdout.getvalue())
1813
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001814 def test_gerrit_upload_squash_first_with_mirror(self):
1815 self._run_gerrit_upload_test(
1816 ['--squash'],
1817 'desc\nBUG=\n\nChange-Id: 123456789',
1818 [],
1819 squash=True,
1820 expected_upstream_ref='origin/master',
1821 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1822
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001823 def test_gerrit_upload_squash_reupload(self):
1824 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001825 self._run_gerrit_upload_test(
1826 ['--squash'],
1827 description,
1828 [],
1829 squash=True,
1830 expected_upstream_ref='origin/master',
1831 issue=123456)
1832
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001833 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1834 self.mock(git_cl, 'DieWithError',
1835 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1836 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1837 with self.assertRaises(SystemExitMock):
1838 self._run_gerrit_upload_test(
1839 ['--squash'],
1840 description,
1841 [],
1842 squash=True,
1843 expected_upstream_ref='origin/master',
1844 issue=123456,
1845 fetched_status='ABANDONED')
1846
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001847 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1848 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1849 lambda *_, **__: {'email': 'yet-another@example.com'})
1850 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1851 self._run_gerrit_upload_test(
1852 ['--squash'],
1853 description,
1854 [],
1855 squash=True,
1856 expected_upstream_ref='origin/master',
1857 issue=123456,
1858 other_cl_owner='other@example.com')
1859 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001860 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001861 'authenticate to Gerrit as yet-another@example.com.\n'
1862 'Uploading may fail due to lack of permissions',
1863 git_cl.sys.stdout.getvalue())
1864
rmistry@google.com2dd99862015-06-22 12:22:18 +00001865 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001866 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001867 def mock_run_git(*args, **_kwargs):
1868 if args[0] == ['for-each-ref',
1869 '--format=%(refname:short) %(upstream:short)',
1870 'refs/heads']:
1871 # Create a local branch dependency tree that looks like this:
1872 # test1 -> test2 -> test3 -> test4 -> test5
1873 # -> test3.1
1874 # test6 -> test0
1875 branch_deps = [
1876 'test2 test1', # test1 -> test2
1877 'test3 test2', # test2 -> test3
1878 'test3.1 test2', # test2 -> test3.1
1879 'test4 test3', # test3 -> test4
1880 'test5 test4', # test4 -> test5
1881 'test6 test0', # test0 -> test6
1882 'test7', # test7
1883 ]
1884 return '\n'.join(branch_deps)
1885 self.mock(git_cl, 'RunGit', mock_run_git)
1886
1887 class RecordCalls:
1888 times_called = 0
1889 record_calls = RecordCalls()
1890 def mock_CMDupload(*args, **_kwargs):
1891 record_calls.times_called += 1
1892 return 0
1893 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1894
1895 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001896 (('ask_for_data', 'This command will checkout all dependent branches '
1897 'and run "git cl upload". Press Enter to continue, '
1898 'or Ctrl+C to abort'), ''),
1899 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001900
1901 class MockChangelist():
1902 def __init__(self):
1903 pass
1904 def GetBranch(self):
1905 return 'test1'
1906 def GetIssue(self):
1907 return '123'
1908 def GetPatchset(self):
1909 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001910 def IsGerrit(self):
1911 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001912
1913 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1914 # CMDupload should have been called 5 times because of 5 dependent branches.
1915 self.assertEquals(5, record_calls.times_called)
1916 self.assertEquals(0, ret)
1917
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001918 def test_gerrit_change_id(self):
1919 self.calls = [
1920 ((['git', 'write-tree'], ),
1921 'hashtree'),
1922 ((['git', 'rev-parse', 'HEAD~0'], ),
1923 'branch-parent'),
1924 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1925 'A B <a@b.org> 1456848326 +0100'),
1926 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1927 'C D <c@d.org> 1456858326 +0100'),
1928 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1929 'hashchange'),
1930 ]
1931 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1932 self.assertEqual(change_id, 'Ihashchange')
1933
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001934 def test_desecription_append_footer(self):
1935 for init_desc, footer_line, expected_desc in [
1936 # Use unique desc first lines for easy test failure identification.
1937 ('foo', 'R=one', 'foo\n\nR=one'),
1938 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1939 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1940 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1941 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1942 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1943 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1944 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1945 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1946 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1947 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1948 ]:
1949 desc = git_cl.ChangeDescription(init_desc)
1950 desc.append_footer(footer_line)
1951 self.assertEqual(desc.description, expected_desc)
1952
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001953 def test_update_reviewers(self):
1954 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001955 ('foo', [], [],
1956 'foo'),
1957 ('foo\nR=xx', [], [],
1958 'foo\nR=xx'),
1959 ('foo\nTBR=xx', [], [],
1960 'foo\nTBR=xx'),
1961 ('foo', ['a@c'], [],
1962 'foo\n\nR=a@c'),
1963 ('foo\nR=xx', ['a@c'], [],
1964 'foo\n\nR=a@c, xx'),
1965 ('foo\nTBR=xx', ['a@c'], [],
1966 'foo\n\nR=a@c\nTBR=xx'),
1967 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1968 'foo\n\nR=a@c, yy\nTBR=xx'),
1969 ('foo\nBUG=', ['a@c'], [],
1970 'foo\nBUG=\nR=a@c'),
1971 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1972 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1973 ('foo', ['a@c', 'b@c'], [],
1974 'foo\n\nR=a@c, b@c'),
1975 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1976 'foo\nBar\n\nR=c@c\nBUG='),
1977 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1978 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001979 # Same as the line before, but full of whitespaces.
1980 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001981 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001982 'foo\nBar\n\nR=c@c\n BUG =',
1983 ),
1984 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001985 ('foo BUG=allo R=joe ', ['c@c'], [],
1986 'foo BUG=allo R=joe\n\nR=c@c'),
1987 # Redundant TBRs get promoted to Rs
1988 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1989 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001990 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001991 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001992 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001993 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001994 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001995 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001996 actual.append(obj.description)
1997 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001998
Nodir Turakulov23b82142017-11-16 11:04:25 -08001999 def test_get_hash_tags(self):
2000 cases = [
2001 ('', []),
2002 ('a', []),
2003 ('[a]', ['a']),
2004 ('[aa]', ['aa']),
2005 ('[a ]', ['a']),
2006 ('[a- ]', ['a']),
2007 ('[a- b]', ['a-b']),
2008 ('[a--b]', ['a-b']),
2009 ('[a', []),
2010 ('[a]x', ['a']),
2011 ('[aa]x', ['aa']),
2012 ('[a b]', ['a-b']),
2013 ('[a b]', ['a-b']),
2014 ('[a__b]', ['a-b']),
2015 ('[a] x', ['a']),
2016 ('[a][b]', ['a', 'b']),
2017 ('[a] [b]', ['a', 'b']),
2018 ('[a][b]x', ['a', 'b']),
2019 ('[a][b] x', ['a', 'b']),
2020 ('[a]\n[b]', ['a']),
2021 ('[a\nb]', []),
2022 ('[a][', ['a']),
2023 ('Revert "[a] feature"', ['a']),
2024 ('Reland "[a] feature"', ['a']),
2025 ('Revert: [a] feature', ['a']),
2026 ('Reland: [a] feature', ['a']),
2027 ('Revert "Reland: [a] feature"', ['a']),
2028 ('Foo: feature', ['foo']),
2029 ('Foo Bar: feature', ['foo-bar']),
2030 ('Revert "Foo bar: feature"', ['foo-bar']),
2031 ('Reland "Foo bar: feature"', ['foo-bar']),
2032 ]
2033 for desc, expected in cases:
2034 change_desc = git_cl.ChangeDescription(desc)
2035 actual = change_desc.get_hash_tags()
2036 self.assertEqual(
2037 actual,
2038 expected,
2039 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
2040
wittman@chromium.org455dc922015-01-26 20:15:50 +00002041 def test_get_target_ref(self):
2042 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002043 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002044 self.assertEqual(None, git_cl.GetTargetRef(None,
2045 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002046 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002047
wittman@chromium.org455dc922015-01-26 20:15:50 +00002048 # Check default target refs for branches.
2049 self.assertEqual('refs/heads/master',
2050 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002051 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002052 self.assertEqual('refs/heads/master',
2053 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002054 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002055 self.assertEqual('refs/heads/master',
2056 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002057 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002058 self.assertEqual('refs/branch-heads/123',
2059 git_cl.GetTargetRef('origin',
2060 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002061 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002062 self.assertEqual('refs/diff/test',
2063 git_cl.GetTargetRef('origin',
2064 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002065 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00002066 self.assertEqual('refs/heads/chrome/m42',
2067 git_cl.GetTargetRef('origin',
2068 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002069 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002070
2071 # Check target refs for user-specified target branch.
2072 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
2073 'refs/remotes/branch-heads/123'):
2074 self.assertEqual('refs/branch-heads/123',
2075 git_cl.GetTargetRef('origin',
2076 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002077 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002078 for branch in ('origin/master', 'remotes/origin/master',
2079 'refs/remotes/origin/master'):
2080 self.assertEqual('refs/heads/master',
2081 git_cl.GetTargetRef('origin',
2082 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002083 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002084 for branch in ('master', 'heads/master', 'refs/heads/master'):
2085 self.assertEqual('refs/heads/master',
2086 git_cl.GetTargetRef('origin',
2087 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002088 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002089
wychen@chromium.orga872e752015-04-28 23:42:18 +00002090 def test_patch_when_dirty(self):
2091 # Patch when local tree is dirty
2092 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2093 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2094
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002095 @staticmethod
2096 def _get_gerrit_codereview_server_calls(branch, value=None,
2097 git_short_host='host',
2098 detect_branch=True):
2099 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2100
2101 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2102 """
2103 calls = []
2104 if detect_branch:
2105 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
2106 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2107 CERR1 if value is None else value))
2108 if value is None:
2109 calls += [
2110 ((['git', 'config', 'branch.' + branch + '.merge'],),
2111 'refs/heads' + branch),
2112 ((['git', 'config', 'branch.' + branch + '.remote'],),
2113 'origin'),
2114 ((['git', 'config', 'remote.origin.url'],),
2115 'https://%s.googlesource.com/my/repo' % git_short_host),
2116 ]
2117 return calls
2118
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002119 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002120 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002121 detect_gerrit_server=True,
2122 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002123 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002124 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2125 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002126 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002127 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002128 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2129
tandriidf09a462016-08-18 16:23:55 -07002130 if new_branch:
2131 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002132
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002133 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002134 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002135 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002136 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002137 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2138 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2139 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2140 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002141 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002142 if default_codereview == 'gerrit':
2143 if not force_codereview:
2144 self.calls += [
2145 ((['git', 'config', 'gerrit.host'],), 'true'),
2146 ]
2147 if detect_gerrit_server:
2148 self.calls += self._get_gerrit_codereview_server_calls(
2149 'master', git_short_host=git_short_host,
2150 detect_branch=not new_branch and force_codereview)
2151 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002152
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002153 elif default_codereview == 'rietveld':
2154 self.calls += [
2155 ((['git', 'config', 'gerrit.host'],), CERR1),
2156 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2157 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2158 ]
2159 actual_codereview = 'rietveld'
2160
2161 if actual_codereview == 'rietveld':
2162 self.calls += [
2163 ((['git', 'rev-parse', '--show-cdup'],), ''),
2164 ]
2165 if not default_codereview:
2166 self.calls += [
2167 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2168 ]
2169 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002170 self.calls += [
2171 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002172 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002173 {
2174 'current_revision': '7777777777',
2175 'revisions': {
2176 '1111111111': {
2177 '_number': 1,
2178 'fetch': {'http': {
2179 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2180 'ref': 'refs/changes/56/123456/1',
2181 }},
2182 },
2183 '7777777777': {
2184 '_number': 7,
2185 'fetch': {'http': {
2186 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2187 'ref': 'refs/changes/56/123456/7',
2188 }},
2189 },
2190 },
2191 }),
2192 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002193
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002194 def _common_patch_rietveld_successful(self, **kwargs):
2195 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002196 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002197 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002198 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002199 ((['git', 'config', 'branch.master.rietveldserver',
2200 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002201 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002202 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002203 ((['git', 'commit', '-m',
2204 'Description\n\n' +
2205 'patch from issue 123456 at patchset 60001 ' +
2206 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002207 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002208
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002209 def test_patch_rietveld_default(self):
2210 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002211 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2212
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002213 def test_patch_rietveld_successful_new_branch(self):
2214 self._common_patch_rietveld_successful(default_codereview='rietveld',
2215 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002216 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2217
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002218 def test_patch_rietveld_guess_by_url(self):
2219 self._common_patch_rietveld_successful(
2220 default_codereview=None, # It doesn't matter.
2221 actual_codereview='rietveld')
2222 self.assertEqual(git_cl.main(
2223 ['patch', 'https://codereview.example.com/123456']), 0)
2224
2225 def test_patch_rietveld_conflict(self):
2226 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002227 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002228 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002229
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002230 def test_patch_gerrit_default(self):
2231 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002232 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002233 self.calls += [
2234 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2235 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002236 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002237 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002238 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002239 ((['git', 'config', 'branch.master.gerritserver',
2240 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002241 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002242 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2243 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2244 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002245 ]
2246 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2247
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002248 def test_patch_gerrit_force(self):
2249 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002250 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002251 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002252 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002253 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002254 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002255 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002256 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002257 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002258 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002259 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002260 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2261 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2262 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002263 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002264 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002265
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002266 def test_patch_gerrit_guess_by_url(self):
2267 self._patch_common(
2268 default_codereview=None, # It doesn't matter what's default.
2269 actual_codereview='gerrit',
2270 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002271 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002272 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002273 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002274 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002275 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002276 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002277 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002278 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002279 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002280 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002281 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2282 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2283 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002284 ]
2285 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002286 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002287
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002288 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2289 self._patch_common(
2290 default_codereview=None, # It doesn't matter what's default.
2291 actual_codereview='gerrit',
2292 git_short_host='else', detect_gerrit_server=False)
2293 self.calls += [
2294 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2295 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002296 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002297 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2298 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2299 ''),
2300 ((['git', 'config', 'branch.master.gerritserver',
2301 'https://else-review.googlesource.com'],), ''),
2302 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002303 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2304 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2305 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002306 ]
2307 self.assertEqual(git_cl.main(
2308 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2309
2310 def test_patch_gerrit_conflict(self):
2311 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002312 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002313 self.calls += [
2314 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002315 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002316 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2317 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2318 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002319 ]
2320 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002321 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002322
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002323 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002324 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002325 raise git_cl.gerrit_util.GerritError(404, '')
2326 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2327
tandriic2405f52016-10-10 08:13:15 -07002328 self.calls = [
2329 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002330 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2331 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2332 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2333 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002334 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2335 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2336 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2337 ((['git', 'config', 'remote.origin.url'],),
2338 'https://chromium.googlesource.com/my/repo'),
2339 ((['DieWithError',
2340 'change 123456 at https://chromium-review.googlesource.com does not '
2341 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002342 ]
2343 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002344 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002345
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002346 def _checkout_calls(self):
2347 return [
2348 ((['git', 'config', '--local', '--get-regexp',
2349 'branch\\..*\\.rietveldissue'], ),
2350 ('branch.retrying.rietveldissue 1111111111\n'
2351 'branch.some-fix.rietveldissue 2222222222\n')),
2352 ((['git', 'config', '--local', '--get-regexp',
2353 'branch\\..*\\.gerritissue'], ),
2354 ('branch.ger-branch.gerritissue 123456\n'
2355 'branch.gbranch654.gerritissue 654321\n')),
2356 ]
2357
2358 def test_checkout_gerrit(self):
2359 """Tests git cl checkout <issue>."""
2360 self.calls = self._checkout_calls()
2361 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2362 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2363
2364 def test_checkout_rietveld(self):
2365 """Tests git cl checkout <issue>."""
2366 self.calls = self._checkout_calls()
2367 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2368 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2369
2370 def test_checkout_not_found(self):
2371 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002372 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002373 self.calls = self._checkout_calls()
2374 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2375
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002376 def test_checkout_no_branch_issues(self):
2377 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002378 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002379 self.calls = [
2380 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002381 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002382 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002383 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002384 ]
2385 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2386
tandrii@chromium.org28253532016-04-14 13:46:56 +00002387 def _test_gerrit_ensure_authenticated_common(self, auth,
2388 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002389 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2390 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2391 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002392 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002393 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002394 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002395 cl.branch = 'master'
2396 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002397 cl.lookedup_issue = True
2398 return cl
2399
2400 def test_gerrit_ensure_authenticated_missing(self):
2401 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002402 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002403 })
2404 self.calls.append(
2405 ((['DieWithError',
2406 'Credentials for the following hosts are required:\n'
2407 ' chromium-review.googlesource.com\n'
2408 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002409 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002410 'https://chromium-review.googlesource.com/new-password'],), ''),)
2411 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2412
2413 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002414 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002415 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002416 'chromium.googlesource.com':
2417 ('git-one.example.com', None, 'secret1'),
2418 'chromium-review.googlesource.com':
2419 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002420 })
2421 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002422 (('ask_for_data', 'If you know what you are doing '
2423 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002424 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2425
2426 def test_gerrit_ensure_authenticated_ok(self):
2427 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002428 'chromium.googlesource.com':
2429 ('git-same.example.com', None, 'secret'),
2430 'chromium-review.googlesource.com':
2431 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002432 })
2433 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2434
tandrii@chromium.org28253532016-04-14 13:46:56 +00002435 def test_gerrit_ensure_authenticated_skipped(self):
2436 cl = self._test_gerrit_ensure_authenticated_common(
2437 auth={}, skip_auth_check=True)
2438 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2439
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002440 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002441 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2442 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002443 self.calls = [
2444 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002445 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002446 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2447 ((['git', 'config', 'rietveld.server'],), ''),
2448 ((['git', 'config', 'rietveld.server'],), ''),
2449 ((['git', 'config', 'branch.feature.rietveldserver'],),
2450 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002451 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002452 ]
2453 self.assertEqual(0, git_cl.main(['set-commit']))
2454
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002455 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002456 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002457 lambda h, i, labels, notify=None:
2458 self._mocked_call(['SetReview', h, i, labels, notify]))
2459
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002460 self.calls = [
2461 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002462 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2463 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002464 ((['git', 'config', 'branch.feature.gerritserver'],),
2465 'https://chromium-review.googlesource.com'),
2466 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002467 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002468 ]
tandriid9e5ce52016-07-13 02:32:59 -07002469
2470 def test_cmd_set_commit_gerrit_clear(self):
2471 self._cmd_set_commit_gerrit_common(0)
2472 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2473
2474 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002475 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002476 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2477
tandriid9e5ce52016-07-13 02:32:59 -07002478 def test_cmd_set_commit_gerrit(self):
2479 self._cmd_set_commit_gerrit_common(2)
2480 self.assertEqual(0, git_cl.main(['set-commit']))
2481
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002482 def test_description_display(self):
2483 out = StringIO.StringIO()
2484 self.mock(git_cl.sys, 'stdout', out)
2485
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002486 self.mock(git_cl, 'Changelist', ChangelistMock)
2487 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002488
2489 self.assertEqual(0, git_cl.main(['description', '-d']))
2490 self.assertEqual('foo\n', out.getvalue())
2491
2492 def test_description_rietveld(self):
2493 out = StringIO.StringIO()
2494 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002495 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002496
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002497 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002498 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002499 self.assertEqual('foobar\n', out.getvalue())
2500
iannucci3c972b92016-08-17 13:24:10 -07002501 def test_StatusFieldOverrideIssueMissingArgs(self):
2502 out = StringIO.StringIO()
2503 self.mock(git_cl.sys, 'stderr', out)
2504
2505 try:
2506 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2507 except SystemExit as ex:
2508 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002509 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002510
2511 out = StringIO.StringIO()
2512 self.mock(git_cl.sys, 'stderr', out)
2513
2514 try:
2515 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2516 except SystemExit as ex:
2517 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002518 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002519
2520 def test_StatusFieldOverrideIssue(self):
2521 out = StringIO.StringIO()
2522 self.mock(git_cl.sys, 'stdout', out)
2523
2524 def assertIssue(cl_self, *_args):
2525 self.assertEquals(cl_self.issue, 1)
2526 return 'foobar'
2527
2528 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2529 self.calls = [
2530 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2531 ((['git', 'config', 'rietveld.server'],), ''),
2532 ((['git', 'config', 'rietveld.server'],), ''),
2533 ]
iannuccie53c9352016-08-17 14:40:40 -07002534 self.assertEqual(
2535 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2536 0)
iannucci3c972b92016-08-17 13:24:10 -07002537 self.assertEqual(out.getvalue(), 'foobar\n')
2538
iannuccie53c9352016-08-17 14:40:40 -07002539 def test_SetCloseOverrideIssue(self):
2540 def assertIssue(cl_self, *_args):
2541 self.assertEquals(cl_self.issue, 1)
2542 return 'foobar'
2543
2544 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2545 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2546 self.calls = [
2547 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2548 ((['git', 'config', 'rietveld.server'],), ''),
2549 ((['git', 'config', 'rietveld.server'],), ''),
2550 ]
2551 self.assertEqual(
2552 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2553
2554 def test_SetCommitOverrideIssue(self):
2555 def assertIssue(cl_self, *_args):
2556 self.assertEquals(cl_self.issue, 1)
2557 return 'foobar'
2558
2559 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2560 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2561 self.calls = [
2562 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2563 ((['git', 'config', 'rietveld.server'],), ''),
2564 ((['git', 'config', 'rietveld.server'],), ''),
2565 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2566 ((['git', 'config', 'rietveld.server'],), ''),
2567 ((['git', 'config', 'rietveld.server'],), ''),
2568 ]
2569 self.assertEqual(
2570 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2571
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002572 def test_description_gerrit(self):
2573 out = StringIO.StringIO()
2574 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002575 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002576 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002577 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2578 {
2579 'current_revision': 'sha1',
2580 'revisions': {'sha1': {
2581 'commit': {'message': 'foobar'},
2582 }},
2583 }),
2584 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002585 self.assertEqual(0, git_cl.main([
2586 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2587 self.assertEqual('foobar\n', out.getvalue())
2588
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002589 def test_description_set_raw(self):
2590 out = StringIO.StringIO()
2591 self.mock(git_cl.sys, 'stdout', out)
2592
2593 self.mock(git_cl, 'Changelist', ChangelistMock)
2594 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2595
2596 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2597 self.assertEqual('hihi', ChangelistMock.desc)
2598
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002599 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002600 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002601
2602 def RunEditor(desc, _, **kwargs):
2603 self.assertEquals(
2604 '# Enter a description of the change.\n'
2605 '# This will be displayed on the codereview site.\n'
2606 '# The first line will also be used as the subject of the review.\n'
2607 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002608 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002609 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002610 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002611 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002612 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002613
dsansomee2d6fd92016-09-08 00:10:47 -07002614 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002615 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002616
2617 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2618 self.mock(git_cl.Changelist, 'GetDescription',
2619 lambda *args: current_desc)
2620 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2621 UpdateDescriptionRemote)
2622 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2623
2624 self.calls = [
2625 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002626 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002627 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2628 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002629 ((['git', 'config', 'core.editor'],), 'vi'),
2630 ]
2631 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2632
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002633 def test_description_set_stdin(self):
2634 out = StringIO.StringIO()
2635 self.mock(git_cl.sys, 'stdout', out)
2636
2637 self.mock(git_cl, 'Changelist', ChangelistMock)
2638 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2639
2640 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2641 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2642
kmarshall3bff56b2016-06-06 18:31:47 -07002643 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002644 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2645
kmarshall3bff56b2016-06-06 18:31:47 -07002646 self.calls = \
2647 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2648 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002649 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002650 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2651 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002652 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2653 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2654 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002655 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2656 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2657 ((['git', 'branch', '-D', 'foo'],), '')]
2658
kmarshall3bff56b2016-06-06 18:31:47 -07002659 self.mock(git_cl, 'get_cl_statuses',
2660 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002661 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2662 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2663 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002664
2665 self.assertEqual(0, git_cl.main(['archive', '-f']))
2666
2667 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002668 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002669 self.calls = \
2670 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2671 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002672 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002673 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2674 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002675 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2676
kmarshall9249e012016-08-23 12:02:16 -07002677 self.mock(git_cl, 'get_cl_statuses',
2678 lambda branches, fine_grained, max_processes:
2679 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2680
2681 self.assertEqual(1, git_cl.main(['archive', '-f']))
2682
2683 def test_archive_dry_run(self):
2684 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2685
2686 self.calls = \
2687 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2688 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2689 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2690 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2691 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2692 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2693 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2694 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2695 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002696
2697 self.mock(git_cl, 'get_cl_statuses',
2698 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002699 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2700 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2701 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002702
kmarshall9249e012016-08-23 12:02:16 -07002703 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2704
2705 def test_archive_no_tags(self):
2706 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2707
2708 self.calls = \
2709 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2710 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2711 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2712 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2713 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2714 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2715 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2716 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2717 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2718 ((['git', 'branch', '-D', 'foo'],), '')]
2719
2720 self.mock(git_cl, 'get_cl_statuses',
2721 lambda branches, fine_grained, max_processes:
2722 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2723 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2724 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2725
2726 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002727
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002728 def test_cmd_issue_erase_existing(self):
2729 out = StringIO.StringIO()
2730 self.mock(git_cl.sys, 'stdout', out)
2731 self.calls = [
2732 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002733 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2734 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002735 # Let this command raise exception (retcode=1) - it should be ignored.
2736 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002737 CERR1),
2738 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2739 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002740 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2741 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2742 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002743 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002744 ]
2745 self.assertEqual(0, git_cl.main(['issue', '0']))
2746
Aaron Gable400e9892017-07-12 15:31:21 -07002747 def test_cmd_issue_erase_existing_with_change_id(self):
2748 out = StringIO.StringIO()
2749 self.mock(git_cl.sys, 'stdout', out)
2750 self.mock(git_cl.Changelist, 'GetDescription',
2751 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2752 self.calls = [
2753 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2754 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2755 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002756 # Let this command raise exception (retcode=1) - it should be ignored.
2757 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2758 CERR1),
2759 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2760 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2761 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2762 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2763 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002764 ((['git', 'log', '-1', '--format=%B'],),
2765 'This is a description\n\nChange-Id: Ideadbeef'),
2766 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002767 ]
2768 self.assertEqual(0, git_cl.main(['issue', '0']))
2769
phajdan.jre328cf92016-08-22 04:12:17 -07002770 def test_cmd_issue_json(self):
2771 out = StringIO.StringIO()
2772 self.mock(git_cl.sys, 'stdout', out)
2773 self.calls = [
2774 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002775 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002776 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2777 ((['git', 'config', 'rietveld.server'],),
2778 'https://codereview.chromium.org'),
2779 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2780 (('write_json', 'output.json',
2781 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2782 ''),
2783 ]
2784 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2785
tandriide281ae2016-10-12 06:02:30 -07002786 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002787 self.mock(git_cl.Changelist, 'GetChange',
2788 lambda _, *a: (
2789 self._mocked_call(['GetChange']+list(a))))
2790 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2791 lambda *_, **__: (
2792 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002793 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2794 lambda _, s: self._mocked_call(['SetCQState', s]))
2795 self.calls = [
2796 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002797 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002798 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2799 ((['git', 'config', 'rietveld.server'],),
2800 'https://codereview.chromium.org'),
2801 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2802 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2803 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2804 ((['get_or_create_merge_base', 'feature', 'feature'],),
2805 'fake_ancestor_sha'),
2806 ((['GetChange', 'fake_ancestor_sha', None], ),
2807 git_cl.presubmit_support.GitChange(
2808 '', '', '', '', '', '', '', '')),
2809 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2810 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002811 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2812 ]
2813 out = StringIO.StringIO()
2814 self.mock(git_cl.sys, 'stdout', out)
2815 self.assertEqual(0, git_cl.main(['try']))
2816 self.assertEqual(
2817 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002818 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002819
tandrii8c5a3532016-11-04 07:52:02 -07002820 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2821 self.mock(git_cl.Changelist, 'GetChange',
2822 lambda _, *a: (
2823 self._mocked_call(['GetChange']+list(a))))
2824 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2825 lambda *_, **__: (
2826 self._mocked_call(['DoGetTryMasters'])))
2827 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2828 lambda _, s: self._mocked_call(['SetCQState', s]))
2829
tandrii8c5a3532016-11-04 07:52:02 -07002830 self.calls = [
2831 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2832 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2833 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2834 ((['git', 'config', 'branch.feature.gerritserver'],),
2835 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002836 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2837 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2838 'project': 'depot_tools',
2839 'status': 'OPEN',
2840 'owner': {'email': 'owner@e.mail'},
2841 'revisions': {
2842 'deadbeaf': {
2843 '_number': 6,
2844 },
2845 'beeeeeef': {
2846 '_number': 7,
2847 'fetch': {'http': {
2848 'url': 'https://chromium.googlesource.com/depot_tools',
2849 'ref': 'refs/changes/56/123456/7'
2850 }},
2851 },
2852 },
2853 }),
tandrii8c5a3532016-11-04 07:52:02 -07002854 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2855 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2856 ((['get_or_create_merge_base', 'feature', 'feature'],),
2857 'fake_ancestor_sha'),
2858 ((['GetChange', 'fake_ancestor_sha', None], ),
2859 git_cl.presubmit_support.GitChange(
2860 '', '', '', '', '', '', '', '')),
2861 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2862 ((['DoGetTryMasters'], ), None),
2863 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2864 ]
2865 out = StringIO.StringIO()
2866 self.mock(git_cl.sys, 'stdout', out)
2867 self.assertEqual(0, git_cl.main(['try']))
2868 self.assertEqual(
2869 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002870 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002871 'https://chromium-review.googlesource.com/123456\n')
2872
2873 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2874 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2875 lambda _: {
2876 'owner_email': 'owner@e.mail',
2877 'private': False,
2878 'closed': False,
2879 'project': 'depot_tools',
2880 'patchsets': [20001],
2881 })
tandriide281ae2016-10-12 06:02:30 -07002882 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2883 self.calls = [
2884 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2885 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2886 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2887 ((['git', 'config', 'rietveld.server'],),
2888 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002889 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002890 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002891 ]
2892
2893 def _buildbucket_retry(*_, **kw):
2894 # self.maxDiff = 10000
2895 body = json.loads(kw['body'])
2896 self.assertEqual(len(body['builds']), 1)
2897 build = body['builds'][0]
2898 params = json.loads(build.pop('parameters_json'))
2899 self.assertEqual(params, {
2900 u'builder_name': u'win',
2901 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2902 u'revision': None}],
2903 u'properties': {
2904 u'category': u'git_cl_try',
2905 u'issue': 123,
2906 u'key': u'val',
2907 u'json': [{u'a': 1}, None],
2908 u'master': u'tryserver.chromium',
2909 u'patch_project': u'depot_tools',
2910 u'patch_storage': u'rietveld',
2911 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002912 u'rietveld': u'https://codereview.chromium.org',
2913 }
2914 })
2915 self.assertEqual(build, {
2916 u'bucket': u'master.tryserver.chromium',
2917 u'client_operation_id': u'uuid4',
2918 u'tags': [u'builder:win',
2919 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002920 u'user_agent:git_cl_try',
2921 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002922 })
2923
2924 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2925
2926 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2927 self.assertEqual(0, git_cl.main([
2928 'try', '-m', 'tryserver.chromium', '-b', 'win',
2929 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2930 self.assertRegexpMatches(
2931 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002932 'Tried jobs on:\nBucket: master.tryserver.chromium')
2933
tandrii8c5a3532016-11-04 07:52:02 -07002934 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2935 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2936 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2937
tandrii8c5a3532016-11-04 07:52:02 -07002938 self.calls = [
2939 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2940 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2941 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2942 ((['git', 'config', 'branch.feature.gerritserver'],),
2943 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002944 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002945 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002946 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002947 'status': 'OPEN',
2948 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002949 'revisions': {
2950 'deadbeaf': {
2951 '_number': 6,
2952 },
2953 'beeeeeef': {
2954 '_number': 7,
2955 'fetch': {'http': {
2956 'url': 'https://chromium.googlesource.com/depot_tools',
2957 'ref': 'refs/changes/56/123456/7'
2958 }},
2959 },
2960 },
2961 }),
2962 ]
2963
2964 def _buildbucket_retry(*_, **kw):
2965 # self.maxDiff = 10000
2966 body = json.loads(kw['body'])
2967 self.assertEqual(len(body['builds']), 1)
2968 build = body['builds'][0]
2969 params = json.loads(build.pop('parameters_json'))
2970 self.assertEqual(params, {
2971 u'builder_name': u'win',
2972 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2973 u'revision': None}],
2974 u'properties': {
2975 u'category': u'git_cl_try',
2976 u'key': u'val',
2977 u'json': [{u'a': 1}, None],
2978 u'master': u'tryserver.chromium',
2979
2980 u'patch_gerrit_url':
2981 u'https://chromium-review.googlesource.com',
2982 u'patch_issue': 123456,
2983 u'patch_project': u'depot_tools',
2984 u'patch_ref': u'refs/changes/56/123456/7',
2985 u'patch_repository_url':
2986 u'https://chromium.googlesource.com/depot_tools',
2987 u'patch_set': 7,
2988 u'patch_storage': u'gerrit',
2989 }
2990 })
2991 self.assertEqual(build, {
2992 u'bucket': u'master.tryserver.chromium',
2993 u'client_operation_id': u'uuid4',
2994 u'tags': [
2995 u'builder:win',
2996 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2997 u'user_agent:git_cl_try',
2998 u'master:tryserver.chromium'],
2999 })
3000
3001 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3002
3003 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3004 self.assertEqual(0, git_cl.main([
3005 'try', '-m', 'tryserver.chromium', '-b', 'win',
3006 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3007 self.assertRegexpMatches(
3008 git_cl.sys.stdout.getvalue(),
3009 'Tried jobs on:\nBucket: master.tryserver.chromium')
3010
borenet6c0efe62016-10-19 08:13:29 -07003011 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07003012 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
3013 lambda _: {
3014 'owner_email': 'owner@e.mail',
3015 'private': False,
3016 'closed': False,
3017 'project': 'depot_tools',
3018 'patchsets': [20001],
3019 })
borenet6c0efe62016-10-19 08:13:29 -07003020 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
3021 self.calls = [
3022 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3023 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3024 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3025 ((['git', 'config', 'rietveld.server'],),
3026 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07003027 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07003028 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07003029 ]
3030
3031 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07003032 body = json.loads(kw['body'])
3033 self.assertEqual(len(body['builds']), 1)
3034 build = body['builds'][0]
3035 params = json.loads(build.pop('parameters_json'))
3036 self.assertEqual(params, {
3037 u'builder_name': u'win',
3038 u'changes': [{u'author': {u'email': u'owner@e.mail'},
3039 u'revision': None}],
3040 u'properties': {
3041 u'category': u'git_cl_try',
3042 u'issue': 123,
3043 u'patch_project': u'depot_tools',
3044 u'patch_storage': u'rietveld',
3045 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07003046 u'rietveld': u'https://codereview.chromium.org',
3047 }
3048 })
3049 self.assertEqual(build, {
3050 u'bucket': u'test.bucket',
3051 u'client_operation_id': u'uuid4',
3052 u'tags': [u'builder:win',
3053 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
3054 u'user_agent:git_cl_try'],
3055 })
3056
3057 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3058
3059 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3060 self.assertEqual(0, git_cl.main([
3061 'try', '-B', 'test.bucket', '-b', 'win']))
3062 self.assertRegexpMatches(
3063 git_cl.sys.stdout.getvalue(),
3064 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07003065
qyearsley123a4682016-10-26 09:12:17 -07003066 def test_git_cl_try_bots_on_multiple_masters(self):
3067 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
3068 self.calls = [
3069 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3070 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3071 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3072 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07003073 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07003074 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
3075 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3076 ]
3077
3078 def _buildbucket_retry(*_, **kw):
3079 body = json.loads(kw['body'])
3080 self.assertEqual(len(body['builds']), 2)
3081
3082 first_build_params = json.loads(body['builds'][0]['parameters_json'])
3083 self.assertEqual(first_build_params['builder_name'], 'builder1')
3084 self.assertEqual(first_build_params['properties']['master'], 'master1')
3085
3086 first_build_params = json.loads(body['builds'][1]['parameters_json'])
3087 self.assertEqual(first_build_params['builder_name'], 'builder2')
3088 self.assertEqual(first_build_params['properties']['master'], 'master2')
3089
3090 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3091
3092 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
3093 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3094
3095 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3096 self.assertEqual(
3097 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3098 self.assertEqual(
3099 git_cl.sys.stdout.getvalue(),
3100 'Tried jobs on:\n'
3101 'Bucket: master.master1\n'
3102 ' builder1: []\n'
3103 'Bucket: master.master2\n'
3104 ' builder2: []\n'
3105 'To see results here, run: git cl try-results\n'
3106 'To see results in browser, run: git cl web\n')
3107
tandrii16e0b4e2016-06-07 10:34:28 -07003108 def _common_GerritCommitMsgHookCheck(self):
3109 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3110 self.mock(git_cl.os.path, 'abspath',
3111 lambda path: self._mocked_call(['abspath', path]))
3112 self.mock(git_cl.os.path, 'exists',
3113 lambda path: self._mocked_call(['exists', path]))
3114 self.mock(git_cl.gclient_utils, 'FileRead',
3115 lambda path: self._mocked_call(['FileRead', path]))
3116 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3117 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3118 self.calls = [
3119 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3120 ((['abspath', '../'],), '/abs/git_repo_root'),
3121 ]
3122 return git_cl.Changelist(codereview='gerrit', issue=123)
3123
3124 def test_GerritCommitMsgHookCheck_custom_hook(self):
3125 cl = self._common_GerritCommitMsgHookCheck()
3126 self.calls += [
3127 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3128 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3129 '#!/bin/sh\necho "custom hook"')
3130 ]
3131 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3132
3133 def test_GerritCommitMsgHookCheck_not_exists(self):
3134 cl = self._common_GerritCommitMsgHookCheck()
3135 self.calls += [
3136 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3137 ]
3138 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3139
3140 def test_GerritCommitMsgHookCheck(self):
3141 cl = self._common_GerritCommitMsgHookCheck()
3142 self.calls += [
3143 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3144 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3145 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003146 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003147 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3148 ''),
3149 ]
3150 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3151
tandriic4344b52016-08-29 06:04:54 -07003152 def test_GerritCmdLand(self):
3153 self.calls += [
3154 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3155 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3156 'deadbeaf'),
3157 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3158 ((['git', 'config', 'branch.feature.gerritserver'],),
3159 'chromium-review.googlesource.com'),
3160 ]
3161 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3162 cl._codereview_impl._GetChangeDetail = lambda _: {
3163 'labels': {},
3164 'current_revision': 'deadbeaf',
3165 }
agable32978d92016-11-01 12:55:02 -07003166 cl._codereview_impl._GetChangeCommit = lambda: {
3167 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003168 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003169 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3170 }
tandriic4344b52016-08-29 06:04:54 -07003171 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003172 out = StringIO.StringIO()
3173 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003174 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003175 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003176 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003177
tandrii221ab252016-10-06 08:12:04 -07003178 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08003179 '9000': {
3180 'id': '9000',
3181 'bucket': 'master.x.y',
3182 'created_by': 'user:someone@chromium.org',
3183 'created_ts': '147200002222000',
3184 'experimental': False,
3185 'parameters_json': json.dumps({
3186 'builder_name': 'my-bot',
3187 'properties': {'category': 'cq'},
3188 }),
3189 'status': 'STARTED',
3190 'tags': [
3191 'build_address:x.y/my-bot/2',
3192 'builder:my-bot',
3193 'experimental:false',
3194 'user_agent:cq',
3195 ],
3196 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3197 },
3198 '8000': {
3199 'id': '8000',
3200 'bucket': 'master.x.y',
3201 'created_by': 'user:someone@chromium.org',
3202 'created_ts': '147200001111000',
3203 'experimental': False,
3204 'failure_reason': 'BUILD_FAILURE',
3205 'parameters_json': json.dumps({
3206 'builder_name': 'my-bot',
3207 'properties': {'category': 'cq'},
3208 }),
3209 'result_details_json': json.dumps({
3210 'properties': {'buildnumber': 1},
3211 }),
3212 'result': 'FAILURE',
3213 'status': 'COMPLETED',
3214 'tags': [
3215 'build_address:x.y/my-bot/1',
3216 'builder:my-bot',
3217 'experimental:false',
3218 'user_agent:cq',
3219 ],
3220 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3221 },
3222 }
tandrii221ab252016-10-06 08:12:04 -07003223
3224 def test_write_try_results_json(self):
3225 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08003226 {
3227 'bucket': 'master.x.y',
3228 'buildbucket_id': '8000',
3229 'builder_name': 'my-bot',
3230 'created_ts': '147200001111000',
3231 'experimental': False,
3232 'failure_reason': 'BUILD_FAILURE',
3233 'result': 'FAILURE',
3234 'status': 'COMPLETED',
3235 'tags': [
3236 'build_address:x.y/my-bot/1',
3237 'builder:my-bot',
3238 'experimental:false',
3239 'user_agent:cq',
3240 ],
3241 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3242 },
3243 {
3244 'bucket': 'master.x.y',
3245 'buildbucket_id': '9000',
3246 'builder_name': 'my-bot',
3247 'created_ts': '147200002222000',
3248 'experimental': False,
3249 'failure_reason': None,
3250 'result': None,
3251 'status': 'STARTED',
3252 'tags': [
3253 'build_address:x.y/my-bot/2',
3254 'builder:my-bot',
3255 'experimental:false',
3256 'user_agent:cq',
3257 ],
3258 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3259 },
tandrii221ab252016-10-06 08:12:04 -07003260 ]
3261 self.calls = [(('write_json', 'output.json', expected_output), '')]
3262 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3263
tandrii45b2a582016-10-11 03:14:16 -07003264 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003265 out = StringIO.StringIO()
3266 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003267 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3268 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003269 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3270 self._mocked_call(['get_authenticator_for_host', host]))
3271 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3272 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003273
3274 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3275 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003276 self.calls += [
3277 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3278 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3279 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3280 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3281 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3282 ((['git', 'config', 'branch.feature.rietveldserver'],),
3283 'codereview.example.com'),
3284 ((['get_authenticator_for_host', 'codereview.example.com'],),
3285 AuthenticatorMock()),
3286 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3287
3288 def test_fetch_try_jobs_none_rietveld(self):
3289 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003290 # Simulate that user isn't logged in.
3291 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003292 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003293 self.assertRegexpMatches(sys.stdout.getvalue(),
3294 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003295 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3296
3297 def test_fetch_try_jobs_some_rietveld(self):
3298 self._setup_fetch_try_jobs_rietveld({
3299 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3300 })
3301 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003302 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3303 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3304 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3305
3306 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3307 self._setup_fetch_try_jobs(most_recent_patchset=13)
3308 self.calls += [
3309 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3310 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3311 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003312 # TODO(tandrii): Uncomment the below if we decide to support checking
3313 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003314 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003315 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003316 ((['git', 'config', 'branch.feature.gerritserver'],),
3317 'https://x-review.googlesource.com'),
3318 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3319 AuthenticatorMock()),
3320 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3321
3322 def test_fetch_try_jobs_none_gerrit(self):
3323 self._setup_fetch_try_jobs_gerrit({})
3324 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003325 # TODO(tandrii): Uncomment the below if we decide to support checking
3326 # patchsets for Gerrit.
3327 # self.assertRegexpMatches(
3328 # sys.stdout.getvalue(),
3329 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003330 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3331
3332 def test_fetch_try_jobs_some_gerrit(self):
3333 self._setup_fetch_try_jobs_gerrit({
3334 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3335 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003336 # TODO(tandrii): Uncomment the below if we decide to support checking
3337 # patchsets for Gerrit.
3338 # self.calls.remove(
3339 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003340 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3341
3342 # ... and doesn't result in warning.
3343 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3344 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003345 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3346 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3347
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003348 def _mock_gerrit_changes_for_detail_cache(self):
3349 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003350
3351 def test_gerrit_change_detail_cache_normalize(self):
3352 self._mock_gerrit_changes_for_detail_cache()
3353 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003354 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003355 ]
3356 cl = git_cl.Changelist(codereview='gerrit')
3357 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3358 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3359 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3360 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3361
3362 def test_gerrit_change_detail_cache_simple(self):
3363 self._mock_gerrit_changes_for_detail_cache()
3364 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003365 (('GetChangeDetail', 'host', '1', []), 'a'),
3366 (('GetChangeDetail', 'host', '2', []), 'b'),
3367 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003368 ]
3369 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3370 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3371 self.assertEqual(cl._GetChangeDetail(), 'a')
3372 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003373 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003374 self.assertEqual(cl._GetChangeDetail(), 'a')
3375 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3376
3377 def test_gerrit_change_detail_cache_options(self):
3378 self._mock_gerrit_changes_for_detail_cache()
3379 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003380 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3381 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3382 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3383 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003384 ]
3385 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3386 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3387 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3388 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3389 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3390 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3391 self.assertEqual(cl._GetChangeDetail(), 'cab')
3392
3393 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3394 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3395 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3396 self.assertEqual(cl._GetChangeDetail(), 'cab')
3397
3398 # Finally, no_cache should invalidate all caches for given change.
3399 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3400 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3401
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003402 def test_gerrit_description_caching(self):
3403 def gen_detail(rev, desc):
3404 return {
3405 'current_revision': rev,
3406 'revisions': {rev: {'commit': {'message': desc}}}
3407 }
3408 self.calls = [
3409 (('GetChangeDetail', 'host', '1',
3410 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3411 gen_detail('rev1', 'desc1')),
3412 (('GetChangeDetail', 'host', '1',
3413 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3414 gen_detail('rev2', 'desc2')),
3415 ]
3416
3417 self._mock_gerrit_changes_for_detail_cache()
3418 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3419 self.assertEqual(cl.GetDescription(), 'desc1')
3420 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3421 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003422
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003423 def test_print_current_creds(self):
3424 class CookiesAuthenticatorMock(object):
3425 def __init__(self):
3426 self.gitcookies = {
3427 'host.googlesource.com': ('user', 'pass'),
3428 'host-review.googlesource.com': ('user', 'pass'),
3429 }
3430 self.netrc = self
3431 self.netrc.hosts = {
3432 'github.com': ('user2', None, 'pass2'),
3433 'host2.googlesource.com': ('user3', None, 'pass'),
3434 }
3435 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3436 CookiesAuthenticatorMock)
3437 self.mock(sys, 'stdout', StringIO.StringIO())
3438 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3439 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3440 ' Host\t User\t Which file',
3441 '============================\t=====\t===========',
3442 'host-review.googlesource.com\t user\t.gitcookies',
3443 ' host.googlesource.com\t user\t.gitcookies',
3444 ' host2.googlesource.com\tuser3\t .netrc',
3445 ])
3446 sys.stdout.buf = ''
3447 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3448 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3449 ' Host\tUser\t Which file',
3450 '============================\t====\t===========',
3451 'host-review.googlesource.com\tuser\t.gitcookies',
3452 ' host.googlesource.com\tuser\t.gitcookies',
3453 ])
3454
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003455 def _common_creds_check_mocks(self):
3456 def exists_mock(path):
3457 dirname = os.path.dirname(path)
3458 if dirname == os.path.expanduser('~'):
3459 dirname = '~'
3460 base = os.path.basename(path)
3461 if base in ('.netrc', '.gitcookies'):
3462 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3463 # git cl also checks for existence other files not relevant to this test.
3464 return None
3465 self.mock(os.path, 'exists', exists_mock)
3466 self.mock(sys, 'stdout', StringIO.StringIO())
3467
3468 def test_creds_check_gitcookies_not_configured(self):
3469 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003470 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003471 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003472 self.calls = [
3473 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3474 (('os.path.exists', '~/.netrc'), True),
3475 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3476 'or Ctrl+C to abort'), ''),
3477 ((['git', 'config', '--global', 'http.cookiefile',
3478 os.path.expanduser('~/.gitcookies')], ), ''),
3479 ]
3480 self.assertEqual(0, git_cl.main(['creds-check']))
3481 self.assertRegexpMatches(
3482 sys.stdout.getvalue(),
3483 '^You seem to be using outdated .netrc for git credentials:')
3484 self.assertRegexpMatches(
3485 sys.stdout.getvalue(),
3486 '\nConfigured git to use .gitcookies from')
3487
3488 def test_creds_check_gitcookies_configured_custom_broken(self):
3489 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003490 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003491 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003492 self.calls = [
3493 ((['git', 'config', '--global', 'http.cookiefile'],),
3494 '/custom/.gitcookies'),
3495 (('os.path.exists', '/custom/.gitcookies'), False),
3496 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3497 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3498 ((['git', 'config', '--global', 'http.cookiefile',
3499 os.path.expanduser('~/.gitcookies')], ), ''),
3500 ]
3501 self.assertEqual(0, git_cl.main(['creds-check']))
3502 self.assertRegexpMatches(
3503 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003504 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003505 self.assertRegexpMatches(
3506 sys.stdout.getvalue(),
3507 'However, your configured .gitcookies file is missing.')
3508
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003509 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003510 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003511 lambda _, message, publish: self._mocked_call(
3512 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003513 self.calls = [
3514 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3515 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003516 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003517 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003518 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3519 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003520
3521 def test_git_cl_comment_add_gerrit(self):
3522 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003523 lambda host, change, msg, ready:
3524 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003525 self.calls = [
3526 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3527 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3528 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3529 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3530 'origin/master'),
3531 ((['git', 'config', 'remote.origin.url'],),
3532 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003533 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3534 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003535 ]
3536 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3537 '-a', 'msg']))
3538
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003539 def test_git_cl_comments_fetch_rietveld(self):
3540 self.mock(sys, 'stdout', StringIO.StringIO())
3541 self.calls = [
3542 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3543 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3544 ] * 2
3545 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3546 'messages': [
3547 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3548 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3549 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3550 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3551 # Intentionally wrong order here.
3552 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3553 'disapproval': False, 'approval': False,
3554 'sender': 'owner@example.com'},
3555 ],
3556 'owner_email': 'owner@example.com',
3557 })
3558 expected_comments_summary = [
3559 git_cl._CommentSummary(
3560 message='lgtm',
3561 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3562 disapproval=False, approval=True, sender='r@example.com'),
3563 git_cl._CommentSummary(
3564 message='not lgtm',
3565 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3566 disapproval=True, approval=False, sender='r2@example.com'),
3567 # Note: same order as in whatever Rietveld returns.
3568 git_cl._CommentSummary(
3569 message='PTAL',
3570 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3571 disapproval=False, approval=False, sender='owner@example.com'),
3572 ]
3573 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3574 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3575
3576 with git_cl.gclient_utils.temporary_directory() as tempdir:
3577 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3578 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3579 '-j', out_file]))
3580 with open(out_file) as f:
3581 read = json.load(f)
3582 self.assertEqual(len(read), 3)
3583 self.assertEqual(read[0], {
3584 'date': '2000-03-13 20:49:34.515270',
3585 'message': 'PTAL',
3586 'approval': False,
3587 'disapproval': False,
3588 'sender': 'owner@example.com'})
3589 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3590 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3591
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003592 def test_git_cl_comments_fetch_gerrit(self):
3593 self.mock(sys, 'stdout', StringIO.StringIO())
3594 self.calls = [
3595 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3596 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3597 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3598 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3599 'origin/master'),
3600 ((['git', 'config', 'remote.origin.url'],),
3601 'https://chromium.googlesource.com/infra/infra'),
3602 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3603 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003604 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003605 'messages': [
3606 {
3607 u'_revision_number': 1,
3608 u'author': {
3609 u'_account_id': 1111084,
3610 u'email': u'commit-bot@chromium.org',
3611 u'name': u'Commit Bot'
3612 },
3613 u'date': u'2017-03-15 20:08:45.000000000',
3614 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003615 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003616 u'tag': u'autogenerated:cq:dry-run'
3617 },
3618 {
3619 u'_revision_number': 2,
3620 u'author': {
3621 u'_account_id': 11151243,
3622 u'email': u'owner@example.com',
3623 u'name': u'owner'
3624 },
3625 u'date': u'2017-03-16 20:00:41.000000000',
3626 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3627 u'message': u'PTAL',
3628 },
3629 {
3630 u'_revision_number': 2,
3631 u'author': {
3632 u'_account_id': 148512 ,
3633 u'email': u'reviewer@example.com',
3634 u'name': u'reviewer'
3635 },
3636 u'date': u'2017-03-17 05:19:37.500000000',
3637 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3638 u'message': u'Patch Set 2: Code-Review+1',
3639 },
3640 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003641 }),
3642 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3643 '/COMMIT_MSG': [
3644 {
3645 'author': {'email': u'reviewer@example.com'},
3646 'updated': u'2017-03-17 05:19:37.500000000',
3647 'patch_set': 2,
3648 'side': 'REVISION',
3649 'message': 'Please include a bug link',
3650 },
3651 ],
3652 'codereview.settings': [
3653 {
3654 'author': {'email': u'owner@example.com'},
3655 'updated': u'2017-03-16 20:00:41.000000000',
3656 'patch_set': 2,
3657 'side': 'PARENT',
3658 'line': 42,
3659 'message': 'I removed this because it is bad',
3660 },
3661 ]
3662 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003663 ] * 2
3664 expected_comments_summary = [
3665 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003666 message=(
3667 u'PTAL\n' +
3668 u'\n' +
3669 u'codereview.settings\n' +
3670 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3671 u'c/1/2/codereview.settings#b42\n' +
3672 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003673 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3674 disapproval=False, approval=False, sender=u'owner@example.com'),
3675 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003676 message=(
3677 u'Patch Set 2: Code-Review+1\n' +
3678 u'\n' +
3679 u'/COMMIT_MSG\n' +
3680 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3681 u'c/1/2//COMMIT_MSG#\n' +
3682 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003683 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3684 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3685 ]
3686 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3687 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3688
3689 with git_cl.gclient_utils.temporary_directory() as tempdir:
3690 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3691 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3692 '-j', out_file]))
3693 with open(out_file) as f:
3694 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003695 self.assertEqual(len(read), 2)
3696 self.assertEqual(read[0], {
3697 u'date': u'2017-03-16 20:00:41.000000',
3698 u'message': (
3699 u'PTAL\n' +
3700 u'\n' +
3701 u'codereview.settings\n' +
3702 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3703 u'c/1/2/codereview.settings#b42\n' +
3704 u' I removed this because it is bad\n'),
3705 u'approval': False,
3706 u'disapproval': False,
3707 u'sender': u'owner@example.com'})
3708 self.assertEqual(read[1], {
3709 u'date': u'2017-03-17 05:19:37.500000',
3710 u'message': (
3711 u'Patch Set 2: Code-Review+1\n' +
3712 u'\n' +
3713 u'/COMMIT_MSG\n' +
3714 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3715 u'c/1/2//COMMIT_MSG#\n' +
3716 u' Please include a bug link\n'),
3717 u'approval': False,
3718 u'disapproval': False,
3719 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003720
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003721
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003722if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003723 logging.basicConfig(
3724 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003725 unittest.main()