blob: ae7621c8dc41622d2f50e24805297a630cb34753 [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Unit tests for git_cl.py."""
7
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01009import datetime
tandriide281ae2016-10-12 06:02:30 -070010import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010011import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000013import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070015import tempfile
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000017import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000018
19sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
20
21from testing_support.auto_stub import TestCase
22
23import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000024import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000025import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000027
tandrii5d48c322016-08-18 16:19:37 -070028def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
29 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
30
31
32CERR1 = callError(1)
33
34
Aaron Gable9a03ae02017-11-03 11:31:07 -070035def MakeNamedTemporaryFileMock(expected_content):
36 class NamedTemporaryFileMock(object):
37 def __init__(self, *args, **kwargs):
38 self.name = '/tmp/named'
39 self.expected_content = expected_content
40
41 def __enter__(self):
42 return self
43
44 def __exit__(self, _type, _value, _tb):
45 pass
46
47 def write(self, content):
48 if self.expected_content:
49 assert content == self.expected_content
50
51 def close(self):
52 pass
53
54 return NamedTemporaryFileMock
55
56
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000057class ChangelistMock(object):
58 # A class variable so we can access it when we don't have access to the
59 # instance that's being set.
60 desc = ""
61 def __init__(self, **kwargs):
62 pass
63 def GetIssue(self):
64 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080065 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000066 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070067 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000068 ChangelistMock.desc = desc
69
tandrii5d48c322016-08-18 16:19:37 -070070
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000071class PresubmitMock(object):
72 def __init__(self, *args, **kwargs):
73 self.reviewers = []
Daniel Cheng7227d212017-11-17 08:12:37 -080074 self.more_cc = ['chromium-reviews+test-more-cc@chromium.org']
75
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000076 @staticmethod
77 def should_continue():
78 return True
79
80
81class RietveldMock(object):
82 def __init__(self, *args, **kwargs):
83 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000084
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000085 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080086 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000087 return 'Issue: %d' % issue
88
maruel@chromium.org78936cb2013-04-11 00:17:52 +000089 @staticmethod
90 def get_issue_properties(_issue, _messages):
91 return {
92 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
93 'messages': [
94 {
95 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070096 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000097 'sender': 'john@chromium.org',
98 },
99 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100100 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000101 }
102
iannuccie53c9352016-08-17 14:40:40 -0700103 @staticmethod
104 def close_issue(_issue):
105 return 'Closed'
106
skobes6468b902016-10-24 08:45:10 -0700107 @staticmethod
108 def get_patch(issue, patchset):
109 return 'patch set from issue %s patchset %s' % (issue, patchset)
110
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100111 @staticmethod
112 def update_description(_issue, _description):
113 return 'Updated'
114
115 @staticmethod
116 def add_comment(_issue, _comment):
117 return 'Commented'
118
119
skobes6468b902016-10-24 08:45:10 -0700120class GitCheckoutMock(object):
121 def __init__(self, *args, **kwargs):
122 pass
123
124 @staticmethod
125 def reset():
126 GitCheckoutMock.conflict = False
127
128 def apply_patch(self, p):
129 if GitCheckoutMock.conflict:
130 raise Exception('failed')
131
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000132
133class WatchlistsMock(object):
134 def __init__(self, _):
135 pass
136 @staticmethod
137 def GetWatchersForPaths(_):
138 return ['joe@example.com']
139
140
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000141class CodereviewSettingsFileMock(object):
142 def __init__(self):
143 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800144 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000145 def read(self):
146 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000147 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000148
149
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000150class AuthenticatorMock(object):
151 def __init__(self, *_args):
152 pass
153 def has_cached_credentials(self):
154 return True
tandrii221ab252016-10-06 08:12:04 -0700155 def authorize(self, http):
156 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000157
158
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100159def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000160 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
161
162 Usage:
163 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100164 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000165
166 OR
167 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100168 CookiesAuthenticatorMockFactory(
169 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000170 """
171 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800172 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000173 # Intentionally not calling super() because it reads actual cookie files.
174 pass
175 @classmethod
176 def get_gitcookies_path(cls):
177 return '~/.gitcookies'
178 @classmethod
179 def get_netrc_path(cls):
180 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100181 def _get_auth_for_host(self, host):
182 if same_auth:
183 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000184 return (hosts_with_creds or {}).get(host)
185 return CookiesAuthenticatorMock
186
Aaron Gable9a03ae02017-11-03 11:31:07 -0700187
kmarshall9249e012016-08-23 12:02:16 -0700188class MockChangelistWithBranchAndIssue():
189 def __init__(self, branch, issue):
190 self.branch = branch
191 self.issue = issue
192 def GetBranch(self):
193 return self.branch
194 def GetIssue(self):
195 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000196
tandriic2405f52016-10-10 08:13:15 -0700197
198class SystemExitMock(Exception):
199 pass
200
201
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000202class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100203 def test_get_description(self):
204 cl = git_cl.Changelist(issue=1, codereview='rietveld',
205 codereview_host='host')
206 cl.description = 'x'
207 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800208 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100209 self.assertEquals(cl.GetDescription(), 'x')
210 self.assertEquals(cl.GetDescription(force=True), 'y')
211 self.assertEquals(cl.GetDescription(), 'y')
212
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700213 def test_description_footers(self):
214 cl = git_cl.Changelist(issue=1, codereview='gerrit',
215 codereview_host='host')
216 cl.description = '\n'.join([
217 'This is some message',
218 '',
219 'It has some lines',
220 'and, also',
221 '',
222 'Some: Really',
223 'Awesome: Footers',
224 ])
225 cl.has_description = True
226 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
227 msg, footers = cl.GetDescriptionFooters()
228 self.assertEquals(
229 msg, ['This is some message', '', 'It has some lines', 'and, also'])
230 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
231
232 msg.append('wut')
233 footers.append(('gnarly-dude', 'beans'))
234 cl.UpdateDescriptionFooters(msg, footers)
235 self.assertEquals(cl.GetDescription().splitlines(), [
236 'This is some message',
237 '',
238 'It has some lines',
239 'and, also',
240 'wut'
241 '',
242 'Some: Really',
243 'Awesome: Footers',
244 'Gnarly-Dude: beans',
245 ])
246
tandriif9aefb72016-07-01 09:06:51 -0700247 def test_get_bug_line_values(self):
248 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
249 self.assertEqual(f('', ''), [])
250 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
251 self.assertEqual(f('v8', '456'), ['v8:456'])
252 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
253 # Not nice, but not worth carying.
254 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
255 ['v8:456', 'chromium:123', 'v8:123'])
256
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100257 def _test_git_number(self, parent_msg, dest_ref, child_msg,
258 parent_hash='parenthash'):
259 desc = git_cl.ChangeDescription(child_msg)
260 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
261 return desc.description
262
263 def assertEqualByLine(self, actual, expected):
264 self.assertEqual(actual.splitlines(), expected.splitlines())
265
266 def test_git_number_bad_parent(self):
267 with self.assertRaises(ValueError):
268 self._test_git_number('Parent', 'refs/heads/master', 'Child')
269
270 def test_git_number_bad_parent_footer(self):
271 with self.assertRaises(AssertionError):
272 self._test_git_number(
273 'Parent\n'
274 '\n'
275 'Cr-Commit-Position: wrong',
276 'refs/heads/master', 'Child')
277
278 def test_git_number_bad_lineage_ignored(self):
279 actual = self._test_git_number(
280 'Parent\n'
281 '\n'
282 'Cr-Commit-Position: refs/heads/master@{#1}\n'
283 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
284 'refs/heads/master', 'Child')
285 self.assertEqualByLine(
286 actual,
287 'Child\n'
288 '\n'
289 'Cr-Commit-Position: refs/heads/master@{#2}\n'
290 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
291
292 def test_git_number_same_branch(self):
293 actual = self._test_git_number(
294 'Parent\n'
295 '\n'
296 'Cr-Commit-Position: refs/heads/master@{#12}',
297 dest_ref='refs/heads/master',
298 child_msg='Child')
299 self.assertEqualByLine(
300 actual,
301 'Child\n'
302 '\n'
303 'Cr-Commit-Position: refs/heads/master@{#13}')
304
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200305 def test_git_number_same_branch_mixed_footers(self):
306 actual = self._test_git_number(
307 'Parent\n'
308 '\n'
309 'Cr-Commit-Position: refs/heads/master@{#12}',
310 dest_ref='refs/heads/master',
311 child_msg='Child\n'
312 '\n'
313 'Broken-by: design\n'
314 'BUG=123')
315 self.assertEqualByLine(
316 actual,
317 'Child\n'
318 '\n'
319 'Broken-by: design\n'
320 'BUG=123\n'
321 'Cr-Commit-Position: refs/heads/master@{#13}')
322
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100323 def test_git_number_same_branch_with_originals(self):
324 actual = self._test_git_number(
325 'Parent\n'
326 '\n'
327 'Cr-Commit-Position: refs/heads/master@{#12}',
328 dest_ref='refs/heads/master',
329 child_msg='Child\n'
330 '\n'
331 'Some users are smart and insert their own footers\n'
332 '\n'
333 'Cr-Whatever: value\n'
334 'Cr-Commit-Position: refs/copy/paste@{#22}')
335 self.assertEqualByLine(
336 actual,
337 'Child\n'
338 '\n'
339 'Some users are smart and insert their own footers\n'
340 '\n'
341 'Cr-Original-Whatever: value\n'
342 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
343 'Cr-Commit-Position: refs/heads/master@{#13}')
344
345 def test_git_number_new_branch(self):
346 actual = self._test_git_number(
347 'Parent\n'
348 '\n'
349 'Cr-Commit-Position: refs/heads/master@{#12}',
350 dest_ref='refs/heads/branch',
351 child_msg='Child')
352 self.assertEqualByLine(
353 actual,
354 'Child\n'
355 '\n'
356 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
357 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
358
359 def test_git_number_lineage(self):
360 actual = self._test_git_number(
361 'Parent\n'
362 '\n'
363 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
364 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
365 dest_ref='refs/heads/branch',
366 child_msg='Child')
367 self.assertEqualByLine(
368 actual,
369 'Child\n'
370 '\n'
371 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
372 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
373
374 def test_git_number_moooooooore_lineage(self):
375 actual = self._test_git_number(
376 'Parent\n'
377 '\n'
378 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
379 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
380 dest_ref='refs/heads/mooore',
381 child_msg='Child')
382 self.assertEqualByLine(
383 actual,
384 'Child\n'
385 '\n'
386 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
387 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
388 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
389
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100390 def test_git_number_ever_moooooooore_lineage(self):
391 self.maxDiff = 10000
392 actual = self._test_git_number(
393 'CQ commit on fresh new branch + numbering.\n'
394 '\n'
395 'NOTRY=True\n'
396 'NOPRESUBMIT=True\n'
397 'BUG=\n'
398 '\n'
399 'Review-Url: https://codereview.chromium.org/2577703003\n'
400 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
401 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
402 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
403 dest_ref='refs/heads/gnumb-test/cl',
404 child_msg='git cl on fresh new branch + numbering.\n'
405 '\n'
406 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
407 self.assertEqualByLine(
408 actual,
409 'git cl on fresh new branch + numbering.\n'
410 '\n'
411 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
412 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
413 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
414 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
415 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100416
417 def test_git_number_cherry_pick(self):
418 actual = self._test_git_number(
419 'Parent\n'
420 '\n'
421 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
422 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
423 dest_ref='refs/heads/branch',
424 child_msg='Child, which is cherry-pick from master\n'
425 '\n'
426 'Cr-Commit-Position: refs/heads/master@{#100}\n'
427 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
428 self.assertEqualByLine(
429 actual,
430 'Child, which is cherry-pick from master\n'
431 '\n'
432 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
433 '\n'
434 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
435 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
436 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
437
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000438
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200439class TestParseIssueURL(unittest.TestCase):
440 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
441 codereview=None, fail=False):
442 self.assertIsNotNone(parsed)
443 if fail:
444 self.assertFalse(parsed.valid)
445 return
446 self.assertTrue(parsed.valid)
447 self.assertEqual(parsed.issue, issue)
448 self.assertEqual(parsed.patchset, patchset)
449 self.assertEqual(parsed.hostname, hostname)
450 self.assertEqual(parsed.codereview, codereview)
451
452 def _run_and_validate(self, func, url, *args, **kwargs):
453 result = func(urlparse.urlparse(url))
454 if kwargs.pop('fail', False):
455 self.assertIsNone(result)
456 return None
457 self._validate(result, *args, fail=False, **kwargs)
458
459 def test_rietveld(self):
460 def test(url, *args, **kwargs):
461 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
462 *args, codereview='rietveld', **kwargs)
463
464 test('http://codereview.chromium.org/123',
465 123, None, 'codereview.chromium.org')
466 test('https://codereview.chromium.org/123',
467 123, None, 'codereview.chromium.org')
468 test('https://codereview.chromium.org/123/',
469 123, None, 'codereview.chromium.org')
470 test('https://codereview.chromium.org/123/whatever',
471 123, None, 'codereview.chromium.org')
472 test('https://codereview.chromium.org/123/#ps20001',
473 123, 20001, 'codereview.chromium.org')
474 test('http://codereview.chromium.org/download/issue123_4.diff',
475 123, 4, 'codereview.chromium.org')
476 # This looks like bad Gerrit, but is actually valid Rietveld, too.
477 test('https://chrome-review.source.com/123/4/',
478 123, None, 'chrome-review.source.com')
479
480 test('https://codereview.chromium.org/deadbeaf', fail=True)
481 test('https://codereview.chromium.org/api/123', fail=True)
482 test('bad://codereview.chromium.org/123', fail=True)
483 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
484
485 def test_gerrit(self):
486 def test(url, issue=None, patchset=None, hostname=None, fail=None):
487 self._test_ParseIssueUrl(
488 git_cl._GerritChangelistImpl.ParseIssueURL,
489 url, issue, patchset, hostname, fail)
490 def test(url, *args, **kwargs):
491 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
492 *args, codereview='gerrit', **kwargs)
493
494 test('http://chrome-review.source.com/c/123',
495 123, None, 'chrome-review.source.com')
496 test('https://chrome-review.source.com/c/123/',
497 123, None, 'chrome-review.source.com')
498 test('https://chrome-review.source.com/c/123/4',
499 123, 4, 'chrome-review.source.com')
500 test('https://chrome-review.source.com/#/c/123/4',
501 123, 4, 'chrome-review.source.com')
502 test('https://chrome-review.source.com/c/123/4',
503 123, 4, 'chrome-review.source.com')
504 test('https://chrome-review.source.com/123',
505 123, None, 'chrome-review.source.com')
506 test('https://chrome-review.source.com/123/4',
507 123, 4, 'chrome-review.source.com')
508
509 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
510 test('https://chrome-review.source.com/c/abc/', fail=True)
511 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
512
513 def test_ParseIssueNumberArgument(self):
514 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200515 codereview_hint = kwargs.pop('hint', None)
516 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
517 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200518
519 test('123', 123)
520 test('', fail=True)
521 test('abc', fail=True)
522 test('123/1', fail=True)
523 test('123a', fail=True)
524 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
525 # Rietveld.
526 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200527 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200528 test('https://codereview.source.com/123',
529 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200530 # Matches both, but we take Gerrit if specifically requested.
531 test('https://codereview.source.com/123',
532 123, None, 'codereview.source.com', 'gerrit',
533 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200534 # Gerrrit.
535 test('https://chrome-review.source.com/c/123/4',
536 123, 4, 'chrome-review.source.com', 'gerrit')
537 test('https://chrome-review.source.com/bad/123/4', fail=True)
538
539
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100540class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100541 def setUp(self):
542 super(GitCookiesCheckerTest, self).setUp()
543 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100544 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100545
546 def mock_hosts_creds(self, subhost_identity_pairs):
547 def ensure_googlesource(h):
548 if not h.endswith(self.c._GOOGLESOURCE):
549 assert not h.endswith('.')
550 return h + '.' + self.c._GOOGLESOURCE
551 return h
552 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
553 for h, i in subhost_identity_pairs]
554
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200555 def test_identity_parsing(self):
556 self.assertEqual(self.c._parse_identity('ldap.google.com'),
557 ('ldap', 'google.com'))
558 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
559 ('ldap', 'example.com'))
560 # Specical case because we know there are no subdomains in chromium.org.
561 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
562 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800563 # Pathological: ".period." can be either username OR domain, more likely
564 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200565 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
566 ('note', 'period.example.com'))
567
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100568 def test_analysis_nothing(self):
569 self.c._all_hosts = []
570 self.assertFalse(self.c.has_generic_host())
571 self.assertEqual(set(), self.c.get_conflicting_hosts())
572 self.assertEqual(set(), self.c.get_duplicated_hosts())
573 self.assertEqual(set(), self.c.get_partially_configured_hosts())
574 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
575
576 def test_analysis(self):
577 self.mock_hosts_creds([
578 ('.googlesource.com', 'git-example.chromium.org'),
579
580 ('chromium', 'git-example.google.com'),
581 ('chromium-review', 'git-example.google.com'),
582 ('chrome-internal', 'git-example.chromium.org'),
583 ('chrome-internal-review', 'git-example.chromium.org'),
584 ('conflict', 'git-example.google.com'),
585 ('conflict-review', 'git-example.chromium.org'),
586 ('dup', 'git-example.google.com'),
587 ('dup', 'git-example.google.com'),
588 ('dup-review', 'git-example.google.com'),
589 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200590 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100591 ])
592 self.assertTrue(self.c.has_generic_host())
593 self.assertEqual(set(['conflict.googlesource.com']),
594 self.c.get_conflicting_hosts())
595 self.assertEqual(set(['dup.googlesource.com']),
596 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200597 self.assertEqual(set(['partial.googlesource.com',
598 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100599 self.c.get_partially_configured_hosts())
600 self.assertEqual(set(['chromium.googlesource.com',
601 'chrome-internal.googlesource.com']),
602 self.c.get_hosts_with_wrong_identities())
603
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100604 def test_report_no_problems(self):
605 self.test_analysis_nothing()
606 self.mock(sys, 'stdout', StringIO.StringIO())
607 self.assertFalse(self.c.find_and_report_problems())
608 self.assertEqual(sys.stdout.getvalue(), '')
609
610 def test_report(self):
611 self.test_analysis()
612 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200613 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
614 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100615 self.assertTrue(self.c.find_and_report_problems())
616 with open(os.path.join(os.path.dirname(__file__),
617 'git_cl_creds_check_report.txt')) as f:
618 expected = f.read()
619 def by_line(text):
620 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200621 self.maxDiff = 10000
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200622 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100623
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800624
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000625class TestGitCl(TestCase):
626 def setUp(self):
627 super(TestGitCl, self).setUp()
628 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700629 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000630 self.mock(subprocess2, 'call', self._mocked_call)
631 self.mock(subprocess2, 'check_call', self._mocked_call)
632 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700633 self.mock(subprocess2, 'communicate',
634 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000635 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000636 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000637 self.mock(git_common, 'get_or_create_merge_base',
638 lambda *a: (
639 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000640 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000641 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100642 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
643 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700644 self.mock(git_cl, 'write_json', lambda path, contents:
645 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000646 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000647 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000648 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700649 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
650 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000652 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000653 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100654 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
655 lambda *args, **kwargs: self._mocked_call(
656 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700657 self.mock(git_cl.gerrit_util, 'GetChangeComments',
658 lambda *args, **kwargs: self._mocked_call(
659 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100660 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700661 lambda h, i, reviewers, ccs, notify: self._mocked_call(
662 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700663 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700664 lambda h, i, msg=None, labels=None, notify=None:
665 self._mocked_call('SetReview', h, i, msg, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000666 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
667 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700668 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100669 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000670 # It's important to reset settings to not have inter-tests interference.
671 git_cl.settings = None
672
673 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000674 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100675 self.assertEquals([], self.calls)
676 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000677 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100678 raise
679 # Sadly, has_failed() returns True if this OR any other tests before this
680 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200681 git_cl.logging.error(
682 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100683 'There are un-consumed self.calls after this test has finished.\n'
684 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700685 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200686 'If you are already running only this test, then **first** fix the '
687 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100688 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700689 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100690 'and follow instructions above.\n' +
691 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000692 finally:
693 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000695 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000696 self.assertTrue(
697 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700698 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000699 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000700 expected_args, result = top
701
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000702 # Also logs otherwise it could get caught in a try/finally and be hard to
703 # diagnose.
704 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700705 N = 5
706 prior_calls = '\n '.join(
707 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
708 for i, c in enumerate(self._calls_done[-N:]))
709 following_calls = '\n '.join(
710 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
711 for i, c in enumerate(self.calls[:N]))
712 extended_msg = (
713 'A few prior calls:\n %s\n\n'
714 'This (expected):\n @%d: %r\n'
715 'This (actual):\n @%d: %r\n\n'
716 'A few following expected calls:\n %s' %
717 (prior_calls, len(self._calls_done), expected_args,
718 len(self._calls_done), args, following_calls))
719 git_cl.logging.error(extended_msg)
720
tandrii99a72f22016-08-17 14:33:24 -0700721 self.fail('@%d\n'
722 ' Expected: %r\n'
723 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700724 len(self._calls_done), expected_args, args))
725
726 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700727 if isinstance(result, Exception):
728 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000729 return result
730
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100731 def test_ask_for_explicit_yes_true(self):
732 self.calls = [
733 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
734 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
735 ]
736 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
737
tandrii48df5812016-10-17 03:55:37 -0700738 def test_LoadCodereviewSettingsFromFile_gerrit(self):
739 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
740 self.calls = [
741 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
742 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
743 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
744 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
745 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700747 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
748 CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700750 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
751 CERR1),
752 ((['git', 'config', 'gerrit.host', 'true'],), ''),
753 ]
754 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
755
maruel@chromium.orga3353652011-11-30 14:26:57 +0000756 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000757 def _is_gerrit_calls(cls, gerrit=False):
758 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
759 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
760
761 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800762 def _upload_calls(cls, private):
763 return (cls._rietveld_git_base_calls() +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000764 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000765
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000766 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800767 def _rietveld_upload_no_rev_calls(cls):
768 return (cls._rietveld_git_base_calls() + [
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200769 ((['git', 'config', 'core.editor'],), ''),
770 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000771
772 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800773 def _rietveld_git_base_calls(cls):
774 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
775 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000776
Aaron Gable13101a62018-02-09 13:20:41 -0800777 return cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000778 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700779 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
780 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000781 ((['git', 'config', 'rietveld.server'],),
782 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git', 'config', 'branch.master.merge'],), 'master'),
784 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000785 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000786 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000787 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git', 'rev-parse', '--show-cdup'],), ''),
789 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Aaron Gable7817f022017-12-12 09:43:17 -0800790 ((['git', '-c', 'core.quotePath=false', 'diff',
791 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000792 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700793 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000795 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000796 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000797 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000798 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000799 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000800 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000801 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700802 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000803 ]
804
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000805 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000806 def _git_upload_calls(cls, private):
807 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000808 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000809 private_call = []
810 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000811 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000812 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000813 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000814
maruel@chromium.orga3353652011-11-30 14:26:57 +0000815 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000816 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000817 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800819 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000820 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700821 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000823 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700825 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000826 ] + cls._git_post_upload_calls()
827
828 @classmethod
829 def _git_post_upload_calls(cls):
830 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000831 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
832 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
833 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000834 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000835 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000836 ]
837
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000838 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000839 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000840 fake_ancestor = 'fake_ancestor'
841 fake_cl = 'fake_cl_for_patch'
842 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000844 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000846 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000847 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000848 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000849 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000850 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700851 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000852 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000853 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000854 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000855 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000856 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000857 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000858 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000859 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000860 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000861 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000862 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000863
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000864 @staticmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800865 def _cmd_line(description, args, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000866 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000867 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800868 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000869 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000870 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800871 '--cc',
872 ','.join(
873 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
874 cc),
Aaron Gable13101a62018-02-09 13:20:41 -0800875 ] + (['--private'] if private else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000876
877 def _run_reviewer_test(
878 self,
879 upload_args,
880 expected_description,
881 returned_description,
882 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000883 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700884 private=False,
885 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000886 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000887 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org79540052012-10-19 23:15:26 +0000888
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000889 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700890 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000891
Aaron Gable13101a62018-02-09 13:20:41 -0800892 self.calls = self._upload_calls(private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000893
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000894 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000895 self.assertEquals(
896 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000897 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000898 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000899 '#--------------------This line is 72 characters long'
900 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000901 expected_description,
902 desc)
903 return returned_description
904 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000905
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000906 def check_upload(args):
Aaron Gable13101a62018-02-09 13:20:41 -0800907 cmd_line = self._cmd_line(final_description, reviewers, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000908 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000909 return 1, 2
910 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000911
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000912 git_cl.main(['upload'] + upload_args)
913
914 def test_no_reviewer(self):
915 self._run_reviewer_test(
916 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000917 'desc\n\nBUG=',
918 '# Blah blah comment.\ndesc\n\nBUG=',
919 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000920 [])
921
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000922 def test_private(self):
923 self._run_reviewer_test(
924 ['--private'],
925 'desc\n\nBUG=',
926 '# Blah blah comment.\ndesc\n\nBUG=\n',
927 'desc\n\nBUG=',
928 [])
929
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000930 def test_reviewers_cmd_line(self):
931 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000932 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000933 self._run_reviewer_test(
934 ['-r' 'foo@example.com'],
935 description,
936 '\n%s\n' % description,
937 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000938 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000939
940 def test_reviewer_tbr_overriden(self):
941 # Reviewer is overriden with TBR
942 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000943 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000944 self._run_reviewer_test(
945 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000946 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 description.strip('\n'),
948 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000949 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950
951 def test_reviewer_multiple(self):
952 # Handles multiple R= or TBR= lines.
953 description = (
bradnelsond975b302016-10-23 12:20:23 -0700954 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
955 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956 self._run_reviewer_test(
957 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000958 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000959 description,
960 description,
bradnelsond975b302016-10-23 12:20:23 -0700961 ['--reviewers=another@example.com,reviewer@example.com'],
962 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000963
maruel@chromium.orga3353652011-11-30 14:26:57 +0000964 def test_reviewer_send_mail(self):
965 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000966 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000967 self._run_reviewer_test(
968 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000970 description.strip('\n'),
971 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000972 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000973
974 def test_reviewer_send_mail_no_rev(self):
975 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000976 stdout = StringIO.StringIO()
Aaron Gable13101a62018-02-09 13:20:41 -0800977 self.calls = self._rietveld_upload_no_rev_calls() + [
tandriic2405f52016-10-10 08:13:15 -0700978 ((['DieWithError', 'Must specify reviewers to send email.'],),
979 SystemExitMock())
980 ]
981
982 def RunEditor(desc, _, **kwargs):
983 return desc
984 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
985 self.mock(sys, 'stdout', stdout)
986 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000987 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -0700988 self.assertEqual(
989 '=====================================\n'
990 'NOTICE: Rietveld is being deprecated. '
991 'You can upload changes to Gerrit with\n'
992 ' git cl upload --gerrit\n'
993 'or set Gerrit to be your default code review tool with\n'
994 ' git config gerrit.host true\n'
995 '=====================================\n',
996 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000997
tandriif9aefb72016-07-01 09:06:51 -0700998 def test_bug_on_cmd(self):
999 self._run_reviewer_test(
1000 ['--bug=500658,proj:123'],
1001 'desc\n\nBUG=500658\nBUG=proj:123',
1002 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1003 'desc\n\nBUG=500658\nBUG=proj:1234',
1004 [])
1005
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001006 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1007 parent_msg=None,
1008 new_msg=None,
1009 fail_after_parent_msg=False,
1010 fail_cherry_pick=False,
1011 fail_push_count=0,
1012 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001013 if debug:
1014 # Very useful due to finally clause in git cl land raising exceptions and
1015 # shadowing real cause of failure.
1016 self.mock(git_cl, '_IS_BEING_TESTED', True)
1017 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001018 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001019
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001020 if git_numberer_enabled:
1021 # Special mocks to check validity of timestamp.
1022 original_git_amend_head = git_cl._git_amend_head
1023 def _git_amend_head_mock(msg, tstamp):
1024 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1025 return original_git_amend_head(msg, tstamp)
1026 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1027
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001028 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1029 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001030 self.mock(RietveldMock, 'update_description', staticmethod(
1031 lambda i, d: self._mocked_call(['update_description', i, d])))
1032 self.mock(RietveldMock, 'add_comment', staticmethod(
1033 lambda i, c: self._mocked_call(['add_comment', i, c])))
1034 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001035 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001036 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001037 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001038 ((['git', 'config', 'rietveld.server'],),
1039 'https://codereview.chromium.org'),
1040 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1041 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1042 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1043 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001044 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1045 ''), # No commits to rebase, according to local view of origin.
1046 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1047 'fake_ancestor_sha'),
1048 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1049 ((['git', 'rev-parse', '--show-cdup'],), ''),
1050 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
Aaron Gable7817f022017-12-12 09:43:17 -08001051 ((['git', '-c', 'core.quotePath=false', 'diff',
1052 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001053 'M\tfile1.cpp'),
1054 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1055 ((['git', 'config', 'branch.feature.rietveldserver'],),
1056 'https://codereview.chromium.org'),
1057 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1058 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1059 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1060 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001061 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001062 # file1.cpp | 53 ++++++--
1063 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1064 ''),
1065 ((['git', 'show-ref', '--quiet', '--verify',
1066 'refs/heads/git-cl-commit'],),
1067 ''), # 0 return code means branch exists.
1068 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1069 ((['git', 'show-ref', '--quiet', '--verify',
1070 'refs/heads/git-cl-cherry-pick'],),
1071 CERR1), # This means git-cl-cherry-pick branch does not exist.
1072 ((['git', 'rev-parse', '--show-cdup'],), ''),
1073 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1074 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1075 ((['git', 'commit', '-m',
1076 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001077 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001078 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1079 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1080 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001081 repo_url),
1082
1083 ((['git', 'config', 'remote.origin.url'],), repo_url),
1084 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1085 git_numberer_enabled),
1086
1087 # Auto-rebase init.
1088 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1089 ]
1090 # Auto-rebase loops.
1091 for attempt in xrange(fail_push_count + 1):
1092 self.calls += [
1093 # Auto-rebase loop start.
1094 ((['git', 'retry', 'fetch', 'origin',
1095 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1096 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1097 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1098 # different in each loop iteration for truly realistic test.
1099 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1100 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1101 callError(1, 'failed to cherry pick') if fail_cherry_pick
1102 else ''),
1103 ]
1104 if fail_cherry_pick:
1105 return
1106
1107 if git_numberer_enabled:
1108 assert parent_msg
1109 self.calls += [
1110 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1111 parent_msg),
1112 ]
1113 if fail_after_parent_msg:
1114 return
1115 assert new_msg
1116 self.calls += [
1117 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1118 '1480022355'), # Committer's unix timestamp.
1119 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1120 '1480024000'),
1121 ((['git_amend_head committer timestamp', 1480024000],), ''),
1122 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1123 ]
1124 self.calls += [
1125 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1126 CERR1 if attempt < fail_push_count else ''),
1127 ]
1128 # End of autorebase + push.
1129
1130 self.calls += [
1131 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1132 ]
1133 if git_numberer_enabled:
1134 self.calls += [
1135 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1136 ]
1137
1138 # Cleanup calls.
1139 self.calls += [
1140 ((['git', 'checkout', '-q', 'feature'],), ''),
1141 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1142 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001143 ]
1144
1145 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001146 self._land_rietveld_calls(
1147 repo_url='https://chromium.googlesource.com/infra/infra',
1148 git_numberer_enabled=False,
1149 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001150 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001151 ((['git', 'config', 'rietveld.viewvc-url'],),
1152 'https://chromium.googlesource.com/infra/infra/+/'),
1153 ((['update_description', 123,
1154 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001155 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001156 ''),
1157 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001158 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001159 ]
1160 git_cl.main(['land'])
1161
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001162 def test_land_rietveld_fail_cherry_pick(self):
1163 self._land_rietveld_calls(
1164 repo_url='https://chromium.googlesource.com/infra/infra',
1165 git_numberer_enabled=False,
1166 fail_cherry_pick=True,
1167 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001168 self.calls += [
Aaron Gable7817f022017-12-12 09:43:17 -08001169 ((['git', '-c', 'core.quotePath=false', 'diff',
1170 '--name-status', '--diff-filter=U'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001171 'U path/file1\n'
1172 'U file2.cpp\n'),
1173 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001174 ((['git', 'checkout', '-q', 'feature'],), ''),
1175 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001176 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1177 ]
1178 git_cl.main(['land'])
1179
1180 def test_land_rietveld_git_numberer_fail_1_push(self):
1181 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1182
1183 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1184 self._land_rietveld_calls(
1185 repo_url='https://chromium.googlesource.com/chromium/src',
1186 git_numberer_enabled=True,
1187 parent_msg=('This is parent commit.\n'
1188 '\n'
1189 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1190 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1191 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1192 '\n'
1193 'Review-Url: https://codereview.chromium.org/123 .\n'
1194 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1195 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1196 fail_push_count=fail_push_count,
1197 debug=False)
1198
1199 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001200 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001201 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001202 ((['update_description', 123,
1203 'Issue: 123\n\nR=john@chromium.org\n'
1204 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001205 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001206 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1207 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1208 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001209 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001210 ''),
1211 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001212 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001213 ]
1214 git_cl.main(['land'])
1215
1216 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001217 self._land_rietveld_calls(
1218 repo_url='https://chromium.googlesource.com/v8/v8',
1219 git_numberer_enabled=True,
1220 parent_msg='This is parent commit with no footer.',
1221 fail_after_parent_msg=True,
1222 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001223 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001224 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001225 ((['git', 'checkout', '-q', 'feature'],), ''),
1226 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001227 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001228 ]
1229 with self.assertRaises(ValueError) as cm:
1230 git_cl.main(['land'])
1231 self.assertEqual(cm.exception.message,
1232 'Unable to infer commit position from footers')
1233
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001234 def test_git_numberer_not_whitelisted_repo(self):
1235 self.calls = []
1236 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001237 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1238 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001239 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001240
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001241 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001242 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1243 self.calls = [
1244 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001245 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001246 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001247 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001248 remote_url='https://chromium.googlesource.com/chromium/src',
1249 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001250 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001251
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001252 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001253 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001254 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001255 def fake_temporary_directory(**kwargs):
1256 yield tempdir
1257 self.mock(git_cl.gclient_utils, 'temporary_directory',
1258 fake_temporary_directory)
1259 self._test_GitNumbererState_valid_configs_inner(tempdir)
1260
1261 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001262 self.calls = [
1263 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001264 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001265 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1266 '''
1267 [plugin "git-numberer"]
1268 validate-enabled-refglob = refs/else/*
1269 validate-enabled-refglob = refs/heads/*
1270 validate-disabled-refglob = refs/heads/disabled
1271 validate-disabled-refglob = refs/branch-heads/*
1272 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001273 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1274 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001275 'refs/else/*\n'
1276 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001277 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1278 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001279 'refs/heads/disabled\n'
1280 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001281 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001282
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001283 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001284 remote_url='https://chromium.googlesource.com/chromium/src',
1285 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001286 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001287
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001288 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001289 remote_url='https://chromium.googlesource.com/chromium/src',
1290 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001291 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001292
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001293 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001294 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001295 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001296 remote_url='https://chromium.googlesource.com/chromium/src',
1297 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001298 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001299
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001300 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001301 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001302 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001303 if skip_auth_check:
1304 return [((cmd, ), 'true')]
1305
tandrii5d48c322016-08-18 16:19:37 -07001306 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001307 if issue:
1308 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001309 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001310 ])
1311 calls.extend([
1312 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1313 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1314 ((['git', 'config', 'remote.origin.url'],),
1315 'https://chromium.googlesource.com/my/repo'),
1316 ((['git', 'config', 'remote.origin.url'],),
1317 'https://chromium.googlesource.com/my/repo'),
1318 ])
1319 return calls
1320
1321 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001322 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001323 fetched_status=None, other_cl_owner=None,
1324 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001325 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001326 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001327 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1328 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1329 ((['git', 'config', 'branch.master.gerritissue'],),
1330 CERR1 if issue is None else str(issue)),
1331 ]
1332
1333 if custom_cl_base:
1334 ancestor_revision = custom_cl_base
1335 else:
1336 # Determine ancestor_revision to be merge base.
1337 ancestor_revision = 'fake_ancestor_sha'
1338 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001339 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001340 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001341 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001342 'refs/remotes/origin/master'],), ancestor_revision),
1343 ]
1344
1345 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001346 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1347
1348 if issue:
1349 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001350 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001351 '123456',
1352 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001353 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001354 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001355 'change_id': '123456789',
1356 'current_revision': 'sha1_of_current_revision',
1357 'revisions': { 'sha1_of_current_revision': {
1358 'commit': {'message': fetched_description},
1359 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001360 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001361 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001362 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001363 if fetched_status == 'ABANDONED':
1364 calls += [
1365 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1366 '123456 has been abandoned, new uploads are not '
1367 'allowed'), SystemExitMock()),
1368 ]
1369 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001370 if other_cl_owner:
1371 calls += [
1372 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1373 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001374
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001375 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1376 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001377 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001378 ((['git', 'rev-parse', '--show-cdup'],), ''),
1379 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001380
Aaron Gable7817f022017-12-12 09:43:17 -08001381 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1382 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001383 'M\t.gitignore\n'),
1384 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001385 ]
1386
1387 if not issue:
1388 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001389 ((['git', 'log', '--pretty=format:%s%n%n%b',
1390 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001391 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001392 ]
1393
1394 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001395 ((['git', 'config', 'user.email'],), 'me@example.com'),
1396 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1397 ([custom_cl_base] if custom_cl_base else
1398 [ancestor_revision, 'HEAD']),),
1399 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001400 ]
1401 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001402
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001403 @classmethod
1404 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001405 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001406 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001407 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001408 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001409 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001410 if post_amend_description is None:
1411 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001412 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001413 # Determined in `_gerrit_base_calls`.
1414 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1415
1416 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001417
tandriia60502f2016-06-20 02:01:53 -07001418 if squash_mode == 'default':
1419 calls.extend([
1420 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1421 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1422 ])
1423 elif squash_mode in ('override_squash', 'override_nosquash'):
1424 calls.extend([
1425 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1426 'true' if squash_mode == 'override_squash' else 'false'),
1427 ])
1428 else:
1429 assert squash_mode in ('squash', 'nosquash')
1430
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001431 # If issue is given, then description is fetched from Gerrit instead.
1432 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001433 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001434 ((['git', 'log', '--pretty=format:%s\n\n%b',
1435 ((custom_cl_base + '..') if custom_cl_base else
1436 'fake_ancestor_sha..HEAD')],),
1437 description),
1438 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001439 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001440 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001441 else:
1442 if not title:
1443 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001444 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1445 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001446 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001447 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001448 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001449 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001450 (('DownloadGerritHook', False), ''),
1451 # Amending of commit message to get the Change-Id.
1452 ((['git', 'log', '--pretty=format:%s\n\n%b',
1453 determined_ancestor_revision + '..HEAD'],),
1454 description),
1455 ((['git', 'commit', '--amend', '-m', description],), ''),
1456 ((['git', 'log', '--pretty=format:%s\n\n%b',
1457 determined_ancestor_revision + '..HEAD'],),
1458 post_amend_description)
1459 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001460 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001461 if not issue:
1462 # Prompting to edit description on first upload.
1463 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001464 ((['git', 'config', 'core.editor'],), ''),
1465 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001466 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001467 ref_to_push = 'abcdef0123456789'
1468 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001469 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1470 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1471 ]
1472
1473 if custom_cl_base is None:
1474 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001475 ((['get_or_create_merge_base', 'master',
1476 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001477 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001478 ]
1479 parent = 'origin/master'
1480 else:
1481 calls += [
1482 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1483 'refs/remotes/origin/master'],),
1484 callError(1)), # Means not ancenstor.
1485 (('ask_for_data',
1486 'Do you take responsibility for cleaning up potential mess '
1487 'resulting from proceeding with upload? Press Enter to upload, '
1488 'or Ctrl+C to abort'), ''),
1489 ]
1490 parent = custom_cl_base
1491
1492 calls += [
1493 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1494 '0123456789abcdef'),
1495 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001496 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001497 ref_to_push),
1498 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001499 else:
1500 ref_to_push = 'HEAD'
1501
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001502 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001503 ((['git', 'rev-list',
1504 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1505 ref_to_push],),
1506 '1hashPerLine\n'),
1507 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001508
Aaron Gableafd52772017-06-27 16:40:10 -07001509 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001510 ref_suffix = '%ready,notify=ALL'
1511 else:
1512 if not issue:
1513 ref_suffix = '%wip'
1514 else:
1515 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001516
Aaron Gable70f4e242017-06-26 10:45:59 -07001517 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001518 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001519
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001520 if git_mirror is None:
1521 calls += [
1522 ((['git', 'config', 'remote.origin.url'],),
1523 'https://chromium.googlesource.com/yyy/zzz'),
1524 ]
1525 else:
1526 calls += [
1527 ((['git', 'config', 'remote.origin.url'],),
1528 '/cache/this-dir-exists'),
1529 (('os.path.isdir', '/cache/this-dir-exists'),
1530 True),
1531 # Runs in /cache/this-dir-exists.
1532 ((['git', 'config', 'remote.origin.url'],),
1533 'https://chromium.googlesource.com/yyy/zzz'),
1534 ]
1535
ukai@chromium.orge8077812012-02-03 03:41:46 +00001536 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001537 ((['git', 'push',
1538 'https://chromium.googlesource.com/yyy/zzz',
1539 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001540 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001541 'remote: Processing changes: (\)\n'
1542 'remote: Processing changes: (|)\n'
1543 'remote: Processing changes: (/)\n'
1544 'remote: Processing changes: (-)\n'
1545 'remote: Processing changes: new: 1 (/)\n'
1546 'remote: Processing changes: new: 1, done\n'
1547 'remote:\n'
1548 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001549 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1550 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001551 'remote:\n'
1552 'To https://chromium.googlesource.com/yyy/zzz\n'
1553 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001554 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001555 if squash:
1556 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001557 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001558 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001559 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001560 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001561 ((['git', 'config', 'branch.master.gerritsquashhash',
1562 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001563 ]
tandrii88189772016-09-29 04:29:57 -07001564 calls += [
1565 ((['git', 'config', 'rietveld.cc'],), ''),
Daniel Cheng7227d212017-11-17 08:12:37 -08001566 (('AddReviewers', 'chromium-review.googlesource.com', 123456
1567 if squash else None, sorted(reviewers),
1568 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1569 cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001570 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001571 if tbr:
1572 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001573 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1574 ['LABELS']), {
1575 'labels': {
1576 'Code-Review': {
1577 'default_value': 0,
1578 'all': [],
1579 'values': {
1580 '+2': 'lgtm, approved',
1581 '+1': 'lgtm, but someone else must approve',
1582 ' 0': 'No score',
1583 '-1': 'Don\'t submit as-is',
1584 }
1585 }
1586 }
1587 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001588 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001589 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001590 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001591 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001592 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001593 return calls
1594
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001595 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001596 self,
1597 upload_args,
1598 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001599 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001600 squash=True,
1601 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001602 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001603 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001604 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001605 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001606 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001607 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001608 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001609 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001610 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001611 custom_cl_base=None,
1612 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001613 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001614 if squash_mode is None:
1615 if '--no-squash' in upload_args:
1616 squash_mode = 'nosquash'
1617 elif '--squash' in upload_args:
1618 squash_mode = 'squash'
1619 else:
1620 squash_mode = 'default'
1621
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001622 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001623 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001624 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001625 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001626 CookiesAuthenticatorMockFactory(
1627 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001628 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1629 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001630 self.mock(git_cl.gclient_utils, 'RunEditor',
1631 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001632 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1633 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001634
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001635 original_os_path_isdir = os.path.isdir
1636 def selective_os_path_isdir_mock(path):
1637 if path == '/cache/this-dir-exists':
1638 return self._mocked_call('os.path.isdir', path)
1639 return original_os_path_isdir(path)
1640 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1641
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001642 self.calls = self._gerrit_base_calls(
1643 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001644 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001645 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001646 other_cl_owner=other_cl_owner,
1647 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001648 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001649 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1650 expected_content=description))
1651 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001652 self.calls += self._gerrit_upload_calls(
1653 description, reviewers, squash,
1654 squash_mode=squash_mode,
1655 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001656 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001657 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001658 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001659 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001660 # Uncomment when debugging.
1661 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001662 git_cl.main(['upload'] + upload_args)
1663
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001664 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001665 self._run_gerrit_upload_test(
1666 ['--no-squash'],
1667 'desc\n\nBUG=\n',
1668 [],
1669 squash=False,
1670 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1671
1672 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001673 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001674 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001675 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001676 [],
tandriia60502f2016-06-20 02:01:53 -07001677 squash=False,
1678 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001679 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001680
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001681 def test_gerrit_no_reviewer(self):
1682 self._run_gerrit_upload_test(
1683 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001684 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001685 [],
1686 squash=False,
1687 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001688
Nick Carter8692b182017-11-06 16:30:38 -08001689 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001690 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1691 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001692 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001693 'desc\n\nBUG=\n\nChange-Id: I123456789',
1694 squash=False,
1695 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001696 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001697
ukai@chromium.orge8077812012-02-03 03:41:46 +00001698 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001699 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001700 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001701 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001702 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001703 squash=False,
1704 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001705 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001706
1707 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001708 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001709 [],
bradnelsond975b302016-10-23 12:20:23 -07001710 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1711 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001712 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001713 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001714 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001715 cc=['more@example.com', 'people@example.com'],
1716 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001717
1718 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001719 self._run_gerrit_upload_test(
1720 [],
1721 'desc\nBUG=\n\nChange-Id: 123456789',
1722 [],
1723 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001724
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001725 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001726 self._run_gerrit_upload_test(
1727 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001728 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001729 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001730 squash=True,
1731 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001732
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001733 def test_gerrit_upload_squash_first_against_rev(self):
1734 custom_cl_base = 'custom_cl_base_rev_or_branch'
1735 self._run_gerrit_upload_test(
1736 ['--squash', custom_cl_base],
1737 'desc\nBUG=\n\nChange-Id: 123456789',
1738 [],
1739 squash=True,
1740 expected_upstream_ref='origin/master',
1741 custom_cl_base=custom_cl_base)
1742 self.assertIn(
1743 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1744 sys.stdout.getvalue())
1745
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001746 def test_gerrit_upload_squash_first_with_mirror(self):
1747 self._run_gerrit_upload_test(
1748 ['--squash'],
1749 'desc\nBUG=\n\nChange-Id: 123456789',
1750 [],
1751 squash=True,
1752 expected_upstream_ref='origin/master',
1753 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1754
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001755 def test_gerrit_upload_squash_reupload(self):
1756 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001757 self._run_gerrit_upload_test(
1758 ['--squash'],
1759 description,
1760 [],
1761 squash=True,
1762 expected_upstream_ref='origin/master',
1763 issue=123456)
1764
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001765 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1766 self.mock(git_cl, 'DieWithError',
1767 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1768 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1769 with self.assertRaises(SystemExitMock):
1770 self._run_gerrit_upload_test(
1771 ['--squash'],
1772 description,
1773 [],
1774 squash=True,
1775 expected_upstream_ref='origin/master',
1776 issue=123456,
1777 fetched_status='ABANDONED')
1778
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001779 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1780 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1781 lambda *_, **__: {'email': 'yet-another@example.com'})
1782 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1783 self._run_gerrit_upload_test(
1784 ['--squash'],
1785 description,
1786 [],
1787 squash=True,
1788 expected_upstream_ref='origin/master',
1789 issue=123456,
1790 other_cl_owner='other@example.com')
1791 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001792 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001793 'authenticate to Gerrit as yet-another@example.com.\n'
1794 'Uploading may fail due to lack of permissions',
1795 git_cl.sys.stdout.getvalue())
1796
rmistry@google.com2dd99862015-06-22 12:22:18 +00001797 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001798 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001799 def mock_run_git(*args, **_kwargs):
1800 if args[0] == ['for-each-ref',
1801 '--format=%(refname:short) %(upstream:short)',
1802 'refs/heads']:
1803 # Create a local branch dependency tree that looks like this:
1804 # test1 -> test2 -> test3 -> test4 -> test5
1805 # -> test3.1
1806 # test6 -> test0
1807 branch_deps = [
1808 'test2 test1', # test1 -> test2
1809 'test3 test2', # test2 -> test3
1810 'test3.1 test2', # test2 -> test3.1
1811 'test4 test3', # test3 -> test4
1812 'test5 test4', # test4 -> test5
1813 'test6 test0', # test0 -> test6
1814 'test7', # test7
1815 ]
1816 return '\n'.join(branch_deps)
1817 self.mock(git_cl, 'RunGit', mock_run_git)
1818
1819 class RecordCalls:
1820 times_called = 0
1821 record_calls = RecordCalls()
1822 def mock_CMDupload(*args, **_kwargs):
1823 record_calls.times_called += 1
1824 return 0
1825 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1826
1827 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001828 (('ask_for_data', 'This command will checkout all dependent branches '
1829 'and run "git cl upload". Press Enter to continue, '
1830 'or Ctrl+C to abort'), ''),
1831 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001832
1833 class MockChangelist():
1834 def __init__(self):
1835 pass
1836 def GetBranch(self):
1837 return 'test1'
1838 def GetIssue(self):
1839 return '123'
1840 def GetPatchset(self):
1841 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001842 def IsGerrit(self):
1843 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001844
1845 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1846 # CMDupload should have been called 5 times because of 5 dependent branches.
1847 self.assertEquals(5, record_calls.times_called)
1848 self.assertEquals(0, ret)
1849
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001850 def test_gerrit_change_id(self):
1851 self.calls = [
1852 ((['git', 'write-tree'], ),
1853 'hashtree'),
1854 ((['git', 'rev-parse', 'HEAD~0'], ),
1855 'branch-parent'),
1856 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1857 'A B <a@b.org> 1456848326 +0100'),
1858 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1859 'C D <c@d.org> 1456858326 +0100'),
1860 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1861 'hashchange'),
1862 ]
1863 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1864 self.assertEqual(change_id, 'Ihashchange')
1865
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001866 def test_desecription_append_footer(self):
1867 for init_desc, footer_line, expected_desc in [
1868 # Use unique desc first lines for easy test failure identification.
1869 ('foo', 'R=one', 'foo\n\nR=one'),
1870 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1871 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1872 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1873 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1874 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1875 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1876 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1877 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1878 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1879 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1880 ]:
1881 desc = git_cl.ChangeDescription(init_desc)
1882 desc.append_footer(footer_line)
1883 self.assertEqual(desc.description, expected_desc)
1884
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001885 def test_update_reviewers(self):
1886 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001887 ('foo', [], [],
1888 'foo'),
1889 ('foo\nR=xx', [], [],
1890 'foo\nR=xx'),
1891 ('foo\nTBR=xx', [], [],
1892 'foo\nTBR=xx'),
1893 ('foo', ['a@c'], [],
1894 'foo\n\nR=a@c'),
1895 ('foo\nR=xx', ['a@c'], [],
1896 'foo\n\nR=a@c, xx'),
1897 ('foo\nTBR=xx', ['a@c'], [],
1898 'foo\n\nR=a@c\nTBR=xx'),
1899 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1900 'foo\n\nR=a@c, yy\nTBR=xx'),
1901 ('foo\nBUG=', ['a@c'], [],
1902 'foo\nBUG=\nR=a@c'),
1903 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1904 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1905 ('foo', ['a@c', 'b@c'], [],
1906 'foo\n\nR=a@c, b@c'),
1907 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1908 'foo\nBar\n\nR=c@c\nBUG='),
1909 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1910 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001911 # Same as the line before, but full of whitespaces.
1912 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001913 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001914 'foo\nBar\n\nR=c@c\n BUG =',
1915 ),
1916 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001917 ('foo BUG=allo R=joe ', ['c@c'], [],
1918 'foo BUG=allo R=joe\n\nR=c@c'),
1919 # Redundant TBRs get promoted to Rs
1920 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1921 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001922 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001923 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001924 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001925 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001926 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001927 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001928 actual.append(obj.description)
1929 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001930
Nodir Turakulov23b82142017-11-16 11:04:25 -08001931 def test_get_hash_tags(self):
1932 cases = [
1933 ('', []),
1934 ('a', []),
1935 ('[a]', ['a']),
1936 ('[aa]', ['aa']),
1937 ('[a ]', ['a']),
1938 ('[a- ]', ['a']),
1939 ('[a- b]', ['a-b']),
1940 ('[a--b]', ['a-b']),
1941 ('[a', []),
1942 ('[a]x', ['a']),
1943 ('[aa]x', ['aa']),
1944 ('[a b]', ['a-b']),
1945 ('[a b]', ['a-b']),
1946 ('[a__b]', ['a-b']),
1947 ('[a] x', ['a']),
1948 ('[a][b]', ['a', 'b']),
1949 ('[a] [b]', ['a', 'b']),
1950 ('[a][b]x', ['a', 'b']),
1951 ('[a][b] x', ['a', 'b']),
1952 ('[a]\n[b]', ['a']),
1953 ('[a\nb]', []),
1954 ('[a][', ['a']),
1955 ('Revert "[a] feature"', ['a']),
1956 ('Reland "[a] feature"', ['a']),
1957 ('Revert: [a] feature', ['a']),
1958 ('Reland: [a] feature', ['a']),
1959 ('Revert "Reland: [a] feature"', ['a']),
1960 ('Foo: feature', ['foo']),
1961 ('Foo Bar: feature', ['foo-bar']),
1962 ('Revert "Foo bar: feature"', ['foo-bar']),
1963 ('Reland "Foo bar: feature"', ['foo-bar']),
1964 ]
1965 for desc, expected in cases:
1966 change_desc = git_cl.ChangeDescription(desc)
1967 actual = change_desc.get_hash_tags()
1968 self.assertEqual(
1969 actual,
1970 expected,
1971 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1972
wittman@chromium.org455dc922015-01-26 20:15:50 +00001973 def test_get_target_ref(self):
1974 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001975 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001976 self.assertEqual(None, git_cl.GetTargetRef(None,
1977 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001978 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001979
wittman@chromium.org455dc922015-01-26 20:15:50 +00001980 # Check default target refs for branches.
1981 self.assertEqual('refs/heads/master',
1982 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001983 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001984 self.assertEqual('refs/heads/master',
1985 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001986 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001987 self.assertEqual('refs/heads/master',
1988 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001989 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001990 self.assertEqual('refs/branch-heads/123',
1991 git_cl.GetTargetRef('origin',
1992 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001993 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001994 self.assertEqual('refs/diff/test',
1995 git_cl.GetTargetRef('origin',
1996 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001997 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001998 self.assertEqual('refs/heads/chrome/m42',
1999 git_cl.GetTargetRef('origin',
2000 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002001 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002002
2003 # Check target refs for user-specified target branch.
2004 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
2005 'refs/remotes/branch-heads/123'):
2006 self.assertEqual('refs/branch-heads/123',
2007 git_cl.GetTargetRef('origin',
2008 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002009 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002010 for branch in ('origin/master', 'remotes/origin/master',
2011 'refs/remotes/origin/master'):
2012 self.assertEqual('refs/heads/master',
2013 git_cl.GetTargetRef('origin',
2014 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002015 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002016 for branch in ('master', 'heads/master', 'refs/heads/master'):
2017 self.assertEqual('refs/heads/master',
2018 git_cl.GetTargetRef('origin',
2019 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002020 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002021
wychen@chromium.orga872e752015-04-28 23:42:18 +00002022 def test_patch_when_dirty(self):
2023 # Patch when local tree is dirty
2024 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2025 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2026
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002027 @staticmethod
2028 def _get_gerrit_codereview_server_calls(branch, value=None,
2029 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08002030 detect_branch=True,
2031 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002032 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2033
2034 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2035 """
2036 calls = []
2037 if detect_branch:
2038 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08002039 if detect_server:
2040 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2041 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002042 if value is None:
2043 calls += [
2044 ((['git', 'config', 'branch.' + branch + '.merge'],),
2045 'refs/heads' + branch),
2046 ((['git', 'config', 'branch.' + branch + '.remote'],),
2047 'origin'),
2048 ((['git', 'config', 'remote.origin.url'],),
2049 'https://%s.googlesource.com/my/repo' % git_short_host),
2050 ]
2051 return calls
2052
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002053 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002054 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002055 detect_gerrit_server=True,
2056 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002057 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002058 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2059 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002060 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002061 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002062 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2063
tandriidf09a462016-08-18 16:23:55 -07002064 if new_branch:
2065 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002066
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002067 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002068 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002069 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002070 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002071 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2072 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2073 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2074 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002075 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002076 if default_codereview == 'gerrit':
2077 if not force_codereview:
2078 self.calls += [
2079 ((['git', 'config', 'gerrit.host'],), 'true'),
2080 ]
2081 if detect_gerrit_server:
2082 self.calls += self._get_gerrit_codereview_server_calls(
2083 'master', git_short_host=git_short_host,
2084 detect_branch=not new_branch and force_codereview)
2085 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002086
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002087 elif default_codereview == 'rietveld':
2088 self.calls += [
2089 ((['git', 'config', 'gerrit.host'],), CERR1),
2090 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2091 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2092 ]
2093 actual_codereview = 'rietveld'
2094
2095 if actual_codereview == 'rietveld':
2096 self.calls += [
2097 ((['git', 'rev-parse', '--show-cdup'],), ''),
2098 ]
2099 if not default_codereview:
2100 self.calls += [
2101 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2102 ]
2103 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002104 self.calls += [
2105 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002106 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002107 {
2108 'current_revision': '7777777777',
2109 'revisions': {
2110 '1111111111': {
2111 '_number': 1,
2112 'fetch': {'http': {
2113 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2114 'ref': 'refs/changes/56/123456/1',
2115 }},
2116 },
2117 '7777777777': {
2118 '_number': 7,
2119 'fetch': {'http': {
2120 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2121 'ref': 'refs/changes/56/123456/7',
2122 }},
2123 },
2124 },
2125 }),
2126 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002127
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002128 def _common_patch_rietveld_successful(self, **kwargs):
2129 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002130 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002131 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002132 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133 ((['git', 'config', 'branch.master.rietveldserver',
2134 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002135 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002136 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002137 ((['git', 'commit', '-m',
2138 'Description\n\n' +
2139 'patch from issue 123456 at patchset 60001 ' +
2140 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002141 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002142
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002143 def test_patch_rietveld_default(self):
2144 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002145 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2146
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002147 def test_patch_rietveld_successful_new_branch(self):
2148 self._common_patch_rietveld_successful(default_codereview='rietveld',
2149 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002150 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2151
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002152 def test_patch_rietveld_guess_by_url(self):
2153 self._common_patch_rietveld_successful(
2154 default_codereview=None, # It doesn't matter.
2155 actual_codereview='rietveld')
2156 self.assertEqual(git_cl.main(
2157 ['patch', 'https://codereview.example.com/123456']), 0)
2158
2159 def test_patch_rietveld_conflict(self):
2160 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002161 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002162 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002163
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002164 def test_patch_gerrit_default(self):
2165 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002166 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002167 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002168 ((['git', 'config', 'remote.origin.url'],),
2169 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002170 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2171 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002172 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002173 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08002174 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002175 ((['git', 'config', 'branch.master.gerritserver',
2176 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002177 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002178 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2179 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2180 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002181 ]
2182 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2183
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002184 def test_patch_gerrit_force(self):
2185 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002186 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002187 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002188 ((['git', 'config', 'remote.origin.url'],),
2189 'https://host.googlesource.com/my/repo'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002190 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002191 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002192 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002193 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002194 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002195 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002196 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002197 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002198 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2199 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2200 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002201 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002202 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002203
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002204 def test_patch_gerrit_guess_by_url(self):
2205 self._patch_common(
2206 default_codereview=None, # It doesn't matter what's default.
2207 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08002208 git_short_host='else')
2209 self.calls += self._get_gerrit_codereview_server_calls(
2210 'master', git_short_host='else', detect_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002211 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002212 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002213 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002214 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002215 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002216 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002217 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002218 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002219 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002220 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2221 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2222 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002223 ]
2224 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002225 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002226
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002227 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2228 self._patch_common(
2229 default_codereview=None, # It doesn't matter what's default.
2230 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08002231 git_short_host='else')
2232 self.calls += self._get_gerrit_codereview_server_calls(
2233 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002234 self.calls += [
2235 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2236 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002237 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002238 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2239 ''),
2240 ((['git', 'config', 'branch.master.gerritserver',
2241 'https://else-review.googlesource.com'],), ''),
2242 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002243 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2244 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2245 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002246 ]
2247 self.assertEqual(git_cl.main(
2248 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2249
Aaron Gable697a91b2018-01-19 15:20:15 -08002250 def test_patch_gerrit_guess_by_url_with_repo(self):
2251 self._patch_common(
2252 default_codereview=None, # It doesn't matter what's default.
2253 actual_codereview='gerrit',
2254 git_short_host='else')
2255 self.calls += self._get_gerrit_codereview_server_calls(
2256 'master', git_short_host='else', detect_server=False)
2257 self.calls += [
2258 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2259 'refs/changes/56/123456/1'],), ''),
2260 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2261 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2262 ''),
2263 ((['git', 'config', 'branch.master.gerritserver',
2264 'https://else-review.googlesource.com'],), ''),
2265 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2266 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2267 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2268 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
2269 ]
2270 self.assertEqual(git_cl.main(
2271 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
2272 0)
2273
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002274 def test_patch_gerrit_conflict(self):
2275 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002276 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002277 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002278 ((['git', 'config', 'remote.origin.url'],),
2279 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002280 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002281 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002282 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2283 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2284 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002285 ]
2286 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002287 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002288
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002289 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002290 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002291 raise git_cl.gerrit_util.GerritError(404, '')
2292 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2293
tandriic2405f52016-10-10 08:13:15 -07002294 self.calls = [
2295 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002296 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2297 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2298 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2299 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002300 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2301 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2302 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2303 ((['git', 'config', 'remote.origin.url'],),
2304 'https://chromium.googlesource.com/my/repo'),
2305 ((['DieWithError',
2306 'change 123456 at https://chromium-review.googlesource.com does not '
2307 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002308 ]
2309 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002310 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002311
Aaron Gable697a91b2018-01-19 15:20:15 -08002312 def test_patch_gerrit_wrong_repo(self):
2313 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
2314 detect_gerrit_server=True)
2315 self.calls += [
2316 ((['git', 'config', 'remote.origin.url'],),
2317 'https://chromium.googlesource.com/wrong/repo'),
2318 ((['DieWithError',
2319 'Trying to patch a change from '
2320 'https://chromium.googlesource.com/my/repo but this repo appears '
2321 'to be https://chromium.googlesource.com/wrong/repo.'],),
2322 SystemExitMock()),
2323 ]
2324 with self.assertRaises(SystemExitMock):
2325 self.assertEqual(1, git_cl.main(['patch', '123456']))
2326
2327
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002328 def _checkout_calls(self):
2329 return [
2330 ((['git', 'config', '--local', '--get-regexp',
2331 'branch\\..*\\.rietveldissue'], ),
2332 ('branch.retrying.rietveldissue 1111111111\n'
2333 'branch.some-fix.rietveldissue 2222222222\n')),
2334 ((['git', 'config', '--local', '--get-regexp',
2335 'branch\\..*\\.gerritissue'], ),
2336 ('branch.ger-branch.gerritissue 123456\n'
2337 'branch.gbranch654.gerritissue 654321\n')),
2338 ]
2339
2340 def test_checkout_gerrit(self):
2341 """Tests git cl checkout <issue>."""
2342 self.calls = self._checkout_calls()
2343 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2344 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2345
2346 def test_checkout_rietveld(self):
2347 """Tests git cl checkout <issue>."""
2348 self.calls = self._checkout_calls()
2349 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2350 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2351
2352 def test_checkout_not_found(self):
2353 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002354 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002355 self.calls = self._checkout_calls()
2356 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2357
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002358 def test_checkout_no_branch_issues(self):
2359 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002360 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002361 self.calls = [
2362 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002363 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002364 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002365 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002366 ]
2367 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2368
tandrii@chromium.org28253532016-04-14 13:46:56 +00002369 def _test_gerrit_ensure_authenticated_common(self, auth,
2370 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002371 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2372 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2373 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002374 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002375 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002376 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002377 cl.branch = 'master'
2378 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002379 cl.lookedup_issue = True
2380 return cl
2381
2382 def test_gerrit_ensure_authenticated_missing(self):
2383 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002384 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002385 })
2386 self.calls.append(
2387 ((['DieWithError',
2388 'Credentials for the following hosts are required:\n'
2389 ' chromium-review.googlesource.com\n'
2390 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002391 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002392 'https://chromium-review.googlesource.com/new-password'],), ''),)
2393 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2394
2395 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002396 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002397 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002398 'chromium.googlesource.com':
2399 ('git-one.example.com', None, 'secret1'),
2400 'chromium-review.googlesource.com':
2401 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002402 })
2403 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002404 (('ask_for_data', 'If you know what you are doing '
2405 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002406 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2407
2408 def test_gerrit_ensure_authenticated_ok(self):
2409 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002410 'chromium.googlesource.com':
2411 ('git-same.example.com', None, 'secret'),
2412 'chromium-review.googlesource.com':
2413 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002414 })
2415 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2416
tandrii@chromium.org28253532016-04-14 13:46:56 +00002417 def test_gerrit_ensure_authenticated_skipped(self):
2418 cl = self._test_gerrit_ensure_authenticated_common(
2419 auth={}, skip_auth_check=True)
2420 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2421
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002422 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002423 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2424 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002425 self.calls = [
2426 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002427 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002428 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2429 ((['git', 'config', 'rietveld.server'],), ''),
2430 ((['git', 'config', 'rietveld.server'],), ''),
2431 ((['git', 'config', 'branch.feature.rietveldserver'],),
2432 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002433 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002434 ]
2435 self.assertEqual(0, git_cl.main(['set-commit']))
2436
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002437 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002438 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002439 lambda h, i, labels, notify=None:
2440 self._mocked_call(['SetReview', h, i, labels, notify]))
2441
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002442 self.calls = [
2443 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002444 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2445 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002446 ((['git', 'config', 'branch.feature.gerritserver'],),
2447 'https://chromium-review.googlesource.com'),
2448 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002449 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002450 ]
tandriid9e5ce52016-07-13 02:32:59 -07002451
2452 def test_cmd_set_commit_gerrit_clear(self):
2453 self._cmd_set_commit_gerrit_common(0)
2454 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2455
2456 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002457 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002458 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2459
tandriid9e5ce52016-07-13 02:32:59 -07002460 def test_cmd_set_commit_gerrit(self):
2461 self._cmd_set_commit_gerrit_common(2)
2462 self.assertEqual(0, git_cl.main(['set-commit']))
2463
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002464 def test_description_display(self):
2465 out = StringIO.StringIO()
2466 self.mock(git_cl.sys, 'stdout', out)
2467
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002468 self.mock(git_cl, 'Changelist', ChangelistMock)
2469 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002470
2471 self.assertEqual(0, git_cl.main(['description', '-d']))
2472 self.assertEqual('foo\n', out.getvalue())
2473
2474 def test_description_rietveld(self):
2475 out = StringIO.StringIO()
2476 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002477 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002478
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002479 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002480 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002481 self.assertEqual('foobar\n', out.getvalue())
2482
iannucci3c972b92016-08-17 13:24:10 -07002483 def test_StatusFieldOverrideIssueMissingArgs(self):
2484 out = StringIO.StringIO()
2485 self.mock(git_cl.sys, 'stderr', out)
2486
2487 try:
2488 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2489 except SystemExit as ex:
2490 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002491 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002492
2493 out = StringIO.StringIO()
2494 self.mock(git_cl.sys, 'stderr', out)
2495
2496 try:
2497 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2498 except SystemExit as ex:
2499 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002500 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002501
2502 def test_StatusFieldOverrideIssue(self):
2503 out = StringIO.StringIO()
2504 self.mock(git_cl.sys, 'stdout', out)
2505
2506 def assertIssue(cl_self, *_args):
2507 self.assertEquals(cl_self.issue, 1)
2508 return 'foobar'
2509
2510 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2511 self.calls = [
2512 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2513 ((['git', 'config', 'rietveld.server'],), ''),
2514 ((['git', 'config', 'rietveld.server'],), ''),
2515 ]
iannuccie53c9352016-08-17 14:40:40 -07002516 self.assertEqual(
2517 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2518 0)
iannucci3c972b92016-08-17 13:24:10 -07002519 self.assertEqual(out.getvalue(), 'foobar\n')
2520
iannuccie53c9352016-08-17 14:40:40 -07002521 def test_SetCloseOverrideIssue(self):
2522 def assertIssue(cl_self, *_args):
2523 self.assertEquals(cl_self.issue, 1)
2524 return 'foobar'
2525
2526 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2527 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2528 self.calls = [
2529 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2530 ((['git', 'config', 'rietveld.server'],), ''),
2531 ((['git', 'config', 'rietveld.server'],), ''),
2532 ]
2533 self.assertEqual(
2534 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2535
2536 def test_SetCommitOverrideIssue(self):
2537 def assertIssue(cl_self, *_args):
2538 self.assertEquals(cl_self.issue, 1)
2539 return 'foobar'
2540
2541 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2542 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2543 self.calls = [
2544 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2545 ((['git', 'config', 'rietveld.server'],), ''),
2546 ((['git', 'config', 'rietveld.server'],), ''),
2547 ((['git', 'symbolic-ref', 'HEAD'],), ''),
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
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002554 def test_description_gerrit(self):
2555 out = StringIO.StringIO()
2556 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002557 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002558 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002559 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2560 {
2561 'current_revision': 'sha1',
2562 'revisions': {'sha1': {
2563 'commit': {'message': 'foobar'},
2564 }},
2565 }),
2566 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002567 self.assertEqual(0, git_cl.main([
2568 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2569 self.assertEqual('foobar\n', out.getvalue())
2570
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002571 def test_description_set_raw(self):
2572 out = StringIO.StringIO()
2573 self.mock(git_cl.sys, 'stdout', out)
2574
2575 self.mock(git_cl, 'Changelist', ChangelistMock)
2576 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2577
2578 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2579 self.assertEqual('hihi', ChangelistMock.desc)
2580
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002581 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002582 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002583
2584 def RunEditor(desc, _, **kwargs):
2585 self.assertEquals(
2586 '# Enter a description of the change.\n'
2587 '# This will be displayed on the codereview site.\n'
2588 '# The first line will also be used as the subject of the review.\n'
2589 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002590 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002591 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002592 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002593 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002594 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002595
dsansomee2d6fd92016-09-08 00:10:47 -07002596 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002597 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002598
2599 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2600 self.mock(git_cl.Changelist, 'GetDescription',
2601 lambda *args: current_desc)
2602 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2603 UpdateDescriptionRemote)
2604 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2605
2606 self.calls = [
2607 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002608 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002609 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2610 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002611 ((['git', 'config', 'core.editor'],), 'vi'),
2612 ]
2613 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2614
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002615 def test_description_set_stdin(self):
2616 out = StringIO.StringIO()
2617 self.mock(git_cl.sys, 'stdout', out)
2618
2619 self.mock(git_cl, 'Changelist', ChangelistMock)
2620 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2621
2622 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2623 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2624
kmarshall3bff56b2016-06-06 18:31:47 -07002625 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002626 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2627
kmarshall3bff56b2016-06-06 18:31:47 -07002628 self.calls = \
2629 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2630 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002631 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002632 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2633 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002634 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2635 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2636 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002637 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2638 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2639 ((['git', 'branch', '-D', 'foo'],), '')]
2640
kmarshall3bff56b2016-06-06 18:31:47 -07002641 self.mock(git_cl, 'get_cl_statuses',
2642 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002643 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2644 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2645 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002646
2647 self.assertEqual(0, git_cl.main(['archive', '-f']))
2648
2649 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002650 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002651 self.calls = \
2652 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2653 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002654 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002655 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2656 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002657 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2658
kmarshall9249e012016-08-23 12:02:16 -07002659 self.mock(git_cl, 'get_cl_statuses',
2660 lambda branches, fine_grained, max_processes:
2661 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2662
2663 self.assertEqual(1, git_cl.main(['archive', '-f']))
2664
2665 def test_archive_dry_run(self):
2666 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2667
2668 self.calls = \
2669 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2670 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2671 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2672 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2673 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2674 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2675 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2676 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2677 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002678
2679 self.mock(git_cl, 'get_cl_statuses',
2680 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002681 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2682 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2683 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002684
kmarshall9249e012016-08-23 12:02:16 -07002685 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2686
2687 def test_archive_no_tags(self):
2688 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2689
2690 self.calls = \
2691 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2692 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2693 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2694 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2695 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2696 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2697 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2698 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2699 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2700 ((['git', 'branch', '-D', 'foo'],), '')]
2701
2702 self.mock(git_cl, 'get_cl_statuses',
2703 lambda branches, fine_grained, max_processes:
2704 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2705 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2706 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2707
2708 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002709
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002710 def test_cmd_issue_erase_existing(self):
2711 out = StringIO.StringIO()
2712 self.mock(git_cl.sys, 'stdout', out)
2713 self.calls = [
2714 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002715 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2716 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002717 # Let this command raise exception (retcode=1) - it should be ignored.
2718 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002719 CERR1),
2720 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2721 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002722 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2723 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2724 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002725 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002726 ]
2727 self.assertEqual(0, git_cl.main(['issue', '0']))
2728
Aaron Gable400e9892017-07-12 15:31:21 -07002729 def test_cmd_issue_erase_existing_with_change_id(self):
2730 out = StringIO.StringIO()
2731 self.mock(git_cl.sys, 'stdout', out)
2732 self.mock(git_cl.Changelist, 'GetDescription',
2733 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2734 self.calls = [
2735 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2736 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2737 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002738 # Let this command raise exception (retcode=1) - it should be ignored.
2739 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2740 CERR1),
2741 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2742 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2743 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2744 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2745 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002746 ((['git', 'log', '-1', '--format=%B'],),
2747 'This is a description\n\nChange-Id: Ideadbeef'),
2748 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002749 ]
2750 self.assertEqual(0, git_cl.main(['issue', '0']))
2751
phajdan.jre328cf92016-08-22 04:12:17 -07002752 def test_cmd_issue_json(self):
2753 out = StringIO.StringIO()
2754 self.mock(git_cl.sys, 'stdout', out)
2755 self.calls = [
2756 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002757 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002758 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2759 ((['git', 'config', 'rietveld.server'],),
2760 'https://codereview.chromium.org'),
2761 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2762 (('write_json', 'output.json',
2763 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2764 ''),
2765 ]
2766 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2767
tandriide281ae2016-10-12 06:02:30 -07002768 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002769 self.mock(git_cl.Changelist, 'GetChange',
2770 lambda _, *a: (
2771 self._mocked_call(['GetChange']+list(a))))
2772 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2773 lambda *_, **__: (
2774 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002775 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2776 lambda _, s: self._mocked_call(['SetCQState', s]))
2777 self.calls = [
2778 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002779 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002780 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2781 ((['git', 'config', 'rietveld.server'],),
2782 'https://codereview.chromium.org'),
2783 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2784 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2785 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2786 ((['get_or_create_merge_base', 'feature', 'feature'],),
2787 'fake_ancestor_sha'),
2788 ((['GetChange', 'fake_ancestor_sha', None], ),
2789 git_cl.presubmit_support.GitChange(
2790 '', '', '', '', '', '', '', '')),
2791 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2792 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002793 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2794 ]
2795 out = StringIO.StringIO()
2796 self.mock(git_cl.sys, 'stdout', out)
2797 self.assertEqual(0, git_cl.main(['try']))
2798 self.assertEqual(
2799 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002800 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002801
tandrii8c5a3532016-11-04 07:52:02 -07002802 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2803 self.mock(git_cl.Changelist, 'GetChange',
2804 lambda _, *a: (
2805 self._mocked_call(['GetChange']+list(a))))
2806 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2807 lambda *_, **__: (
2808 self._mocked_call(['DoGetTryMasters'])))
2809 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2810 lambda _, s: self._mocked_call(['SetCQState', s]))
2811
tandrii8c5a3532016-11-04 07:52:02 -07002812 self.calls = [
2813 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2814 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2815 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2816 ((['git', 'config', 'branch.feature.gerritserver'],),
2817 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002818 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2819 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2820 'project': 'depot_tools',
2821 'status': 'OPEN',
2822 'owner': {'email': 'owner@e.mail'},
2823 'revisions': {
2824 'deadbeaf': {
2825 '_number': 6,
2826 },
2827 'beeeeeef': {
2828 '_number': 7,
2829 'fetch': {'http': {
2830 'url': 'https://chromium.googlesource.com/depot_tools',
2831 'ref': 'refs/changes/56/123456/7'
2832 }},
2833 },
2834 },
2835 }),
tandrii8c5a3532016-11-04 07:52:02 -07002836 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2837 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2838 ((['get_or_create_merge_base', 'feature', 'feature'],),
2839 'fake_ancestor_sha'),
2840 ((['GetChange', 'fake_ancestor_sha', None], ),
2841 git_cl.presubmit_support.GitChange(
2842 '', '', '', '', '', '', '', '')),
2843 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2844 ((['DoGetTryMasters'], ), None),
2845 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2846 ]
2847 out = StringIO.StringIO()
2848 self.mock(git_cl.sys, 'stdout', out)
2849 self.assertEqual(0, git_cl.main(['try']))
2850 self.assertEqual(
2851 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002852 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002853 'https://chromium-review.googlesource.com/123456\n')
2854
2855 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2856 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2857 lambda _: {
2858 'owner_email': 'owner@e.mail',
2859 'private': False,
2860 'closed': False,
2861 'project': 'depot_tools',
2862 'patchsets': [20001],
2863 })
tandriide281ae2016-10-12 06:02:30 -07002864 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2865 self.calls = [
2866 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2867 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2868 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2869 ((['git', 'config', 'rietveld.server'],),
2870 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002871 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002872 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002873 ]
2874
2875 def _buildbucket_retry(*_, **kw):
2876 # self.maxDiff = 10000
2877 body = json.loads(kw['body'])
2878 self.assertEqual(len(body['builds']), 1)
2879 build = body['builds'][0]
2880 params = json.loads(build.pop('parameters_json'))
2881 self.assertEqual(params, {
2882 u'builder_name': u'win',
2883 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2884 u'revision': None}],
2885 u'properties': {
2886 u'category': u'git_cl_try',
2887 u'issue': 123,
2888 u'key': u'val',
2889 u'json': [{u'a': 1}, None],
2890 u'master': u'tryserver.chromium',
2891 u'patch_project': u'depot_tools',
2892 u'patch_storage': u'rietveld',
2893 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002894 u'rietveld': u'https://codereview.chromium.org',
2895 }
2896 })
2897 self.assertEqual(build, {
2898 u'bucket': u'master.tryserver.chromium',
2899 u'client_operation_id': u'uuid4',
2900 u'tags': [u'builder:win',
2901 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002902 u'user_agent:git_cl_try',
2903 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002904 })
2905
2906 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2907
2908 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2909 self.assertEqual(0, git_cl.main([
2910 'try', '-m', 'tryserver.chromium', '-b', 'win',
2911 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2912 self.assertRegexpMatches(
2913 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002914 'Tried jobs on:\nBucket: master.tryserver.chromium')
2915
tandrii8c5a3532016-11-04 07:52:02 -07002916 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2917 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2918 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2919
tandrii8c5a3532016-11-04 07:52:02 -07002920 self.calls = [
2921 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2922 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2923 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2924 ((['git', 'config', 'branch.feature.gerritserver'],),
2925 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002926 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002927 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002928 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002929 'status': 'OPEN',
2930 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002931 'revisions': {
2932 'deadbeaf': {
2933 '_number': 6,
2934 },
2935 'beeeeeef': {
2936 '_number': 7,
2937 'fetch': {'http': {
2938 'url': 'https://chromium.googlesource.com/depot_tools',
2939 'ref': 'refs/changes/56/123456/7'
2940 }},
2941 },
2942 },
2943 }),
2944 ]
2945
2946 def _buildbucket_retry(*_, **kw):
2947 # self.maxDiff = 10000
2948 body = json.loads(kw['body'])
2949 self.assertEqual(len(body['builds']), 1)
2950 build = body['builds'][0]
2951 params = json.loads(build.pop('parameters_json'))
2952 self.assertEqual(params, {
2953 u'builder_name': u'win',
2954 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2955 u'revision': None}],
2956 u'properties': {
2957 u'category': u'git_cl_try',
2958 u'key': u'val',
2959 u'json': [{u'a': 1}, None],
2960 u'master': u'tryserver.chromium',
2961
2962 u'patch_gerrit_url':
2963 u'https://chromium-review.googlesource.com',
2964 u'patch_issue': 123456,
2965 u'patch_project': u'depot_tools',
2966 u'patch_ref': u'refs/changes/56/123456/7',
2967 u'patch_repository_url':
2968 u'https://chromium.googlesource.com/depot_tools',
2969 u'patch_set': 7,
2970 u'patch_storage': u'gerrit',
2971 }
2972 })
2973 self.assertEqual(build, {
2974 u'bucket': u'master.tryserver.chromium',
2975 u'client_operation_id': u'uuid4',
2976 u'tags': [
2977 u'builder:win',
2978 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2979 u'user_agent:git_cl_try',
2980 u'master:tryserver.chromium'],
2981 })
2982
2983 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2984
2985 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2986 self.assertEqual(0, git_cl.main([
2987 'try', '-m', 'tryserver.chromium', '-b', 'win',
2988 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2989 self.assertRegexpMatches(
2990 git_cl.sys.stdout.getvalue(),
2991 'Tried jobs on:\nBucket: master.tryserver.chromium')
2992
borenet6c0efe62016-10-19 08:13:29 -07002993 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002994 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2995 lambda _: {
2996 'owner_email': 'owner@e.mail',
2997 'private': False,
2998 'closed': False,
2999 'project': 'depot_tools',
3000 'patchsets': [20001],
3001 })
borenet6c0efe62016-10-19 08:13:29 -07003002 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
3003 self.calls = [
3004 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3005 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3006 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3007 ((['git', 'config', 'rietveld.server'],),
3008 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07003009 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07003010 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07003011 ]
3012
3013 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07003014 body = json.loads(kw['body'])
3015 self.assertEqual(len(body['builds']), 1)
3016 build = body['builds'][0]
3017 params = json.loads(build.pop('parameters_json'))
3018 self.assertEqual(params, {
3019 u'builder_name': u'win',
3020 u'changes': [{u'author': {u'email': u'owner@e.mail'},
3021 u'revision': None}],
3022 u'properties': {
3023 u'category': u'git_cl_try',
3024 u'issue': 123,
3025 u'patch_project': u'depot_tools',
3026 u'patch_storage': u'rietveld',
3027 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07003028 u'rietveld': u'https://codereview.chromium.org',
3029 }
3030 })
3031 self.assertEqual(build, {
3032 u'bucket': u'test.bucket',
3033 u'client_operation_id': u'uuid4',
3034 u'tags': [u'builder:win',
3035 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
3036 u'user_agent:git_cl_try'],
3037 })
3038
3039 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3040
3041 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3042 self.assertEqual(0, git_cl.main([
3043 'try', '-B', 'test.bucket', '-b', 'win']))
3044 self.assertRegexpMatches(
3045 git_cl.sys.stdout.getvalue(),
3046 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07003047
qyearsley123a4682016-10-26 09:12:17 -07003048 def test_git_cl_try_bots_on_multiple_masters(self):
3049 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
3050 self.calls = [
3051 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3052 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3053 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3054 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07003055 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07003056 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
3057 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3058 ]
3059
3060 def _buildbucket_retry(*_, **kw):
3061 body = json.loads(kw['body'])
3062 self.assertEqual(len(body['builds']), 2)
3063
Nodir Turakulovb422e682018-02-20 22:51:30 -08003064 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
3065 params = json.loads(body['builds'][0]['parameters_json'])
3066 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07003067
Nodir Turakulovb422e682018-02-20 22:51:30 -08003068 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
3069 params = json.loads(body['builds'][1]['parameters_json'])
3070 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07003071
3072 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3073
3074 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08003075 json.dumps({
3076 'builder1': {'bucket': 'bucket1'},
3077 'builder2': {'bucket': 'bucket2'},
3078 })))
qyearsley123a4682016-10-26 09:12:17 -07003079
3080 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3081 self.assertEqual(
3082 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3083 self.assertEqual(
3084 git_cl.sys.stdout.getvalue(),
3085 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08003086 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07003087 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08003088 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07003089 ' builder2: []\n'
3090 'To see results here, run: git cl try-results\n'
3091 'To see results in browser, run: git cl web\n')
3092
tandrii16e0b4e2016-06-07 10:34:28 -07003093 def _common_GerritCommitMsgHookCheck(self):
3094 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3095 self.mock(git_cl.os.path, 'abspath',
3096 lambda path: self._mocked_call(['abspath', path]))
3097 self.mock(git_cl.os.path, 'exists',
3098 lambda path: self._mocked_call(['exists', path]))
3099 self.mock(git_cl.gclient_utils, 'FileRead',
3100 lambda path: self._mocked_call(['FileRead', path]))
3101 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3102 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3103 self.calls = [
3104 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3105 ((['abspath', '../'],), '/abs/git_repo_root'),
3106 ]
3107 return git_cl.Changelist(codereview='gerrit', issue=123)
3108
3109 def test_GerritCommitMsgHookCheck_custom_hook(self):
3110 cl = self._common_GerritCommitMsgHookCheck()
3111 self.calls += [
3112 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3113 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3114 '#!/bin/sh\necho "custom hook"')
3115 ]
3116 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3117
3118 def test_GerritCommitMsgHookCheck_not_exists(self):
3119 cl = self._common_GerritCommitMsgHookCheck()
3120 self.calls += [
3121 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3122 ]
3123 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3124
3125 def test_GerritCommitMsgHookCheck(self):
3126 cl = self._common_GerritCommitMsgHookCheck()
3127 self.calls += [
3128 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3129 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3130 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003131 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003132 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3133 ''),
3134 ]
3135 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3136
tandriic4344b52016-08-29 06:04:54 -07003137 def test_GerritCmdLand(self):
3138 self.calls += [
3139 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3140 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3141 'deadbeaf'),
3142 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3143 ((['git', 'config', 'branch.feature.gerritserver'],),
3144 'chromium-review.googlesource.com'),
3145 ]
3146 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3147 cl._codereview_impl._GetChangeDetail = lambda _: {
3148 'labels': {},
3149 'current_revision': 'deadbeaf',
3150 }
agable32978d92016-11-01 12:55:02 -07003151 cl._codereview_impl._GetChangeCommit = lambda: {
3152 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003153 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003154 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3155 }
tandriic4344b52016-08-29 06:04:54 -07003156 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003157 out = StringIO.StringIO()
3158 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003159 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003160 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003161 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003162
tandrii221ab252016-10-06 08:12:04 -07003163 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08003164 '9000': {
3165 'id': '9000',
3166 'bucket': 'master.x.y',
3167 'created_by': 'user:someone@chromium.org',
3168 'created_ts': '147200002222000',
3169 'experimental': False,
3170 'parameters_json': json.dumps({
3171 'builder_name': 'my-bot',
3172 'properties': {'category': 'cq'},
3173 }),
3174 'status': 'STARTED',
3175 'tags': [
3176 'build_address:x.y/my-bot/2',
3177 'builder:my-bot',
3178 'experimental:false',
3179 'user_agent:cq',
3180 ],
3181 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3182 },
3183 '8000': {
3184 'id': '8000',
3185 'bucket': 'master.x.y',
3186 'created_by': 'user:someone@chromium.org',
3187 'created_ts': '147200001111000',
3188 'experimental': False,
3189 'failure_reason': 'BUILD_FAILURE',
3190 'parameters_json': json.dumps({
3191 'builder_name': 'my-bot',
3192 'properties': {'category': 'cq'},
3193 }),
3194 'result_details_json': json.dumps({
3195 'properties': {'buildnumber': 1},
3196 }),
3197 'result': 'FAILURE',
3198 'status': 'COMPLETED',
3199 'tags': [
3200 'build_address:x.y/my-bot/1',
3201 'builder:my-bot',
3202 'experimental:false',
3203 'user_agent:cq',
3204 ],
3205 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3206 },
3207 }
tandrii221ab252016-10-06 08:12:04 -07003208
3209 def test_write_try_results_json(self):
3210 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08003211 {
3212 'bucket': 'master.x.y',
3213 'buildbucket_id': '8000',
3214 'builder_name': 'my-bot',
3215 'created_ts': '147200001111000',
3216 'experimental': False,
3217 'failure_reason': 'BUILD_FAILURE',
3218 'result': 'FAILURE',
3219 'status': 'COMPLETED',
3220 'tags': [
3221 'build_address:x.y/my-bot/1',
3222 'builder:my-bot',
3223 'experimental:false',
3224 'user_agent:cq',
3225 ],
3226 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3227 },
3228 {
3229 'bucket': 'master.x.y',
3230 'buildbucket_id': '9000',
3231 'builder_name': 'my-bot',
3232 'created_ts': '147200002222000',
3233 'experimental': False,
3234 'failure_reason': None,
3235 'result': None,
3236 'status': 'STARTED',
3237 'tags': [
3238 'build_address:x.y/my-bot/2',
3239 'builder:my-bot',
3240 'experimental:false',
3241 'user_agent:cq',
3242 ],
3243 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3244 },
tandrii221ab252016-10-06 08:12:04 -07003245 ]
3246 self.calls = [(('write_json', 'output.json', expected_output), '')]
3247 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3248
tandrii45b2a582016-10-11 03:14:16 -07003249 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003250 out = StringIO.StringIO()
3251 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003252 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3253 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003254 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3255 self._mocked_call(['get_authenticator_for_host', host]))
3256 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3257 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003258
3259 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3260 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003261 self.calls += [
3262 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3263 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3264 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3265 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3266 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3267 ((['git', 'config', 'branch.feature.rietveldserver'],),
3268 'codereview.example.com'),
3269 ((['get_authenticator_for_host', 'codereview.example.com'],),
3270 AuthenticatorMock()),
3271 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3272
3273 def test_fetch_try_jobs_none_rietveld(self):
3274 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003275 # Simulate that user isn't logged in.
3276 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003277 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003278 self.assertRegexpMatches(sys.stdout.getvalue(),
3279 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003280 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3281
3282 def test_fetch_try_jobs_some_rietveld(self):
3283 self._setup_fetch_try_jobs_rietveld({
3284 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3285 })
3286 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003287 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3288 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3289 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3290
3291 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3292 self._setup_fetch_try_jobs(most_recent_patchset=13)
3293 self.calls += [
3294 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3295 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3296 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003297 # TODO(tandrii): Uncomment the below if we decide to support checking
3298 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003299 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003300 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003301 ((['git', 'config', 'branch.feature.gerritserver'],),
3302 'https://x-review.googlesource.com'),
3303 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3304 AuthenticatorMock()),
3305 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3306
3307 def test_fetch_try_jobs_none_gerrit(self):
3308 self._setup_fetch_try_jobs_gerrit({})
3309 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003310 # TODO(tandrii): Uncomment the below if we decide to support checking
3311 # patchsets for Gerrit.
3312 # self.assertRegexpMatches(
3313 # sys.stdout.getvalue(),
3314 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003315 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3316
3317 def test_fetch_try_jobs_some_gerrit(self):
3318 self._setup_fetch_try_jobs_gerrit({
3319 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3320 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003321 # TODO(tandrii): Uncomment the below if we decide to support checking
3322 # patchsets for Gerrit.
3323 # self.calls.remove(
3324 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003325 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3326
3327 # ... and doesn't result in warning.
3328 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3329 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003330 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3331 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3332
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003333 def _mock_gerrit_changes_for_detail_cache(self):
3334 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003335
3336 def test_gerrit_change_detail_cache_normalize(self):
3337 self._mock_gerrit_changes_for_detail_cache()
3338 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003339 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003340 ]
3341 cl = git_cl.Changelist(codereview='gerrit')
3342 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3343 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3344 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3345 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3346
3347 def test_gerrit_change_detail_cache_simple(self):
3348 self._mock_gerrit_changes_for_detail_cache()
3349 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003350 (('GetChangeDetail', 'host', '1', []), 'a'),
3351 (('GetChangeDetail', 'host', '2', []), 'b'),
3352 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003353 ]
3354 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3355 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3356 self.assertEqual(cl._GetChangeDetail(), 'a')
3357 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003358 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003359 self.assertEqual(cl._GetChangeDetail(), 'a')
3360 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3361
3362 def test_gerrit_change_detail_cache_options(self):
3363 self._mock_gerrit_changes_for_detail_cache()
3364 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003365 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3366 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3367 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3368 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003369 ]
3370 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3371 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3372 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3373 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3374 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3375 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3376 self.assertEqual(cl._GetChangeDetail(), 'cab')
3377
3378 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3379 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3380 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3381 self.assertEqual(cl._GetChangeDetail(), 'cab')
3382
3383 # Finally, no_cache should invalidate all caches for given change.
3384 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3385 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3386
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003387 def test_gerrit_description_caching(self):
3388 def gen_detail(rev, desc):
3389 return {
3390 'current_revision': rev,
3391 'revisions': {rev: {'commit': {'message': desc}}}
3392 }
3393 self.calls = [
3394 (('GetChangeDetail', 'host', '1',
3395 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3396 gen_detail('rev1', 'desc1')),
3397 (('GetChangeDetail', 'host', '1',
3398 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3399 gen_detail('rev2', 'desc2')),
3400 ]
3401
3402 self._mock_gerrit_changes_for_detail_cache()
3403 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3404 self.assertEqual(cl.GetDescription(), 'desc1')
3405 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3406 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003407
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003408 def test_print_current_creds(self):
3409 class CookiesAuthenticatorMock(object):
3410 def __init__(self):
3411 self.gitcookies = {
3412 'host.googlesource.com': ('user', 'pass'),
3413 'host-review.googlesource.com': ('user', 'pass'),
3414 }
3415 self.netrc = self
3416 self.netrc.hosts = {
3417 'github.com': ('user2', None, 'pass2'),
3418 'host2.googlesource.com': ('user3', None, 'pass'),
3419 }
3420 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3421 CookiesAuthenticatorMock)
3422 self.mock(sys, 'stdout', StringIO.StringIO())
3423 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3424 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3425 ' Host\t User\t Which file',
3426 '============================\t=====\t===========',
3427 'host-review.googlesource.com\t user\t.gitcookies',
3428 ' host.googlesource.com\t user\t.gitcookies',
3429 ' host2.googlesource.com\tuser3\t .netrc',
3430 ])
3431 sys.stdout.buf = ''
3432 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3433 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3434 ' Host\tUser\t Which file',
3435 '============================\t====\t===========',
3436 'host-review.googlesource.com\tuser\t.gitcookies',
3437 ' host.googlesource.com\tuser\t.gitcookies',
3438 ])
3439
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003440 def _common_creds_check_mocks(self):
3441 def exists_mock(path):
3442 dirname = os.path.dirname(path)
3443 if dirname == os.path.expanduser('~'):
3444 dirname = '~'
3445 base = os.path.basename(path)
3446 if base in ('.netrc', '.gitcookies'):
3447 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3448 # git cl also checks for existence other files not relevant to this test.
3449 return None
3450 self.mock(os.path, 'exists', exists_mock)
3451 self.mock(sys, 'stdout', StringIO.StringIO())
3452
3453 def test_creds_check_gitcookies_not_configured(self):
3454 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003455 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003456 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003457 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003458 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003459 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3460 (('os.path.exists', '~/.netrc'), True),
3461 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3462 'or Ctrl+C to abort'), ''),
3463 ((['git', 'config', '--global', 'http.cookiefile',
3464 os.path.expanduser('~/.gitcookies')], ), ''),
3465 ]
3466 self.assertEqual(0, git_cl.main(['creds-check']))
3467 self.assertRegexpMatches(
3468 sys.stdout.getvalue(),
3469 '^You seem to be using outdated .netrc for git credentials:')
3470 self.assertRegexpMatches(
3471 sys.stdout.getvalue(),
3472 '\nConfigured git to use .gitcookies from')
3473
3474 def test_creds_check_gitcookies_configured_custom_broken(self):
3475 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003476 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003477 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003478 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003479 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003480 ((['git', 'config', '--global', 'http.cookiefile'],),
3481 '/custom/.gitcookies'),
3482 (('os.path.exists', '/custom/.gitcookies'), False),
3483 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3484 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3485 ((['git', 'config', '--global', 'http.cookiefile',
3486 os.path.expanduser('~/.gitcookies')], ), ''),
3487 ]
3488 self.assertEqual(0, git_cl.main(['creds-check']))
3489 self.assertRegexpMatches(
3490 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003491 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003492 self.assertRegexpMatches(
3493 sys.stdout.getvalue(),
3494 'However, your configured .gitcookies file is missing.')
3495
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003496 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003497 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003498 lambda _, message, publish: self._mocked_call(
3499 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003500 self.calls = [
3501 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3502 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003503 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003504 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003505 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3506 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003507
3508 def test_git_cl_comment_add_gerrit(self):
3509 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003510 lambda host, change, msg, ready:
3511 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003512 self.calls = [
3513 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3514 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3515 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3516 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3517 'origin/master'),
3518 ((['git', 'config', 'remote.origin.url'],),
3519 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003520 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3521 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003522 ]
3523 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3524 '-a', 'msg']))
3525
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003526 def test_git_cl_comments_fetch_rietveld(self):
3527 self.mock(sys, 'stdout', StringIO.StringIO())
3528 self.calls = [
3529 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3530 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3531 ] * 2
3532 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3533 'messages': [
3534 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3535 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3536 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3537 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3538 # Intentionally wrong order here.
3539 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3540 'disapproval': False, 'approval': False,
3541 'sender': 'owner@example.com'},
3542 ],
3543 'owner_email': 'owner@example.com',
3544 })
3545 expected_comments_summary = [
3546 git_cl._CommentSummary(
3547 message='lgtm',
3548 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3549 disapproval=False, approval=True, sender='r@example.com'),
3550 git_cl._CommentSummary(
3551 message='not lgtm',
3552 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3553 disapproval=True, approval=False, sender='r2@example.com'),
3554 # Note: same order as in whatever Rietveld returns.
3555 git_cl._CommentSummary(
3556 message='PTAL',
3557 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3558 disapproval=False, approval=False, sender='owner@example.com'),
3559 ]
3560 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3561 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3562
3563 with git_cl.gclient_utils.temporary_directory() as tempdir:
3564 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3565 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3566 '-j', out_file]))
3567 with open(out_file) as f:
3568 read = json.load(f)
3569 self.assertEqual(len(read), 3)
3570 self.assertEqual(read[0], {
3571 'date': '2000-03-13 20:49:34.515270',
3572 'message': 'PTAL',
3573 'approval': False,
3574 'disapproval': False,
3575 'sender': 'owner@example.com'})
3576 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3577 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3578
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003579 def test_git_cl_comments_fetch_gerrit(self):
3580 self.mock(sys, 'stdout', StringIO.StringIO())
3581 self.calls = [
3582 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3583 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3584 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3585 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3586 'origin/master'),
3587 ((['git', 'config', 'remote.origin.url'],),
3588 'https://chromium.googlesource.com/infra/infra'),
3589 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3590 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003591 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003592 'messages': [
3593 {
3594 u'_revision_number': 1,
3595 u'author': {
3596 u'_account_id': 1111084,
3597 u'email': u'commit-bot@chromium.org',
3598 u'name': u'Commit Bot'
3599 },
3600 u'date': u'2017-03-15 20:08:45.000000000',
3601 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003602 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003603 u'tag': u'autogenerated:cq:dry-run'
3604 },
3605 {
3606 u'_revision_number': 2,
3607 u'author': {
3608 u'_account_id': 11151243,
3609 u'email': u'owner@example.com',
3610 u'name': u'owner'
3611 },
3612 u'date': u'2017-03-16 20:00:41.000000000',
3613 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3614 u'message': u'PTAL',
3615 },
3616 {
3617 u'_revision_number': 2,
3618 u'author': {
3619 u'_account_id': 148512 ,
3620 u'email': u'reviewer@example.com',
3621 u'name': u'reviewer'
3622 },
3623 u'date': u'2017-03-17 05:19:37.500000000',
3624 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3625 u'message': u'Patch Set 2: Code-Review+1',
3626 },
3627 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003628 }),
3629 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3630 '/COMMIT_MSG': [
3631 {
3632 'author': {'email': u'reviewer@example.com'},
3633 'updated': u'2017-03-17 05:19:37.500000000',
3634 'patch_set': 2,
3635 'side': 'REVISION',
3636 'message': 'Please include a bug link',
3637 },
3638 ],
3639 'codereview.settings': [
3640 {
3641 'author': {'email': u'owner@example.com'},
3642 'updated': u'2017-03-16 20:00:41.000000000',
3643 'patch_set': 2,
3644 'side': 'PARENT',
3645 'line': 42,
3646 'message': 'I removed this because it is bad',
3647 },
3648 ]
3649 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003650 ] * 2
3651 expected_comments_summary = [
3652 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003653 message=(
3654 u'PTAL\n' +
3655 u'\n' +
3656 u'codereview.settings\n' +
3657 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3658 u'c/1/2/codereview.settings#b42\n' +
3659 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003660 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3661 disapproval=False, approval=False, sender=u'owner@example.com'),
3662 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003663 message=(
3664 u'Patch Set 2: Code-Review+1\n' +
3665 u'\n' +
3666 u'/COMMIT_MSG\n' +
3667 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3668 u'c/1/2//COMMIT_MSG#\n' +
3669 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003670 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3671 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3672 ]
3673 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3674 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3675
3676 with git_cl.gclient_utils.temporary_directory() as tempdir:
3677 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3678 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3679 '-j', out_file]))
3680 with open(out_file) as f:
3681 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003682 self.assertEqual(len(read), 2)
3683 self.assertEqual(read[0], {
3684 u'date': u'2017-03-16 20:00:41.000000',
3685 u'message': (
3686 u'PTAL\n' +
3687 u'\n' +
3688 u'codereview.settings\n' +
3689 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3690 u'c/1/2/codereview.settings#b42\n' +
3691 u' I removed this because it is bad\n'),
3692 u'approval': False,
3693 u'disapproval': False,
3694 u'sender': u'owner@example.com'})
3695 self.assertEqual(read[1], {
3696 u'date': u'2017-03-17 05:19:37.500000',
3697 u'message': (
3698 u'Patch Set 2: Code-Review+1\n' +
3699 u'\n' +
3700 u'/COMMIT_MSG\n' +
3701 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3702 u'c/1/2//COMMIT_MSG#\n' +
3703 u' Please include a bug link\n'),
3704 u'approval': False,
3705 u'disapproval': False,
3706 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003707
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003708
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003709if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003710 logging.basicConfig(
3711 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003712 unittest.main()