blob: 8bd07ef1f7d33b0f3db1419397170050bbbde237 [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 = []
74 @staticmethod
75 def should_continue():
76 return True
77
78
79class RietveldMock(object):
80 def __init__(self, *args, **kwargs):
81 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000082
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000083 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080084 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000085 return 'Issue: %d' % issue
86
maruel@chromium.org78936cb2013-04-11 00:17:52 +000087 @staticmethod
88 def get_issue_properties(_issue, _messages):
89 return {
90 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
91 'messages': [
92 {
93 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070094 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000095 'sender': 'john@chromium.org',
96 },
97 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010098 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000099 }
100
iannuccie53c9352016-08-17 14:40:40 -0700101 @staticmethod
102 def close_issue(_issue):
103 return 'Closed'
104
skobes6468b902016-10-24 08:45:10 -0700105 @staticmethod
106 def get_patch(issue, patchset):
107 return 'patch set from issue %s patchset %s' % (issue, patchset)
108
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100109 @staticmethod
110 def update_description(_issue, _description):
111 return 'Updated'
112
113 @staticmethod
114 def add_comment(_issue, _comment):
115 return 'Commented'
116
117
skobes6468b902016-10-24 08:45:10 -0700118class GitCheckoutMock(object):
119 def __init__(self, *args, **kwargs):
120 pass
121
122 @staticmethod
123 def reset():
124 GitCheckoutMock.conflict = False
125
126 def apply_patch(self, p):
127 if GitCheckoutMock.conflict:
128 raise Exception('failed')
129
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000130
131class WatchlistsMock(object):
132 def __init__(self, _):
133 pass
134 @staticmethod
135 def GetWatchersForPaths(_):
136 return ['joe@example.com']
137
138
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000139class CodereviewSettingsFileMock(object):
140 def __init__(self):
141 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800142 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000143 def read(self):
144 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000145 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000146
147
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000148class AuthenticatorMock(object):
149 def __init__(self, *_args):
150 pass
151 def has_cached_credentials(self):
152 return True
tandrii221ab252016-10-06 08:12:04 -0700153 def authorize(self, http):
154 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000155
156
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100157def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000158 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
159
160 Usage:
161 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100162 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000163
164 OR
165 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100166 CookiesAuthenticatorMockFactory(
167 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000168 """
169 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800170 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000171 # Intentionally not calling super() because it reads actual cookie files.
172 pass
173 @classmethod
174 def get_gitcookies_path(cls):
175 return '~/.gitcookies'
176 @classmethod
177 def get_netrc_path(cls):
178 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100179 def _get_auth_for_host(self, host):
180 if same_auth:
181 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000182 return (hosts_with_creds or {}).get(host)
183 return CookiesAuthenticatorMock
184
Aaron Gable9a03ae02017-11-03 11:31:07 -0700185
kmarshall9249e012016-08-23 12:02:16 -0700186class MockChangelistWithBranchAndIssue():
187 def __init__(self, branch, issue):
188 self.branch = branch
189 self.issue = issue
190 def GetBranch(self):
191 return self.branch
192 def GetIssue(self):
193 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000194
tandriic2405f52016-10-10 08:13:15 -0700195
196class SystemExitMock(Exception):
197 pass
198
199
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000200class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100201 def test_get_description(self):
202 cl = git_cl.Changelist(issue=1, codereview='rietveld',
203 codereview_host='host')
204 cl.description = 'x'
205 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800206 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100207 self.assertEquals(cl.GetDescription(), 'x')
208 self.assertEquals(cl.GetDescription(force=True), 'y')
209 self.assertEquals(cl.GetDescription(), 'y')
210
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700211 def test_description_footers(self):
212 cl = git_cl.Changelist(issue=1, codereview='gerrit',
213 codereview_host='host')
214 cl.description = '\n'.join([
215 'This is some message',
216 '',
217 'It has some lines',
218 'and, also',
219 '',
220 'Some: Really',
221 'Awesome: Footers',
222 ])
223 cl.has_description = True
224 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
225 msg, footers = cl.GetDescriptionFooters()
226 self.assertEquals(
227 msg, ['This is some message', '', 'It has some lines', 'and, also'])
228 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
229
230 msg.append('wut')
231 footers.append(('gnarly-dude', 'beans'))
232 cl.UpdateDescriptionFooters(msg, footers)
233 self.assertEquals(cl.GetDescription().splitlines(), [
234 'This is some message',
235 '',
236 'It has some lines',
237 'and, also',
238 'wut'
239 '',
240 'Some: Really',
241 'Awesome: Footers',
242 'Gnarly-Dude: beans',
243 ])
244
tandriif9aefb72016-07-01 09:06:51 -0700245 def test_get_bug_line_values(self):
246 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
247 self.assertEqual(f('', ''), [])
248 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
249 self.assertEqual(f('v8', '456'), ['v8:456'])
250 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
251 # Not nice, but not worth carying.
252 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
253 ['v8:456', 'chromium:123', 'v8:123'])
254
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100255 def _test_git_number(self, parent_msg, dest_ref, child_msg,
256 parent_hash='parenthash'):
257 desc = git_cl.ChangeDescription(child_msg)
258 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
259 return desc.description
260
261 def assertEqualByLine(self, actual, expected):
262 self.assertEqual(actual.splitlines(), expected.splitlines())
263
264 def test_git_number_bad_parent(self):
265 with self.assertRaises(ValueError):
266 self._test_git_number('Parent', 'refs/heads/master', 'Child')
267
268 def test_git_number_bad_parent_footer(self):
269 with self.assertRaises(AssertionError):
270 self._test_git_number(
271 'Parent\n'
272 '\n'
273 'Cr-Commit-Position: wrong',
274 'refs/heads/master', 'Child')
275
276 def test_git_number_bad_lineage_ignored(self):
277 actual = self._test_git_number(
278 'Parent\n'
279 '\n'
280 'Cr-Commit-Position: refs/heads/master@{#1}\n'
281 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
282 'refs/heads/master', 'Child')
283 self.assertEqualByLine(
284 actual,
285 'Child\n'
286 '\n'
287 'Cr-Commit-Position: refs/heads/master@{#2}\n'
288 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
289
290 def test_git_number_same_branch(self):
291 actual = self._test_git_number(
292 'Parent\n'
293 '\n'
294 'Cr-Commit-Position: refs/heads/master@{#12}',
295 dest_ref='refs/heads/master',
296 child_msg='Child')
297 self.assertEqualByLine(
298 actual,
299 'Child\n'
300 '\n'
301 'Cr-Commit-Position: refs/heads/master@{#13}')
302
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200303 def test_git_number_same_branch_mixed_footers(self):
304 actual = self._test_git_number(
305 'Parent\n'
306 '\n'
307 'Cr-Commit-Position: refs/heads/master@{#12}',
308 dest_ref='refs/heads/master',
309 child_msg='Child\n'
310 '\n'
311 'Broken-by: design\n'
312 'BUG=123')
313 self.assertEqualByLine(
314 actual,
315 'Child\n'
316 '\n'
317 'Broken-by: design\n'
318 'BUG=123\n'
319 'Cr-Commit-Position: refs/heads/master@{#13}')
320
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100321 def test_git_number_same_branch_with_originals(self):
322 actual = self._test_git_number(
323 'Parent\n'
324 '\n'
325 'Cr-Commit-Position: refs/heads/master@{#12}',
326 dest_ref='refs/heads/master',
327 child_msg='Child\n'
328 '\n'
329 'Some users are smart and insert their own footers\n'
330 '\n'
331 'Cr-Whatever: value\n'
332 'Cr-Commit-Position: refs/copy/paste@{#22}')
333 self.assertEqualByLine(
334 actual,
335 'Child\n'
336 '\n'
337 'Some users are smart and insert their own footers\n'
338 '\n'
339 'Cr-Original-Whatever: value\n'
340 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
341 'Cr-Commit-Position: refs/heads/master@{#13}')
342
343 def test_git_number_new_branch(self):
344 actual = self._test_git_number(
345 'Parent\n'
346 '\n'
347 'Cr-Commit-Position: refs/heads/master@{#12}',
348 dest_ref='refs/heads/branch',
349 child_msg='Child')
350 self.assertEqualByLine(
351 actual,
352 'Child\n'
353 '\n'
354 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
355 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
356
357 def test_git_number_lineage(self):
358 actual = self._test_git_number(
359 'Parent\n'
360 '\n'
361 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
362 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
363 dest_ref='refs/heads/branch',
364 child_msg='Child')
365 self.assertEqualByLine(
366 actual,
367 'Child\n'
368 '\n'
369 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
370 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
371
372 def test_git_number_moooooooore_lineage(self):
373 actual = self._test_git_number(
374 'Parent\n'
375 '\n'
376 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
377 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
378 dest_ref='refs/heads/mooore',
379 child_msg='Child')
380 self.assertEqualByLine(
381 actual,
382 'Child\n'
383 '\n'
384 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
385 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
386 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
387
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100388 def test_git_number_ever_moooooooore_lineage(self):
389 self.maxDiff = 10000
390 actual = self._test_git_number(
391 'CQ commit on fresh new branch + numbering.\n'
392 '\n'
393 'NOTRY=True\n'
394 'NOPRESUBMIT=True\n'
395 'BUG=\n'
396 '\n'
397 'Review-Url: https://codereview.chromium.org/2577703003\n'
398 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
399 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
400 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
401 dest_ref='refs/heads/gnumb-test/cl',
402 child_msg='git cl on fresh new branch + numbering.\n'
403 '\n'
404 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
405 self.assertEqualByLine(
406 actual,
407 'git cl on fresh new branch + numbering.\n'
408 '\n'
409 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
410 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
411 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
412 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
413 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100414
415 def test_git_number_cherry_pick(self):
416 actual = self._test_git_number(
417 'Parent\n'
418 '\n'
419 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
420 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
421 dest_ref='refs/heads/branch',
422 child_msg='Child, which is cherry-pick from master\n'
423 '\n'
424 'Cr-Commit-Position: refs/heads/master@{#100}\n'
425 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
426 self.assertEqualByLine(
427 actual,
428 'Child, which is cherry-pick from master\n'
429 '\n'
430 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
431 '\n'
432 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
433 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
434 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
435
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000436
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200437class TestParseIssueURL(unittest.TestCase):
438 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
439 codereview=None, fail=False):
440 self.assertIsNotNone(parsed)
441 if fail:
442 self.assertFalse(parsed.valid)
443 return
444 self.assertTrue(parsed.valid)
445 self.assertEqual(parsed.issue, issue)
446 self.assertEqual(parsed.patchset, patchset)
447 self.assertEqual(parsed.hostname, hostname)
448 self.assertEqual(parsed.codereview, codereview)
449
450 def _run_and_validate(self, func, url, *args, **kwargs):
451 result = func(urlparse.urlparse(url))
452 if kwargs.pop('fail', False):
453 self.assertIsNone(result)
454 return None
455 self._validate(result, *args, fail=False, **kwargs)
456
457 def test_rietveld(self):
458 def test(url, *args, **kwargs):
459 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
460 *args, codereview='rietveld', **kwargs)
461
462 test('http://codereview.chromium.org/123',
463 123, None, 'codereview.chromium.org')
464 test('https://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/whatever',
469 123, None, 'codereview.chromium.org')
470 test('https://codereview.chromium.org/123/#ps20001',
471 123, 20001, 'codereview.chromium.org')
472 test('http://codereview.chromium.org/download/issue123_4.diff',
473 123, 4, 'codereview.chromium.org')
474 # This looks like bad Gerrit, but is actually valid Rietveld, too.
475 test('https://chrome-review.source.com/123/4/',
476 123, None, 'chrome-review.source.com')
477
478 test('https://codereview.chromium.org/deadbeaf', fail=True)
479 test('https://codereview.chromium.org/api/123', fail=True)
480 test('bad://codereview.chromium.org/123', fail=True)
481 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
482
483 def test_gerrit(self):
484 def test(url, issue=None, patchset=None, hostname=None, fail=None):
485 self._test_ParseIssueUrl(
486 git_cl._GerritChangelistImpl.ParseIssueURL,
487 url, issue, patchset, hostname, fail)
488 def test(url, *args, **kwargs):
489 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
490 *args, codereview='gerrit', **kwargs)
491
492 test('http://chrome-review.source.com/c/123',
493 123, None, 'chrome-review.source.com')
494 test('https://chrome-review.source.com/c/123/',
495 123, None, 'chrome-review.source.com')
496 test('https://chrome-review.source.com/c/123/4',
497 123, 4, '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/123',
503 123, None, 'chrome-review.source.com')
504 test('https://chrome-review.source.com/123/4',
505 123, 4, 'chrome-review.source.com')
506
507 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
508 test('https://chrome-review.source.com/c/abc/', fail=True)
509 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
510
511 def test_ParseIssueNumberArgument(self):
512 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200513 codereview_hint = kwargs.pop('hint', None)
514 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
515 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200516
517 test('123', 123)
518 test('', fail=True)
519 test('abc', fail=True)
520 test('123/1', fail=True)
521 test('123a', fail=True)
522 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
523 # Rietveld.
524 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200525 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200526 test('https://codereview.source.com/123',
527 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200528 # Matches both, but we take Gerrit if specifically requested.
529 test('https://codereview.source.com/123',
530 123, None, 'codereview.source.com', 'gerrit',
531 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200532 # Gerrrit.
533 test('https://chrome-review.source.com/c/123/4',
534 123, 4, 'chrome-review.source.com', 'gerrit')
535 test('https://chrome-review.source.com/bad/123/4', fail=True)
536
537
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100538class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100539 def setUp(self):
540 super(GitCookiesCheckerTest, self).setUp()
541 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100542 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100543
544 def mock_hosts_creds(self, subhost_identity_pairs):
545 def ensure_googlesource(h):
546 if not h.endswith(self.c._GOOGLESOURCE):
547 assert not h.endswith('.')
548 return h + '.' + self.c._GOOGLESOURCE
549 return h
550 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
551 for h, i in subhost_identity_pairs]
552
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200553 def test_identity_parsing(self):
554 self.assertEqual(self.c._parse_identity('ldap.google.com'),
555 ('ldap', 'google.com'))
556 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
557 ('ldap', 'example.com'))
558 # Specical case because we know there are no subdomains in chromium.org.
559 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
560 ('note.period', 'chromium.org'))
561 # Pathological: .period. can be either ldap OR domain, more likely domain.
562 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
563 ('note', 'period.example.com'))
564
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100565 def test_analysis_nothing(self):
566 self.c._all_hosts = []
567 self.assertFalse(self.c.has_generic_host())
568 self.assertEqual(set(), self.c.get_conflicting_hosts())
569 self.assertEqual(set(), self.c.get_duplicated_hosts())
570 self.assertEqual(set(), self.c.get_partially_configured_hosts())
571 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
572
573 def test_analysis(self):
574 self.mock_hosts_creds([
575 ('.googlesource.com', 'git-example.chromium.org'),
576
577 ('chromium', 'git-example.google.com'),
578 ('chromium-review', 'git-example.google.com'),
579 ('chrome-internal', 'git-example.chromium.org'),
580 ('chrome-internal-review', 'git-example.chromium.org'),
581 ('conflict', 'git-example.google.com'),
582 ('conflict-review', 'git-example.chromium.org'),
583 ('dup', 'git-example.google.com'),
584 ('dup', 'git-example.google.com'),
585 ('dup-review', 'git-example.google.com'),
586 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200587 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100588 ])
589 self.assertTrue(self.c.has_generic_host())
590 self.assertEqual(set(['conflict.googlesource.com']),
591 self.c.get_conflicting_hosts())
592 self.assertEqual(set(['dup.googlesource.com']),
593 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200594 self.assertEqual(set(['partial.googlesource.com',
595 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100596 self.c.get_partially_configured_hosts())
597 self.assertEqual(set(['chromium.googlesource.com',
598 'chrome-internal.googlesource.com']),
599 self.c.get_hosts_with_wrong_identities())
600
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100601 def test_report_no_problems(self):
602 self.test_analysis_nothing()
603 self.mock(sys, 'stdout', StringIO.StringIO())
604 self.assertFalse(self.c.find_and_report_problems())
605 self.assertEqual(sys.stdout.getvalue(), '')
606
607 def test_report(self):
608 self.test_analysis()
609 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200610 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
611 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100612 self.assertTrue(self.c.find_and_report_problems())
613 with open(os.path.join(os.path.dirname(__file__),
614 'git_cl_creds_check_report.txt')) as f:
615 expected = f.read()
616 def by_line(text):
617 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200618 self.maxDiff = 10000
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200619 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100620
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800621
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000622class TestGitCl(TestCase):
623 def setUp(self):
624 super(TestGitCl, self).setUp()
625 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700626 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000627 self.mock(subprocess2, 'call', self._mocked_call)
628 self.mock(subprocess2, 'check_call', self._mocked_call)
629 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700630 self.mock(subprocess2, 'communicate',
631 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000632 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000633 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000634 self.mock(git_common, 'get_or_create_merge_base',
635 lambda *a: (
636 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000637 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000638 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100639 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
640 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700641 self.mock(git_cl, 'write_json', lambda path, contents:
642 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000643 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000644 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000645 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700646 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
647 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000648 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000649 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000650 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100651 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
652 lambda *args, **kwargs: self._mocked_call(
653 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700654 self.mock(git_cl.gerrit_util, 'GetChangeComments',
655 lambda *args, **kwargs: self._mocked_call(
656 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100657 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700658 lambda h, i, reviewers, ccs, notify: self._mocked_call(
659 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700660 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700661 lambda h, i, msg=None, labels=None, notify=None:
662 self._mocked_call('SetReview', h, i, msg, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000663 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
664 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700665 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100666 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000667 # It's important to reset settings to not have inter-tests interference.
668 git_cl.settings = None
669
670 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000671 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100672 self.assertEquals([], self.calls)
673 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000674 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100675 raise
676 # Sadly, has_failed() returns True if this OR any other tests before this
677 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200678 git_cl.logging.error(
679 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100680 'There are un-consumed self.calls after this test has finished.\n'
681 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700682 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200683 'If you are already running only this test, then **first** fix the '
684 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100685 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700686 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100687 'and follow instructions above.\n' +
688 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000689 finally:
690 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000691
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000692 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000693 self.assertTrue(
694 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700695 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000696 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000697 expected_args, result = top
698
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000699 # Also logs otherwise it could get caught in a try/finally and be hard to
700 # diagnose.
701 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700702 N = 5
703 prior_calls = '\n '.join(
704 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
705 for i, c in enumerate(self._calls_done[-N:]))
706 following_calls = '\n '.join(
707 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
708 for i, c in enumerate(self.calls[:N]))
709 extended_msg = (
710 'A few prior calls:\n %s\n\n'
711 'This (expected):\n @%d: %r\n'
712 'This (actual):\n @%d: %r\n\n'
713 'A few following expected calls:\n %s' %
714 (prior_calls, len(self._calls_done), expected_args,
715 len(self._calls_done), args, following_calls))
716 git_cl.logging.error(extended_msg)
717
tandrii99a72f22016-08-17 14:33:24 -0700718 self.fail('@%d\n'
719 ' Expected: %r\n'
720 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700721 len(self._calls_done), expected_args, args))
722
723 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700724 if isinstance(result, Exception):
725 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000726 return result
727
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100728 def test_ask_for_explicit_yes_true(self):
729 self.calls = [
730 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
731 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
732 ]
733 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
734
735 def test_ask_for_explicit_yes_true(self):
736 self.calls = [
737 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
738 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
739 ]
740 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
741
tandrii48df5812016-10-17 03:55:37 -0700742 def test_LoadCodereviewSettingsFromFile_gerrit(self):
743 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
744 self.calls = [
745 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
747 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
748 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
750 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700751 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
752 CERR1),
753 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700754 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
755 CERR1),
756 ((['git', 'config', 'gerrit.host', 'true'],), ''),
757 ]
758 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
759
maruel@chromium.orga3353652011-11-30 14:26:57 +0000760 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000761 def _is_gerrit_calls(cls, gerrit=False):
762 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
763 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
764
765 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000766 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200767 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000768 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000769
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000770 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200771 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
772 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
773 ((['git', 'config', 'core.editor'],), ''),
774 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000775
776 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200777 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000778 if similarity is None:
779 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700780 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700781 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000782 else:
tandrii33a46ff2016-08-23 05:53:40 -0700783 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700784 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000785
786 if find_copies is None:
787 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700788 find_copies_call = ((['git', 'config', '--bool',
789 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000790 else:
tandrii5d48c322016-08-18 16:19:37 -0700791 val = str(find_copies).lower()
792 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000793 'branch.master.git-find-copies', val],), '')
794
795 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000796 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800797 '-l100000', '-C'+similarity,
798 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000799 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000800 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000801 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000802
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000803 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000804 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000805 similarity_call,
806 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
807 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000808 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000809 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700810 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
811 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000812 ((['git', 'config', 'rietveld.server'],),
813 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000814 ((['git', 'config', 'branch.master.merge'],), 'master'),
815 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000816 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000817 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000818 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000819 ((['git', 'rev-parse', '--show-cdup'],), ''),
820 ((['git', 'rev-parse', 'HEAD'],), '12345'),
821 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000822 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000823 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700824 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000825 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000826 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000827 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000828 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000829 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000830 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000831 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000832 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700833 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000834 ]
835
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000836 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000837 def _git_upload_calls(cls, private):
838 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000839 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000840 private_call = []
841 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000842 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000843 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000844 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000845
maruel@chromium.orga3353652011-11-30 14:26:57 +0000846 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000847 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000848 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000849 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800850 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000851 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700852 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000853 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000854 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000855 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700856 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000857 ] + cls._git_post_upload_calls()
858
859 @classmethod
860 def _git_post_upload_calls(cls):
861 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000862 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
863 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
864 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000865 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000866 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000867 ]
868
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000869 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000870 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000871 fake_ancestor = 'fake_ancestor'
872 fake_cl = 'fake_cl_for_patch'
873 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000874 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000875 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000876 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000877 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000878 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000879 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000880 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000881 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700882 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000883 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000884 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000885 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000886 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000887 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000888 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000889 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000890 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000891 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000892 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000893 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000894
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000895 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700896 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000898 return [
899 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000900 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000901 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000902 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700903 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000904 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000905 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100906 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000907 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000908 ]
909
910 def _run_reviewer_test(
911 self,
912 upload_args,
913 expected_description,
914 returned_description,
915 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000916 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700917 private=False,
918 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000919 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000920 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000921 try:
922 similarity = upload_args[upload_args.index('--similarity')+1]
923 except ValueError:
924 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000925
926 if '--find-copies' in upload_args:
927 find_copies = True
928 elif '--no-find-copies' in upload_args:
929 find_copies = False
930 else:
931 find_copies = None
932
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000933 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700934 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000935
936 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000937
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000938 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000939 self.assertEquals(
940 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000941 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000942 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000943 '#--------------------This line is 72 characters long'
944 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000945 expected_description,
946 desc)
947 return returned_description
948 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000949
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000951 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700952 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000953 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000954 return 1, 2
955 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000956
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000957 git_cl.main(['upload'] + upload_args)
958
959 def test_no_reviewer(self):
960 self._run_reviewer_test(
961 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000962 'desc\n\nBUG=',
963 '# Blah blah comment.\ndesc\n\nBUG=',
964 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000965 [])
966
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000967 def test_keep_similarity(self):
968 self._run_reviewer_test(
969 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000970 'desc\n\nBUG=',
971 '# Blah blah comment.\ndesc\n\nBUG=',
972 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000973 [])
974
iannucci@chromium.org79540052012-10-19 23:15:26 +0000975 def test_keep_find_copies(self):
976 self._run_reviewer_test(
977 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000978 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000979 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000980 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000981 [])
982
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000983 def test_private(self):
984 self._run_reviewer_test(
985 ['--private'],
986 'desc\n\nBUG=',
987 '# Blah blah comment.\ndesc\n\nBUG=\n',
988 'desc\n\nBUG=',
989 [])
990
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000991 def test_reviewers_cmd_line(self):
992 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000993 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000994 self._run_reviewer_test(
995 ['-r' 'foo@example.com'],
996 description,
997 '\n%s\n' % description,
998 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000999 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001000
1001 def test_reviewer_tbr_overriden(self):
1002 # Reviewer is overriden with TBR
1003 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001004 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001005 self._run_reviewer_test(
1006 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001007 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001008 description.strip('\n'),
1009 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001010 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001011
1012 def test_reviewer_multiple(self):
1013 # Handles multiple R= or TBR= lines.
1014 description = (
bradnelsond975b302016-10-23 12:20:23 -07001015 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1016 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001017 self._run_reviewer_test(
1018 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001019 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001020 description,
1021 description,
bradnelsond975b302016-10-23 12:20:23 -07001022 ['--reviewers=another@example.com,reviewer@example.com'],
1023 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001024
maruel@chromium.orga3353652011-11-30 14:26:57 +00001025 def test_reviewer_send_mail(self):
1026 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001027 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +00001028 self._run_reviewer_test(
1029 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001030 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +00001031 description.strip('\n'),
1032 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001033 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +00001034
1035 def test_reviewer_send_mail_no_rev(self):
1036 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001037 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +02001038 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -07001039 ((['DieWithError', 'Must specify reviewers to send email.'],),
1040 SystemExitMock())
1041 ]
1042
1043 def RunEditor(desc, _, **kwargs):
1044 return desc
1045 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1046 self.mock(sys, 'stdout', stdout)
1047 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001048 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001049 self.assertEqual(
1050 '=====================================\n'
1051 'NOTICE: Rietveld is being deprecated. '
1052 'You can upload changes to Gerrit with\n'
1053 ' git cl upload --gerrit\n'
1054 'or set Gerrit to be your default code review tool with\n'
1055 ' git config gerrit.host true\n'
1056 '=====================================\n',
1057 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001058
tandriif9aefb72016-07-01 09:06:51 -07001059 def test_bug_on_cmd(self):
1060 self._run_reviewer_test(
1061 ['--bug=500658,proj:123'],
1062 'desc\n\nBUG=500658\nBUG=proj:123',
1063 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1064 'desc\n\nBUG=500658\nBUG=proj:1234',
1065 [])
1066
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001067 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1068 parent_msg=None,
1069 new_msg=None,
1070 fail_after_parent_msg=False,
1071 fail_cherry_pick=False,
1072 fail_push_count=0,
1073 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001074 if debug:
1075 # Very useful due to finally clause in git cl land raising exceptions and
1076 # shadowing real cause of failure.
1077 self.mock(git_cl, '_IS_BEING_TESTED', True)
1078 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001079 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001080
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001081 if git_numberer_enabled:
1082 # Special mocks to check validity of timestamp.
1083 original_git_amend_head = git_cl._git_amend_head
1084 def _git_amend_head_mock(msg, tstamp):
1085 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1086 return original_git_amend_head(msg, tstamp)
1087 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1088
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001089 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1090 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001091 self.mock(RietveldMock, 'update_description', staticmethod(
1092 lambda i, d: self._mocked_call(['update_description', i, d])))
1093 self.mock(RietveldMock, 'add_comment', staticmethod(
1094 lambda i, c: self._mocked_call(['add_comment', i, c])))
1095 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001096 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1097 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1098 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1099 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1100 CERR1),
1101 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1102 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001103 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001104 ((['git', 'config', 'rietveld.server'],),
1105 'https://codereview.chromium.org'),
1106 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1107 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1108 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1109 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001110 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1111 ''), # No commits to rebase, according to local view of origin.
1112 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1113 'fake_ancestor_sha'),
1114 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1115 ((['git', 'rev-parse', '--show-cdup'],), ''),
1116 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1117 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1118 'fake_ancestor_sha...', '.'],),
1119 'M\tfile1.cpp'),
1120 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1121 ((['git', 'config', 'branch.feature.rietveldserver'],),
1122 'https://codereview.chromium.org'),
1123 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1124 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1125 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1126 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001127 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001128 # file1.cpp | 53 ++++++--
1129 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1130 ''),
1131 ((['git', 'show-ref', '--quiet', '--verify',
1132 'refs/heads/git-cl-commit'],),
1133 ''), # 0 return code means branch exists.
1134 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1135 ((['git', 'show-ref', '--quiet', '--verify',
1136 'refs/heads/git-cl-cherry-pick'],),
1137 CERR1), # This means git-cl-cherry-pick branch does not exist.
1138 ((['git', 'rev-parse', '--show-cdup'],), ''),
1139 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1140 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1141 ((['git', 'commit', '-m',
1142 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001143 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001144 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1145 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1146 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001147 repo_url),
1148
1149 ((['git', 'config', 'remote.origin.url'],), repo_url),
1150 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1151 git_numberer_enabled),
1152
1153 # Auto-rebase init.
1154 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1155 ]
1156 # Auto-rebase loops.
1157 for attempt in xrange(fail_push_count + 1):
1158 self.calls += [
1159 # Auto-rebase loop start.
1160 ((['git', 'retry', 'fetch', 'origin',
1161 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1162 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1163 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1164 # different in each loop iteration for truly realistic test.
1165 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1166 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1167 callError(1, 'failed to cherry pick') if fail_cherry_pick
1168 else ''),
1169 ]
1170 if fail_cherry_pick:
1171 return
1172
1173 if git_numberer_enabled:
1174 assert parent_msg
1175 self.calls += [
1176 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1177 parent_msg),
1178 ]
1179 if fail_after_parent_msg:
1180 return
1181 assert new_msg
1182 self.calls += [
1183 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1184 '1480022355'), # Committer's unix timestamp.
1185 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1186 '1480024000'),
1187 ((['git_amend_head committer timestamp', 1480024000],), ''),
1188 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1189 ]
1190 self.calls += [
1191 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1192 CERR1 if attempt < fail_push_count else ''),
1193 ]
1194 # End of autorebase + push.
1195
1196 self.calls += [
1197 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1198 ]
1199 if git_numberer_enabled:
1200 self.calls += [
1201 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1202 ]
1203
1204 # Cleanup calls.
1205 self.calls += [
1206 ((['git', 'checkout', '-q', 'feature'],), ''),
1207 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1208 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001209 ]
1210
1211 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001212 self._land_rietveld_calls(
1213 repo_url='https://chromium.googlesource.com/infra/infra',
1214 git_numberer_enabled=False,
1215 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001216 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001217 ((['git', 'config', 'rietveld.viewvc-url'],),
1218 'https://chromium.googlesource.com/infra/infra/+/'),
1219 ((['update_description', 123,
1220 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001221 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001222 ''),
1223 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001224 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001225 ]
1226 git_cl.main(['land'])
1227
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001228 def test_land_rietveld_fail_cherry_pick(self):
1229 self._land_rietveld_calls(
1230 repo_url='https://chromium.googlesource.com/infra/infra',
1231 git_numberer_enabled=False,
1232 fail_cherry_pick=True,
1233 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001234 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001235 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1236 'U path/file1\n'
1237 'U file2.cpp\n'),
1238 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001239 ((['git', 'checkout', '-q', 'feature'],), ''),
1240 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001241 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1242 ]
1243 git_cl.main(['land'])
1244
1245 def test_land_rietveld_git_numberer_fail_1_push(self):
1246 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1247
1248 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1249 self._land_rietveld_calls(
1250 repo_url='https://chromium.googlesource.com/chromium/src',
1251 git_numberer_enabled=True,
1252 parent_msg=('This is parent commit.\n'
1253 '\n'
1254 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1255 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1256 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1257 '\n'
1258 'Review-Url: https://codereview.chromium.org/123 .\n'
1259 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1260 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1261 fail_push_count=fail_push_count,
1262 debug=False)
1263
1264 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001265 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001266 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001267 ((['update_description', 123,
1268 'Issue: 123\n\nR=john@chromium.org\n'
1269 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001270 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001271 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1272 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1273 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001274 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001275 ''),
1276 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001277 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001278 ]
1279 git_cl.main(['land'])
1280
1281 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001282 self._land_rietveld_calls(
1283 repo_url='https://chromium.googlesource.com/v8/v8',
1284 git_numberer_enabled=True,
1285 parent_msg='This is parent commit with no footer.',
1286 fail_after_parent_msg=True,
1287 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001288 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001289 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001290 ((['git', 'checkout', '-q', 'feature'],), ''),
1291 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001292 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001293 ]
1294 with self.assertRaises(ValueError) as cm:
1295 git_cl.main(['land'])
1296 self.assertEqual(cm.exception.message,
1297 'Unable to infer commit position from footers')
1298
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001299 def test_git_numberer_not_whitelisted_repo(self):
1300 self.calls = []
1301 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001302 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1303 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001304 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001305
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001306 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001307 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1308 self.calls = [
1309 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001310 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001311 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001312 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001313 remote_url='https://chromium.googlesource.com/chromium/src',
1314 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001315 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001316
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001317 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001318 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001319 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001320 def fake_temporary_directory(**kwargs):
1321 yield tempdir
1322 self.mock(git_cl.gclient_utils, 'temporary_directory',
1323 fake_temporary_directory)
1324 self._test_GitNumbererState_valid_configs_inner(tempdir)
1325
1326 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001327 self.calls = [
1328 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001329 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001330 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1331 '''
1332 [plugin "git-numberer"]
1333 validate-enabled-refglob = refs/else/*
1334 validate-enabled-refglob = refs/heads/*
1335 validate-disabled-refglob = refs/heads/disabled
1336 validate-disabled-refglob = refs/branch-heads/*
1337 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001338 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1339 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001340 'refs/else/*\n'
1341 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001342 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1343 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001344 'refs/heads/disabled\n'
1345 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001346 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001347
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001348 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001349 remote_url='https://chromium.googlesource.com/chromium/src',
1350 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001351 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001352
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001353 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001354 remote_url='https://chromium.googlesource.com/chromium/src',
1355 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001356 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001357
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001358 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001359 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001360 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001361 remote_url='https://chromium.googlesource.com/chromium/src',
1362 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001363 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001364
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001365 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001366 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001367 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001368 if skip_auth_check:
1369 return [((cmd, ), 'true')]
1370
tandrii5d48c322016-08-18 16:19:37 -07001371 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001372 if issue:
1373 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001374 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001375 ])
1376 calls.extend([
1377 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1378 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1379 ((['git', 'config', 'remote.origin.url'],),
1380 'https://chromium.googlesource.com/my/repo'),
1381 ((['git', 'config', 'remote.origin.url'],),
1382 'https://chromium.googlesource.com/my/repo'),
1383 ])
1384 return calls
1385
1386 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001387 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 fetched_status=None, other_cl_owner=None,
1389 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001390 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001391 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1392 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1393 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1394 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001395 ]
1396 calls += cls._is_gerrit_calls(True)
1397 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001398 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1399 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1400 ((['git', 'config', 'branch.master.gerritissue'],),
1401 CERR1 if issue is None else str(issue)),
1402 ]
1403
1404 if custom_cl_base:
1405 ancestor_revision = custom_cl_base
1406 else:
1407 # Determine ancestor_revision to be merge base.
1408 ancestor_revision = 'fake_ancestor_sha'
1409 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001410 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001411 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001412 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001413 'refs/remotes/origin/master'],), ancestor_revision),
1414 ]
1415
1416 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001417 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1418
1419 if issue:
1420 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001421 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001422 '123456',
1423 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001424 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001425 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001426 'change_id': '123456789',
1427 'current_revision': 'sha1_of_current_revision',
1428 'revisions': { 'sha1_of_current_revision': {
1429 'commit': {'message': fetched_description},
1430 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001431 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001432 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001433 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001434 if fetched_status == 'ABANDONED':
1435 calls += [
1436 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1437 '123456 has been abandoned, new uploads are not '
1438 'allowed'), SystemExitMock()),
1439 ]
1440 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001441 if other_cl_owner:
1442 calls += [
1443 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1444 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001445
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001446 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1447 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001448 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001449 ((['git', 'rev-parse', '--show-cdup'],), ''),
1450 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001451
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001452 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1453 ancestor_revision + '...', '.'],),
1454 'M\t.gitignore\n'),
1455 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001456 ]
1457
1458 if not issue:
1459 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001460 ((['git', 'log', '--pretty=format:%s%n%n%b',
1461 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001462 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001463 ]
1464
1465 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001466 ((['git', 'config', 'user.email'],), 'me@example.com'),
1467 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1468 ([custom_cl_base] if custom_cl_base else
1469 [ancestor_revision, 'HEAD']),),
1470 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001471 ]
1472 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001473
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001474 @classmethod
1475 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001476 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001477 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001478 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001479 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001480 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001481 if post_amend_description is None:
1482 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001483 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001484 # Determined in `_gerrit_base_calls`.
1485 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1486
1487 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001488
tandriia60502f2016-06-20 02:01:53 -07001489 if squash_mode == 'default':
1490 calls.extend([
1491 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1492 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1493 ])
1494 elif squash_mode in ('override_squash', 'override_nosquash'):
1495 calls.extend([
1496 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1497 'true' if squash_mode == 'override_squash' else 'false'),
1498 ])
1499 else:
1500 assert squash_mode in ('squash', 'nosquash')
1501
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001502 # If issue is given, then description is fetched from Gerrit instead.
1503 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001504 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001505 ((['git', 'log', '--pretty=format:%s\n\n%b',
1506 ((custom_cl_base + '..') if custom_cl_base else
1507 'fake_ancestor_sha..HEAD')],),
1508 description),
1509 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001510 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001511 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001512 else:
1513 if not title:
1514 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001515 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1516 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001517 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001518 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001519 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001520 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001521 (('DownloadGerritHook', False), ''),
1522 # Amending of commit message to get the Change-Id.
1523 ((['git', 'log', '--pretty=format:%s\n\n%b',
1524 determined_ancestor_revision + '..HEAD'],),
1525 description),
1526 ((['git', 'commit', '--amend', '-m', description],), ''),
1527 ((['git', 'log', '--pretty=format:%s\n\n%b',
1528 determined_ancestor_revision + '..HEAD'],),
1529 post_amend_description)
1530 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001531 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001532 if not issue:
1533 # Prompting to edit description on first upload.
1534 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001535 ((['git', 'config', 'core.editor'],), ''),
1536 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001537 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001538 ref_to_push = 'abcdef0123456789'
1539 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001540 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1541 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1542 ]
1543
1544 if custom_cl_base is None:
1545 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001546 ((['get_or_create_merge_base', 'master',
1547 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001548 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001549 ]
1550 parent = 'origin/master'
1551 else:
1552 calls += [
1553 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1554 'refs/remotes/origin/master'],),
1555 callError(1)), # Means not ancenstor.
1556 (('ask_for_data',
1557 'Do you take responsibility for cleaning up potential mess '
1558 'resulting from proceeding with upload? Press Enter to upload, '
1559 'or Ctrl+C to abort'), ''),
1560 ]
1561 parent = custom_cl_base
1562
1563 calls += [
1564 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1565 '0123456789abcdef'),
1566 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001567 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001568 ref_to_push),
1569 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001570 else:
1571 ref_to_push = 'HEAD'
1572
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001573 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001574 ((['git', 'rev-list',
1575 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1576 ref_to_push],),
1577 '1hashPerLine\n'),
1578 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001579
Aaron Gableafd52772017-06-27 16:40:10 -07001580 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001581 ref_suffix = '%ready,notify=ALL'
1582 else:
1583 if not issue:
1584 ref_suffix = '%wip'
1585 else:
1586 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001587
Aaron Gable70f4e242017-06-26 10:45:59 -07001588 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001589 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001590
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001591 if git_mirror is None:
1592 calls += [
1593 ((['git', 'config', 'remote.origin.url'],),
1594 'https://chromium.googlesource.com/yyy/zzz'),
1595 ]
1596 else:
1597 calls += [
1598 ((['git', 'config', 'remote.origin.url'],),
1599 '/cache/this-dir-exists'),
1600 (('os.path.isdir', '/cache/this-dir-exists'),
1601 True),
1602 # Runs in /cache/this-dir-exists.
1603 ((['git', 'config', 'remote.origin.url'],),
1604 'https://chromium.googlesource.com/yyy/zzz'),
1605 ]
1606
ukai@chromium.orge8077812012-02-03 03:41:46 +00001607 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001608 ((['git', 'push',
1609 'https://chromium.googlesource.com/yyy/zzz',
1610 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001611 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001612 'remote: Processing changes: (\)\n'
1613 'remote: Processing changes: (|)\n'
1614 'remote: Processing changes: (/)\n'
1615 'remote: Processing changes: (-)\n'
1616 'remote: Processing changes: new: 1 (/)\n'
1617 'remote: Processing changes: new: 1, done\n'
1618 'remote:\n'
1619 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001620 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1621 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001622 'remote:\n'
1623 'To https://chromium.googlesource.com/yyy/zzz\n'
1624 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001625 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001626 if squash:
1627 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001628 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001629 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001630 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001631 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001632 ((['git', 'config', 'branch.master.gerritsquashhash',
1633 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001634 ]
tandrii88189772016-09-29 04:29:57 -07001635 calls += [
1636 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001637 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001638 123456 if squash else None, sorted(reviewers),
1639 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001640 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001641 if tbr:
1642 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001643 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1644 ['LABELS']), {
1645 'labels': {
1646 'Code-Review': {
1647 'default_value': 0,
1648 'all': [],
1649 'values': {
1650 '+2': 'lgtm, approved',
1651 '+1': 'lgtm, but someone else must approve',
1652 ' 0': 'No score',
1653 '-1': 'Don\'t submit as-is',
1654 }
1655 }
1656 }
1657 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001658 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001659 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001660 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001661 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001662 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001663 return calls
1664
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001665 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001666 self,
1667 upload_args,
1668 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001669 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001670 squash=True,
1671 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001672 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001673 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001674 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001675 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001676 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001677 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001678 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001679 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001680 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001681 custom_cl_base=None,
1682 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001683 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001684 if squash_mode is None:
1685 if '--no-squash' in upload_args:
1686 squash_mode = 'nosquash'
1687 elif '--squash' in upload_args:
1688 squash_mode = 'squash'
1689 else:
1690 squash_mode = 'default'
1691
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001692 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001693 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001694 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001695 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001696 CookiesAuthenticatorMockFactory(
1697 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001698 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1699 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001700 self.mock(git_cl.gclient_utils, 'RunEditor',
1701 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001702 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1703 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001704
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001705 original_os_path_isdir = os.path.isdir
1706 def selective_os_path_isdir_mock(path):
1707 if path == '/cache/this-dir-exists':
1708 return self._mocked_call('os.path.isdir', path)
1709 return original_os_path_isdir(path)
1710 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1711
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001712 self.calls = self._gerrit_base_calls(
1713 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001714 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001715 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001716 other_cl_owner=other_cl_owner,
1717 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001718 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001719 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1720 expected_content=description))
1721 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001722 self.calls += self._gerrit_upload_calls(
1723 description, reviewers, squash,
1724 squash_mode=squash_mode,
1725 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001726 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001727 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001728 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001729 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001730 # Uncomment when debugging.
1731 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001732 git_cl.main(['upload'] + upload_args)
1733
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001734 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001735 self._run_gerrit_upload_test(
1736 ['--no-squash'],
1737 'desc\n\nBUG=\n',
1738 [],
1739 squash=False,
1740 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1741
1742 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001743 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001744 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001745 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001746 [],
tandriia60502f2016-06-20 02:01:53 -07001747 squash=False,
1748 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001749 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001750
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001751 def test_gerrit_no_reviewer(self):
1752 self._run_gerrit_upload_test(
1753 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001754 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001755 [],
1756 squash=False,
1757 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001758
Nick Carter8692b182017-11-06 16:30:38 -08001759 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001760 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1761 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001762 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001763 'desc\n\nBUG=\n\nChange-Id: I123456789',
1764 squash=False,
1765 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001766 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001767
ukai@chromium.orge8077812012-02-03 03:41:46 +00001768 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001769 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001770 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001771 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001772 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001773 squash=False,
1774 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001775 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001776
1777 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001778 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001779 [],
bradnelsond975b302016-10-23 12:20:23 -07001780 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1781 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001782 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001783 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001784 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001785 cc=['more@example.com', 'people@example.com'],
1786 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001787
1788 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001789 self._run_gerrit_upload_test(
1790 [],
1791 'desc\nBUG=\n\nChange-Id: 123456789',
1792 [],
1793 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001794
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001795 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001796 self._run_gerrit_upload_test(
1797 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001798 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001799 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001800 squash=True,
1801 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001802
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001803 def test_gerrit_upload_squash_first_against_rev(self):
1804 custom_cl_base = 'custom_cl_base_rev_or_branch'
1805 self._run_gerrit_upload_test(
1806 ['--squash', custom_cl_base],
1807 'desc\nBUG=\n\nChange-Id: 123456789',
1808 [],
1809 squash=True,
1810 expected_upstream_ref='origin/master',
1811 custom_cl_base=custom_cl_base)
1812 self.assertIn(
1813 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1814 sys.stdout.getvalue())
1815
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001816 def test_gerrit_upload_squash_first_with_mirror(self):
1817 self._run_gerrit_upload_test(
1818 ['--squash'],
1819 'desc\nBUG=\n\nChange-Id: 123456789',
1820 [],
1821 squash=True,
1822 expected_upstream_ref='origin/master',
1823 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1824
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001825 def test_gerrit_upload_squash_reupload(self):
1826 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001827 self._run_gerrit_upload_test(
1828 ['--squash'],
1829 description,
1830 [],
1831 squash=True,
1832 expected_upstream_ref='origin/master',
1833 issue=123456)
1834
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001835 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1836 self.mock(git_cl, 'DieWithError',
1837 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1838 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1839 with self.assertRaises(SystemExitMock):
1840 self._run_gerrit_upload_test(
1841 ['--squash'],
1842 description,
1843 [],
1844 squash=True,
1845 expected_upstream_ref='origin/master',
1846 issue=123456,
1847 fetched_status='ABANDONED')
1848
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001849 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1850 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1851 lambda *_, **__: {'email': 'yet-another@example.com'})
1852 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1853 self._run_gerrit_upload_test(
1854 ['--squash'],
1855 description,
1856 [],
1857 squash=True,
1858 expected_upstream_ref='origin/master',
1859 issue=123456,
1860 other_cl_owner='other@example.com')
1861 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001862 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001863 'authenticate to Gerrit as yet-another@example.com.\n'
1864 'Uploading may fail due to lack of permissions',
1865 git_cl.sys.stdout.getvalue())
1866
rmistry@google.com2dd99862015-06-22 12:22:18 +00001867 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001868 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001869 def mock_run_git(*args, **_kwargs):
1870 if args[0] == ['for-each-ref',
1871 '--format=%(refname:short) %(upstream:short)',
1872 'refs/heads']:
1873 # Create a local branch dependency tree that looks like this:
1874 # test1 -> test2 -> test3 -> test4 -> test5
1875 # -> test3.1
1876 # test6 -> test0
1877 branch_deps = [
1878 'test2 test1', # test1 -> test2
1879 'test3 test2', # test2 -> test3
1880 'test3.1 test2', # test2 -> test3.1
1881 'test4 test3', # test3 -> test4
1882 'test5 test4', # test4 -> test5
1883 'test6 test0', # test0 -> test6
1884 'test7', # test7
1885 ]
1886 return '\n'.join(branch_deps)
1887 self.mock(git_cl, 'RunGit', mock_run_git)
1888
1889 class RecordCalls:
1890 times_called = 0
1891 record_calls = RecordCalls()
1892 def mock_CMDupload(*args, **_kwargs):
1893 record_calls.times_called += 1
1894 return 0
1895 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1896
1897 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001898 (('ask_for_data', 'This command will checkout all dependent branches '
1899 'and run "git cl upload". Press Enter to continue, '
1900 'or Ctrl+C to abort'), ''),
1901 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001902
1903 class MockChangelist():
1904 def __init__(self):
1905 pass
1906 def GetBranch(self):
1907 return 'test1'
1908 def GetIssue(self):
1909 return '123'
1910 def GetPatchset(self):
1911 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001912 def IsGerrit(self):
1913 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001914
1915 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1916 # CMDupload should have been called 5 times because of 5 dependent branches.
1917 self.assertEquals(5, record_calls.times_called)
1918 self.assertEquals(0, ret)
1919
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08001920 def test_get_hash_tags(self):
1921 cases = [
1922 ('', []),
1923 ('a', []),
1924 ('[a]', ['a']),
1925 ('[aa]', ['aa']),
1926 ('[a ]', ['a']),
1927 ('[a- ]', ['a']),
1928 ('[a- b]', ['a-b']),
1929 ('[a--b]', ['a-b']),
1930 ('[a', []),
1931 ('[a]x', ['a']),
1932 ('[aa]x', ['aa']),
1933 ('[a b]', ['a-b']),
1934 ('[a b]', ['a-b']),
1935 ('[a__b]', ['a-b']),
1936 ('[a] x', ['a']),
1937 ('[a][b]', ['a', 'b']),
1938 ('[a] [b]', ['a', 'b']),
1939 ('[a][b]x', ['a', 'b']),
1940 ('[a][b] x', ['a', 'b']),
1941 ('[a]\n[b]', ['a']),
1942 ('[a\nb]', []),
1943 ('[a][', ['a']),
1944 ('Revert "[a] feature"', ['a']),
1945 ('Reland "[a] feature"', ['a']),
1946 ('Revert: [a] feature', ['a']),
1947 ('Reland: [a] feature', ['a']),
1948 ('Revert "Reland: [a] feature"', ['a']),
1949 ('Foo: feature', ['foo']),
1950 ('Foo Bar: feature', ['foo-bar']),
1951 ('Revert "Foo bar: feature"', ['foo-bar']),
1952 ('Reland "Foo bar: feature"', ['foo-bar']),
1953 ]
1954 for desc, expected in cases:
1955 actual = git_cl._GerritChangelistImpl.GetHashTags(desc)
1956 self.assertEqual(
1957 actual,
1958 expected,
1959 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1960
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001961 def test_gerrit_change_id(self):
1962 self.calls = [
1963 ((['git', 'write-tree'], ),
1964 'hashtree'),
1965 ((['git', 'rev-parse', 'HEAD~0'], ),
1966 'branch-parent'),
1967 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1968 'A B <a@b.org> 1456848326 +0100'),
1969 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1970 'C D <c@d.org> 1456858326 +0100'),
1971 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1972 'hashchange'),
1973 ]
1974 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1975 self.assertEqual(change_id, 'Ihashchange')
1976
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001977 def test_desecription_append_footer(self):
1978 for init_desc, footer_line, expected_desc in [
1979 # Use unique desc first lines for easy test failure identification.
1980 ('foo', 'R=one', 'foo\n\nR=one'),
1981 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1982 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1983 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1984 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1985 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1986 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1987 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1988 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1989 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1990 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1991 ]:
1992 desc = git_cl.ChangeDescription(init_desc)
1993 desc.append_footer(footer_line)
1994 self.assertEqual(desc.description, expected_desc)
1995
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001996 def test_update_reviewers(self):
1997 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001998 ('foo', [], [],
1999 'foo'),
2000 ('foo\nR=xx', [], [],
2001 'foo\nR=xx'),
2002 ('foo\nTBR=xx', [], [],
2003 'foo\nTBR=xx'),
2004 ('foo', ['a@c'], [],
2005 'foo\n\nR=a@c'),
2006 ('foo\nR=xx', ['a@c'], [],
2007 'foo\n\nR=a@c, xx'),
2008 ('foo\nTBR=xx', ['a@c'], [],
2009 'foo\n\nR=a@c\nTBR=xx'),
2010 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
2011 'foo\n\nR=a@c, yy\nTBR=xx'),
2012 ('foo\nBUG=', ['a@c'], [],
2013 'foo\nBUG=\nR=a@c'),
2014 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
2015 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
2016 ('foo', ['a@c', 'b@c'], [],
2017 'foo\n\nR=a@c, b@c'),
2018 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
2019 'foo\nBar\n\nR=c@c\nBUG='),
2020 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
2021 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002022 # Same as the line before, but full of whitespaces.
2023 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002024 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002025 'foo\nBar\n\nR=c@c\n BUG =',
2026 ),
2027 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002028 ('foo BUG=allo R=joe ', ['c@c'], [],
2029 'foo BUG=allo R=joe\n\nR=c@c'),
2030 # Redundant TBRs get promoted to Rs
2031 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
2032 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002033 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002034 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002035 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002036 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002037 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002038 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002039 actual.append(obj.description)
2040 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002041
wittman@chromium.org455dc922015-01-26 20:15:50 +00002042 def test_get_target_ref(self):
2043 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002044 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002045 self.assertEqual(None, git_cl.GetTargetRef(None,
2046 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002047 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002048
wittman@chromium.org455dc922015-01-26 20:15:50 +00002049 # Check default target refs for branches.
2050 self.assertEqual('refs/heads/master',
2051 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002052 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002053 self.assertEqual('refs/heads/master',
2054 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002055 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002056 self.assertEqual('refs/heads/master',
2057 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002058 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002059 self.assertEqual('refs/branch-heads/123',
2060 git_cl.GetTargetRef('origin',
2061 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002062 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002063 self.assertEqual('refs/diff/test',
2064 git_cl.GetTargetRef('origin',
2065 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002066 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00002067 self.assertEqual('refs/heads/chrome/m42',
2068 git_cl.GetTargetRef('origin',
2069 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002070 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002071
2072 # Check target refs for user-specified target branch.
2073 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
2074 'refs/remotes/branch-heads/123'):
2075 self.assertEqual('refs/branch-heads/123',
2076 git_cl.GetTargetRef('origin',
2077 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002078 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002079 for branch in ('origin/master', 'remotes/origin/master',
2080 'refs/remotes/origin/master'):
2081 self.assertEqual('refs/heads/master',
2082 git_cl.GetTargetRef('origin',
2083 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002084 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002085 for branch in ('master', 'heads/master', 'refs/heads/master'):
2086 self.assertEqual('refs/heads/master',
2087 git_cl.GetTargetRef('origin',
2088 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002089 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002090
wychen@chromium.orga872e752015-04-28 23:42:18 +00002091 def test_patch_when_dirty(self):
2092 # Patch when local tree is dirty
2093 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2094 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2095
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002096 @staticmethod
2097 def _get_gerrit_codereview_server_calls(branch, value=None,
2098 git_short_host='host',
2099 detect_branch=True):
2100 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2101
2102 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2103 """
2104 calls = []
2105 if detect_branch:
2106 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
2107 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2108 CERR1 if value is None else value))
2109 if value is None:
2110 calls += [
2111 ((['git', 'config', 'branch.' + branch + '.merge'],),
2112 'refs/heads' + branch),
2113 ((['git', 'config', 'branch.' + branch + '.remote'],),
2114 'origin'),
2115 ((['git', 'config', 'remote.origin.url'],),
2116 'https://%s.googlesource.com/my/repo' % git_short_host),
2117 ]
2118 return calls
2119
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002120 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002121 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002122 detect_gerrit_server=True,
2123 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002124 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002125 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2126 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002127 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002128 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002129 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2130
tandriidf09a462016-08-18 16:23:55 -07002131 if new_branch:
2132 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002133
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002134 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002135 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002136 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002137 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002138 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2139 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2140 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2141 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002142 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002143 if default_codereview == 'gerrit':
2144 if not force_codereview:
2145 self.calls += [
2146 ((['git', 'config', 'gerrit.host'],), 'true'),
2147 ]
2148 if detect_gerrit_server:
2149 self.calls += self._get_gerrit_codereview_server_calls(
2150 'master', git_short_host=git_short_host,
2151 detect_branch=not new_branch and force_codereview)
2152 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002153
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002154 elif default_codereview == 'rietveld':
2155 self.calls += [
2156 ((['git', 'config', 'gerrit.host'],), CERR1),
2157 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2158 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2159 ]
2160 actual_codereview = 'rietveld'
2161
2162 if actual_codereview == 'rietveld':
2163 self.calls += [
2164 ((['git', 'rev-parse', '--show-cdup'],), ''),
2165 ]
2166 if not default_codereview:
2167 self.calls += [
2168 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2169 ]
2170 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002171 self.calls += [
2172 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002173 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002174 {
2175 'current_revision': '7777777777',
2176 'revisions': {
2177 '1111111111': {
2178 '_number': 1,
2179 'fetch': {'http': {
2180 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2181 'ref': 'refs/changes/56/123456/1',
2182 }},
2183 },
2184 '7777777777': {
2185 '_number': 7,
2186 'fetch': {'http': {
2187 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2188 'ref': 'refs/changes/56/123456/7',
2189 }},
2190 },
2191 },
2192 }),
2193 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002194
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002195 def _common_patch_rietveld_successful(self, **kwargs):
2196 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002197 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002198 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002199 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002200 ((['git', 'config', 'branch.master.rietveldserver',
2201 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002202 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002203 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002204 ((['git', 'commit', '-m',
2205 'Description\n\n' +
2206 'patch from issue 123456 at patchset 60001 ' +
2207 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002208 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002209
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002210 def test_patch_rietveld_default(self):
2211 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002212 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2213
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002214 def test_patch_rietveld_successful_new_branch(self):
2215 self._common_patch_rietveld_successful(default_codereview='rietveld',
2216 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002217 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2218
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002219 def test_patch_rietveld_guess_by_url(self):
2220 self._common_patch_rietveld_successful(
2221 default_codereview=None, # It doesn't matter.
2222 actual_codereview='rietveld')
2223 self.assertEqual(git_cl.main(
2224 ['patch', 'https://codereview.example.com/123456']), 0)
2225
2226 def test_patch_rietveld_conflict(self):
2227 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002228 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002229 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002230
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002231 def test_patch_gerrit_default(self):
2232 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002233 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002234 self.calls += [
2235 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2236 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002237 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002238 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002239 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002240 ((['git', 'config', 'branch.master.gerritserver',
2241 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002242 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
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'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002246 ]
2247 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2248
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002249 def test_patch_gerrit_force(self):
2250 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002251 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002252 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002253 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002254 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002255 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002256 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002257 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002258 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002259 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002260 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002261 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2262 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2263 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002264 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002265 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002266
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002267 def test_patch_gerrit_guess_by_url(self):
2268 self._patch_common(
2269 default_codereview=None, # It doesn't matter what's default.
2270 actual_codereview='gerrit',
2271 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002272 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002273 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002274 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002275 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002276 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002277 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002278 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002279 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002280 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002281 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002282 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2283 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2284 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002285 ]
2286 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002287 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002288
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002289 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2290 self._patch_common(
2291 default_codereview=None, # It doesn't matter what's default.
2292 actual_codereview='gerrit',
2293 git_short_host='else', detect_gerrit_server=False)
2294 self.calls += [
2295 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2296 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002297 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002298 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2299 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2300 ''),
2301 ((['git', 'config', 'branch.master.gerritserver',
2302 'https://else-review.googlesource.com'],), ''),
2303 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002304 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2305 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2306 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002307 ]
2308 self.assertEqual(git_cl.main(
2309 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2310
2311 def test_patch_gerrit_conflict(self):
2312 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002313 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002314 self.calls += [
2315 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002316 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002317 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2318 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2319 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002320 ]
2321 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002322 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002323
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002324 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002325 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002326 raise git_cl.gerrit_util.GerritError(404, '')
2327 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2328
tandriic2405f52016-10-10 08:13:15 -07002329 self.calls = [
2330 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002331 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2332 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2333 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2334 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002335 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2336 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2337 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2338 ((['git', 'config', 'remote.origin.url'],),
2339 'https://chromium.googlesource.com/my/repo'),
2340 ((['DieWithError',
2341 'change 123456 at https://chromium-review.googlesource.com does not '
2342 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002343 ]
2344 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002345 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002346
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002347 def _checkout_calls(self):
2348 return [
2349 ((['git', 'config', '--local', '--get-regexp',
2350 'branch\\..*\\.rietveldissue'], ),
2351 ('branch.retrying.rietveldissue 1111111111\n'
2352 'branch.some-fix.rietveldissue 2222222222\n')),
2353 ((['git', 'config', '--local', '--get-regexp',
2354 'branch\\..*\\.gerritissue'], ),
2355 ('branch.ger-branch.gerritissue 123456\n'
2356 'branch.gbranch654.gerritissue 654321\n')),
2357 ]
2358
2359 def test_checkout_gerrit(self):
2360 """Tests git cl checkout <issue>."""
2361 self.calls = self._checkout_calls()
2362 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2363 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2364
2365 def test_checkout_rietveld(self):
2366 """Tests git cl checkout <issue>."""
2367 self.calls = self._checkout_calls()
2368 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2369 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2370
2371 def test_checkout_not_found(self):
2372 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002373 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002374 self.calls = self._checkout_calls()
2375 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2376
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002377 def test_checkout_no_branch_issues(self):
2378 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002379 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002380 self.calls = [
2381 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002382 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002383 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002384 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002385 ]
2386 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2387
tandrii@chromium.org28253532016-04-14 13:46:56 +00002388 def _test_gerrit_ensure_authenticated_common(self, auth,
2389 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002390 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2391 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2392 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002393 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002394 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002395 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002396 cl.branch = 'master'
2397 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002398 cl.lookedup_issue = True
2399 return cl
2400
2401 def test_gerrit_ensure_authenticated_missing(self):
2402 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002403 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002404 })
2405 self.calls.append(
2406 ((['DieWithError',
2407 'Credentials for the following hosts are required:\n'
2408 ' chromium-review.googlesource.com\n'
2409 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002410 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002411 'https://chromium-review.googlesource.com/new-password'],), ''),)
2412 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2413
2414 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002415 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002416 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002417 'chromium.googlesource.com':
2418 ('git-one.example.com', None, 'secret1'),
2419 'chromium-review.googlesource.com':
2420 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002421 })
2422 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002423 (('ask_for_data', 'If you know what you are doing '
2424 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002425 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2426
2427 def test_gerrit_ensure_authenticated_ok(self):
2428 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002429 'chromium.googlesource.com':
2430 ('git-same.example.com', None, 'secret'),
2431 'chromium-review.googlesource.com':
2432 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002433 })
2434 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2435
tandrii@chromium.org28253532016-04-14 13:46:56 +00002436 def test_gerrit_ensure_authenticated_skipped(self):
2437 cl = self._test_gerrit_ensure_authenticated_common(
2438 auth={}, skip_auth_check=True)
2439 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2440
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002441 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002442 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2443 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002444 self.calls = [
2445 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002446 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002447 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2448 ((['git', 'config', 'rietveld.server'],), ''),
2449 ((['git', 'config', 'rietveld.server'],), ''),
2450 ((['git', 'config', 'branch.feature.rietveldserver'],),
2451 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002452 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002453 ]
2454 self.assertEqual(0, git_cl.main(['set-commit']))
2455
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002456 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002457 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002458 lambda h, i, labels, notify=None:
2459 self._mocked_call(['SetReview', h, i, labels, notify]))
2460
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002461 self.calls = [
2462 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002463 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2464 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002465 ((['git', 'config', 'branch.feature.gerritserver'],),
2466 'https://chromium-review.googlesource.com'),
2467 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002468 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002469 ]
tandriid9e5ce52016-07-13 02:32:59 -07002470
2471 def test_cmd_set_commit_gerrit_clear(self):
2472 self._cmd_set_commit_gerrit_common(0)
2473 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2474
2475 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002476 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002477 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2478
tandriid9e5ce52016-07-13 02:32:59 -07002479 def test_cmd_set_commit_gerrit(self):
2480 self._cmd_set_commit_gerrit_common(2)
2481 self.assertEqual(0, git_cl.main(['set-commit']))
2482
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002483 def test_description_display(self):
2484 out = StringIO.StringIO()
2485 self.mock(git_cl.sys, 'stdout', out)
2486
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002487 self.mock(git_cl, 'Changelist', ChangelistMock)
2488 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002489
2490 self.assertEqual(0, git_cl.main(['description', '-d']))
2491 self.assertEqual('foo\n', out.getvalue())
2492
2493 def test_description_rietveld(self):
2494 out = StringIO.StringIO()
2495 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002496 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002497
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002498 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002499 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002500 self.assertEqual('foobar\n', out.getvalue())
2501
iannucci3c972b92016-08-17 13:24:10 -07002502 def test_StatusFieldOverrideIssueMissingArgs(self):
2503 out = StringIO.StringIO()
2504 self.mock(git_cl.sys, 'stderr', out)
2505
2506 try:
2507 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2508 except SystemExit as ex:
2509 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002510 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002511
2512 out = StringIO.StringIO()
2513 self.mock(git_cl.sys, 'stderr', out)
2514
2515 try:
2516 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2517 except SystemExit as ex:
2518 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002519 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002520
2521 def test_StatusFieldOverrideIssue(self):
2522 out = StringIO.StringIO()
2523 self.mock(git_cl.sys, 'stdout', out)
2524
2525 def assertIssue(cl_self, *_args):
2526 self.assertEquals(cl_self.issue, 1)
2527 return 'foobar'
2528
2529 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2530 self.calls = [
2531 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2532 ((['git', 'config', 'rietveld.server'],), ''),
2533 ((['git', 'config', 'rietveld.server'],), ''),
2534 ]
iannuccie53c9352016-08-17 14:40:40 -07002535 self.assertEqual(
2536 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2537 0)
iannucci3c972b92016-08-17 13:24:10 -07002538 self.assertEqual(out.getvalue(), 'foobar\n')
2539
iannuccie53c9352016-08-17 14:40:40 -07002540 def test_SetCloseOverrideIssue(self):
2541 def assertIssue(cl_self, *_args):
2542 self.assertEquals(cl_self.issue, 1)
2543 return 'foobar'
2544
2545 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2546 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2547 self.calls = [
2548 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2549 ((['git', 'config', 'rietveld.server'],), ''),
2550 ((['git', 'config', 'rietveld.server'],), ''),
2551 ]
2552 self.assertEqual(
2553 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2554
2555 def test_SetCommitOverrideIssue(self):
2556 def assertIssue(cl_self, *_args):
2557 self.assertEquals(cl_self.issue, 1)
2558 return 'foobar'
2559
2560 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2561 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2562 self.calls = [
2563 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2564 ((['git', 'config', 'rietveld.server'],), ''),
2565 ((['git', 'config', 'rietveld.server'],), ''),
2566 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2567 ((['git', 'config', 'rietveld.server'],), ''),
2568 ((['git', 'config', 'rietveld.server'],), ''),
2569 ]
2570 self.assertEqual(
2571 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2572
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002573 def test_description_gerrit(self):
2574 out = StringIO.StringIO()
2575 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002576 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002577 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002578 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2579 {
2580 'current_revision': 'sha1',
2581 'revisions': {'sha1': {
2582 'commit': {'message': 'foobar'},
2583 }},
2584 }),
2585 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002586 self.assertEqual(0, git_cl.main([
2587 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2588 self.assertEqual('foobar\n', out.getvalue())
2589
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002590 def test_description_set_raw(self):
2591 out = StringIO.StringIO()
2592 self.mock(git_cl.sys, 'stdout', out)
2593
2594 self.mock(git_cl, 'Changelist', ChangelistMock)
2595 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2596
2597 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2598 self.assertEqual('hihi', ChangelistMock.desc)
2599
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002600 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002601 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002602
2603 def RunEditor(desc, _, **kwargs):
2604 self.assertEquals(
2605 '# Enter a description of the change.\n'
2606 '# This will be displayed on the codereview site.\n'
2607 '# The first line will also be used as the subject of the review.\n'
2608 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002609 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002610 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002611 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002612 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002613 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002614
dsansomee2d6fd92016-09-08 00:10:47 -07002615 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002616 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002617
2618 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2619 self.mock(git_cl.Changelist, 'GetDescription',
2620 lambda *args: current_desc)
2621 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2622 UpdateDescriptionRemote)
2623 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2624
2625 self.calls = [
2626 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002627 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002628 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2629 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002630 ((['git', 'config', 'core.editor'],), 'vi'),
2631 ]
2632 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2633
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002634 def test_description_set_stdin(self):
2635 out = StringIO.StringIO()
2636 self.mock(git_cl.sys, 'stdout', out)
2637
2638 self.mock(git_cl, 'Changelist', ChangelistMock)
2639 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2640
2641 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2642 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2643
kmarshall3bff56b2016-06-06 18:31:47 -07002644 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002645 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2646
kmarshall3bff56b2016-06-06 18:31:47 -07002647 self.calls = \
2648 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2649 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002650 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002651 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2652 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002653 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2654 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2655 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002656 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2657 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2658 ((['git', 'branch', '-D', 'foo'],), '')]
2659
kmarshall3bff56b2016-06-06 18:31:47 -07002660 self.mock(git_cl, 'get_cl_statuses',
2661 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002662 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2663 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2664 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002665
2666 self.assertEqual(0, git_cl.main(['archive', '-f']))
2667
2668 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002669 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002670 self.calls = \
2671 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2672 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002673 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002674 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2675 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002676 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2677
kmarshall9249e012016-08-23 12:02:16 -07002678 self.mock(git_cl, 'get_cl_statuses',
2679 lambda branches, fine_grained, max_processes:
2680 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2681
2682 self.assertEqual(1, git_cl.main(['archive', '-f']))
2683
2684 def test_archive_dry_run(self):
2685 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2686
2687 self.calls = \
2688 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2689 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2690 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2691 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2692 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2693 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2694 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2695 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2696 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002697
2698 self.mock(git_cl, 'get_cl_statuses',
2699 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002700 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2701 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2702 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002703
kmarshall9249e012016-08-23 12:02:16 -07002704 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2705
2706 def test_archive_no_tags(self):
2707 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2708
2709 self.calls = \
2710 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2711 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2712 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2713 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2714 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2715 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2716 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2717 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2718 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2719 ((['git', 'branch', '-D', 'foo'],), '')]
2720
2721 self.mock(git_cl, 'get_cl_statuses',
2722 lambda branches, fine_grained, max_processes:
2723 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2724 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2725 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2726
2727 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002728
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002729 def test_cmd_issue_erase_existing(self):
2730 out = StringIO.StringIO()
2731 self.mock(git_cl.sys, 'stdout', out)
2732 self.calls = [
2733 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002734 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2735 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002736 # Let this command raise exception (retcode=1) - it should be ignored.
2737 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002738 CERR1),
2739 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2740 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002741 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2742 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2743 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002744 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002745 ]
2746 self.assertEqual(0, git_cl.main(['issue', '0']))
2747
Aaron Gable400e9892017-07-12 15:31:21 -07002748 def test_cmd_issue_erase_existing_with_change_id(self):
2749 out = StringIO.StringIO()
2750 self.mock(git_cl.sys, 'stdout', out)
2751 self.mock(git_cl.Changelist, 'GetDescription',
2752 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2753 self.calls = [
2754 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2755 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2756 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002757 # Let this command raise exception (retcode=1) - it should be ignored.
2758 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2759 CERR1),
2760 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2761 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2762 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2763 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2764 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002765 ((['git', 'log', '-1', '--format=%B'],),
2766 'This is a description\n\nChange-Id: Ideadbeef'),
2767 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002768 ]
2769 self.assertEqual(0, git_cl.main(['issue', '0']))
2770
phajdan.jre328cf92016-08-22 04:12:17 -07002771 def test_cmd_issue_json(self):
2772 out = StringIO.StringIO()
2773 self.mock(git_cl.sys, 'stdout', out)
2774 self.calls = [
2775 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002776 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002777 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2778 ((['git', 'config', 'rietveld.server'],),
2779 'https://codereview.chromium.org'),
2780 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2781 (('write_json', 'output.json',
2782 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2783 ''),
2784 ]
2785 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2786
tandriide281ae2016-10-12 06:02:30 -07002787 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002788 self.mock(git_cl.Changelist, 'GetChange',
2789 lambda _, *a: (
2790 self._mocked_call(['GetChange']+list(a))))
2791 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2792 lambda *_, **__: (
2793 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002794 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2795 lambda _, s: self._mocked_call(['SetCQState', s]))
2796 self.calls = [
2797 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002798 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002799 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2800 ((['git', 'config', 'rietveld.server'],),
2801 'https://codereview.chromium.org'),
2802 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2803 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2804 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2805 ((['get_or_create_merge_base', 'feature', 'feature'],),
2806 'fake_ancestor_sha'),
2807 ((['GetChange', 'fake_ancestor_sha', None], ),
2808 git_cl.presubmit_support.GitChange(
2809 '', '', '', '', '', '', '', '')),
2810 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2811 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002812 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2813 ]
2814 out = StringIO.StringIO()
2815 self.mock(git_cl.sys, 'stdout', out)
2816 self.assertEqual(0, git_cl.main(['try']))
2817 self.assertEqual(
2818 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002819 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002820
tandrii8c5a3532016-11-04 07:52:02 -07002821 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2822 self.mock(git_cl.Changelist, 'GetChange',
2823 lambda _, *a: (
2824 self._mocked_call(['GetChange']+list(a))))
2825 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2826 lambda *_, **__: (
2827 self._mocked_call(['DoGetTryMasters'])))
2828 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2829 lambda _, s: self._mocked_call(['SetCQState', s]))
2830
tandrii8c5a3532016-11-04 07:52:02 -07002831 self.calls = [
2832 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2833 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2834 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2835 ((['git', 'config', 'branch.feature.gerritserver'],),
2836 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002837 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2838 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2839 'project': 'depot_tools',
2840 'status': 'OPEN',
2841 'owner': {'email': 'owner@e.mail'},
2842 'revisions': {
2843 'deadbeaf': {
2844 '_number': 6,
2845 },
2846 'beeeeeef': {
2847 '_number': 7,
2848 'fetch': {'http': {
2849 'url': 'https://chromium.googlesource.com/depot_tools',
2850 'ref': 'refs/changes/56/123456/7'
2851 }},
2852 },
2853 },
2854 }),
tandrii8c5a3532016-11-04 07:52:02 -07002855 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2856 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2857 ((['get_or_create_merge_base', 'feature', 'feature'],),
2858 'fake_ancestor_sha'),
2859 ((['GetChange', 'fake_ancestor_sha', None], ),
2860 git_cl.presubmit_support.GitChange(
2861 '', '', '', '', '', '', '', '')),
2862 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2863 ((['DoGetTryMasters'], ), None),
2864 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2865 ]
2866 out = StringIO.StringIO()
2867 self.mock(git_cl.sys, 'stdout', out)
2868 self.assertEqual(0, git_cl.main(['try']))
2869 self.assertEqual(
2870 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002871 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002872 'https://chromium-review.googlesource.com/123456\n')
2873
2874 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2875 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2876 lambda _: {
2877 'owner_email': 'owner@e.mail',
2878 'private': False,
2879 'closed': False,
2880 'project': 'depot_tools',
2881 'patchsets': [20001],
2882 })
tandriide281ae2016-10-12 06:02:30 -07002883 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2884 self.calls = [
2885 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2886 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2887 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2888 ((['git', 'config', 'rietveld.server'],),
2889 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002890 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002891 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002892 ]
2893
2894 def _buildbucket_retry(*_, **kw):
2895 # self.maxDiff = 10000
2896 body = json.loads(kw['body'])
2897 self.assertEqual(len(body['builds']), 1)
2898 build = body['builds'][0]
2899 params = json.loads(build.pop('parameters_json'))
2900 self.assertEqual(params, {
2901 u'builder_name': u'win',
2902 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2903 u'revision': None}],
2904 u'properties': {
2905 u'category': u'git_cl_try',
2906 u'issue': 123,
2907 u'key': u'val',
2908 u'json': [{u'a': 1}, None],
2909 u'master': u'tryserver.chromium',
2910 u'patch_project': u'depot_tools',
2911 u'patch_storage': u'rietveld',
2912 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002913 u'rietveld': u'https://codereview.chromium.org',
2914 }
2915 })
2916 self.assertEqual(build, {
2917 u'bucket': u'master.tryserver.chromium',
2918 u'client_operation_id': u'uuid4',
2919 u'tags': [u'builder:win',
2920 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002921 u'user_agent:git_cl_try',
2922 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002923 })
2924
2925 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2926
2927 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2928 self.assertEqual(0, git_cl.main([
2929 'try', '-m', 'tryserver.chromium', '-b', 'win',
2930 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2931 self.assertRegexpMatches(
2932 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002933 'Tried jobs on:\nBucket: master.tryserver.chromium')
2934
tandrii8c5a3532016-11-04 07:52:02 -07002935 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2936 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2937 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2938
tandrii8c5a3532016-11-04 07:52:02 -07002939 self.calls = [
2940 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2941 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2942 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2943 ((['git', 'config', 'branch.feature.gerritserver'],),
2944 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002945 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002946 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002947 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002948 'status': 'OPEN',
2949 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002950 'revisions': {
2951 'deadbeaf': {
2952 '_number': 6,
2953 },
2954 'beeeeeef': {
2955 '_number': 7,
2956 'fetch': {'http': {
2957 'url': 'https://chromium.googlesource.com/depot_tools',
2958 'ref': 'refs/changes/56/123456/7'
2959 }},
2960 },
2961 },
2962 }),
2963 ]
2964
2965 def _buildbucket_retry(*_, **kw):
2966 # self.maxDiff = 10000
2967 body = json.loads(kw['body'])
2968 self.assertEqual(len(body['builds']), 1)
2969 build = body['builds'][0]
2970 params = json.loads(build.pop('parameters_json'))
2971 self.assertEqual(params, {
2972 u'builder_name': u'win',
2973 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2974 u'revision': None}],
2975 u'properties': {
2976 u'category': u'git_cl_try',
2977 u'key': u'val',
2978 u'json': [{u'a': 1}, None],
2979 u'master': u'tryserver.chromium',
2980
2981 u'patch_gerrit_url':
2982 u'https://chromium-review.googlesource.com',
2983 u'patch_issue': 123456,
2984 u'patch_project': u'depot_tools',
2985 u'patch_ref': u'refs/changes/56/123456/7',
2986 u'patch_repository_url':
2987 u'https://chromium.googlesource.com/depot_tools',
2988 u'patch_set': 7,
2989 u'patch_storage': u'gerrit',
2990 }
2991 })
2992 self.assertEqual(build, {
2993 u'bucket': u'master.tryserver.chromium',
2994 u'client_operation_id': u'uuid4',
2995 u'tags': [
2996 u'builder:win',
2997 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2998 u'user_agent:git_cl_try',
2999 u'master:tryserver.chromium'],
3000 })
3001
3002 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3003
3004 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3005 self.assertEqual(0, git_cl.main([
3006 'try', '-m', 'tryserver.chromium', '-b', 'win',
3007 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3008 self.assertRegexpMatches(
3009 git_cl.sys.stdout.getvalue(),
3010 'Tried jobs on:\nBucket: master.tryserver.chromium')
3011
borenet6c0efe62016-10-19 08:13:29 -07003012 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07003013 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
3014 lambda _: {
3015 'owner_email': 'owner@e.mail',
3016 'private': False,
3017 'closed': False,
3018 'project': 'depot_tools',
3019 'patchsets': [20001],
3020 })
borenet6c0efe62016-10-19 08:13:29 -07003021 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
3022 self.calls = [
3023 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3024 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3025 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3026 ((['git', 'config', 'rietveld.server'],),
3027 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07003028 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07003029 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07003030 ]
3031
3032 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07003033 body = json.loads(kw['body'])
3034 self.assertEqual(len(body['builds']), 1)
3035 build = body['builds'][0]
3036 params = json.loads(build.pop('parameters_json'))
3037 self.assertEqual(params, {
3038 u'builder_name': u'win',
3039 u'changes': [{u'author': {u'email': u'owner@e.mail'},
3040 u'revision': None}],
3041 u'properties': {
3042 u'category': u'git_cl_try',
3043 u'issue': 123,
3044 u'patch_project': u'depot_tools',
3045 u'patch_storage': u'rietveld',
3046 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07003047 u'rietveld': u'https://codereview.chromium.org',
3048 }
3049 })
3050 self.assertEqual(build, {
3051 u'bucket': u'test.bucket',
3052 u'client_operation_id': u'uuid4',
3053 u'tags': [u'builder:win',
3054 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
3055 u'user_agent:git_cl_try'],
3056 })
3057
3058 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3059
3060 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3061 self.assertEqual(0, git_cl.main([
3062 'try', '-B', 'test.bucket', '-b', 'win']))
3063 self.assertRegexpMatches(
3064 git_cl.sys.stdout.getvalue(),
3065 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07003066
qyearsley123a4682016-10-26 09:12:17 -07003067 def test_git_cl_try_bots_on_multiple_masters(self):
3068 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
3069 self.calls = [
3070 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3071 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3072 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3073 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07003074 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07003075 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
3076 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3077 ]
3078
3079 def _buildbucket_retry(*_, **kw):
3080 body = json.loads(kw['body'])
3081 self.assertEqual(len(body['builds']), 2)
3082
3083 first_build_params = json.loads(body['builds'][0]['parameters_json'])
3084 self.assertEqual(first_build_params['builder_name'], 'builder1')
3085 self.assertEqual(first_build_params['properties']['master'], 'master1')
3086
3087 first_build_params = json.loads(body['builds'][1]['parameters_json'])
3088 self.assertEqual(first_build_params['builder_name'], 'builder2')
3089 self.assertEqual(first_build_params['properties']['master'], 'master2')
3090
3091 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3092
3093 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
3094 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3095
3096 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3097 self.assertEqual(
3098 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3099 self.assertEqual(
3100 git_cl.sys.stdout.getvalue(),
3101 'Tried jobs on:\n'
3102 'Bucket: master.master1\n'
3103 ' builder1: []\n'
3104 'Bucket: master.master2\n'
3105 ' builder2: []\n'
3106 'To see results here, run: git cl try-results\n'
3107 'To see results in browser, run: git cl web\n')
3108
tandrii16e0b4e2016-06-07 10:34:28 -07003109 def _common_GerritCommitMsgHookCheck(self):
3110 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3111 self.mock(git_cl.os.path, 'abspath',
3112 lambda path: self._mocked_call(['abspath', path]))
3113 self.mock(git_cl.os.path, 'exists',
3114 lambda path: self._mocked_call(['exists', path]))
3115 self.mock(git_cl.gclient_utils, 'FileRead',
3116 lambda path: self._mocked_call(['FileRead', path]))
3117 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3118 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3119 self.calls = [
3120 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3121 ((['abspath', '../'],), '/abs/git_repo_root'),
3122 ]
3123 return git_cl.Changelist(codereview='gerrit', issue=123)
3124
3125 def test_GerritCommitMsgHookCheck_custom_hook(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 '#!/bin/sh\necho "custom hook"')
3131 ]
3132 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3133
3134 def test_GerritCommitMsgHookCheck_not_exists(self):
3135 cl = self._common_GerritCommitMsgHookCheck()
3136 self.calls += [
3137 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3138 ]
3139 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3140
3141 def test_GerritCommitMsgHookCheck(self):
3142 cl = self._common_GerritCommitMsgHookCheck()
3143 self.calls += [
3144 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3145 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3146 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003147 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003148 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3149 ''),
3150 ]
3151 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3152
tandriic4344b52016-08-29 06:04:54 -07003153 def test_GerritCmdLand(self):
3154 self.calls += [
3155 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3156 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3157 'deadbeaf'),
3158 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3159 ((['git', 'config', 'branch.feature.gerritserver'],),
3160 'chromium-review.googlesource.com'),
3161 ]
3162 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3163 cl._codereview_impl._GetChangeDetail = lambda _: {
3164 'labels': {},
3165 'current_revision': 'deadbeaf',
3166 }
agable32978d92016-11-01 12:55:02 -07003167 cl._codereview_impl._GetChangeCommit = lambda: {
3168 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003169 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003170 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3171 }
tandriic4344b52016-08-29 06:04:54 -07003172 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003173 out = StringIO.StringIO()
3174 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003175 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003176 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003177 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003178
tandrii221ab252016-10-06 08:12:04 -07003179 BUILDBUCKET_BUILDS_MAP = {
3180 '9000': {
3181 'id': '9000',
3182 'status': 'STARTED',
3183 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3184 'result_details_json': '{"properties": {}}',
3185 'bucket': 'master.x.y',
3186 'created_by': 'user:someone@chromium.org',
3187 'created_ts': '147200002222000',
3188 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3189 },
3190 '8000': {
3191 'id': '8000',
3192 'status': 'COMPLETED',
3193 'result': 'FAILURE',
3194 'failure_reason': 'BUILD_FAILURE',
3195 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3196 'result_details_json': '{"properties": {}}',
3197 'bucket': 'master.x.y',
3198 'created_by': 'user:someone@chromium.org',
3199 'created_ts': '147200001111000',
3200 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3201 },
3202 }
3203
3204 def test_write_try_results_json(self):
3205 expected_output = [
3206 {
3207 'buildbucket_id': '8000',
3208 'bucket': 'master.x.y',
3209 'builder_name': 'my-builder',
3210 'status': 'COMPLETED',
3211 'result': 'FAILURE',
3212 'failure_reason': 'BUILD_FAILURE',
3213 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3214 },
3215 {
3216 'buildbucket_id': '9000',
3217 'bucket': 'master.x.y',
3218 'builder_name': 'my-builder',
3219 'status': 'STARTED',
3220 'result': None,
3221 'failure_reason': None,
3222 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3223 }
3224 ]
3225 self.calls = [(('write_json', 'output.json', expected_output), '')]
3226 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3227
tandrii45b2a582016-10-11 03:14:16 -07003228 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003229 out = StringIO.StringIO()
3230 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003231 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3232 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003233 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3234 self._mocked_call(['get_authenticator_for_host', host]))
3235 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3236 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003237
3238 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3239 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003240 self.calls += [
3241 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3242 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3243 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3244 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3245 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3246 ((['git', 'config', 'branch.feature.rietveldserver'],),
3247 'codereview.example.com'),
3248 ((['get_authenticator_for_host', 'codereview.example.com'],),
3249 AuthenticatorMock()),
3250 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3251
3252 def test_fetch_try_jobs_none_rietveld(self):
3253 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003254 # Simulate that user isn't logged in.
3255 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003256 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003257 self.assertRegexpMatches(sys.stdout.getvalue(),
3258 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003259 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3260
3261 def test_fetch_try_jobs_some_rietveld(self):
3262 self._setup_fetch_try_jobs_rietveld({
3263 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3264 })
3265 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003266 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3267 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3268 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3269
3270 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3271 self._setup_fetch_try_jobs(most_recent_patchset=13)
3272 self.calls += [
3273 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3274 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3275 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003276 # TODO(tandrii): Uncomment the below if we decide to support checking
3277 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003278 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003279 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003280 ((['git', 'config', 'branch.feature.gerritserver'],),
3281 'https://x-review.googlesource.com'),
3282 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3283 AuthenticatorMock()),
3284 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3285
3286 def test_fetch_try_jobs_none_gerrit(self):
3287 self._setup_fetch_try_jobs_gerrit({})
3288 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003289 # TODO(tandrii): Uncomment the below if we decide to support checking
3290 # patchsets for Gerrit.
3291 # self.assertRegexpMatches(
3292 # sys.stdout.getvalue(),
3293 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003294 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3295
3296 def test_fetch_try_jobs_some_gerrit(self):
3297 self._setup_fetch_try_jobs_gerrit({
3298 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3299 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003300 # TODO(tandrii): Uncomment the below if we decide to support checking
3301 # patchsets for Gerrit.
3302 # self.calls.remove(
3303 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003304 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3305
3306 # ... and doesn't result in warning.
3307 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3308 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003309 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3310 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3311
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003312 def _mock_gerrit_changes_for_detail_cache(self):
3313 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003314
3315 def test_gerrit_change_detail_cache_normalize(self):
3316 self._mock_gerrit_changes_for_detail_cache()
3317 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003318 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003319 ]
3320 cl = git_cl.Changelist(codereview='gerrit')
3321 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3322 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3323 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3324 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3325
3326 def test_gerrit_change_detail_cache_simple(self):
3327 self._mock_gerrit_changes_for_detail_cache()
3328 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003329 (('GetChangeDetail', 'host', '1', []), 'a'),
3330 (('GetChangeDetail', 'host', '2', []), 'b'),
3331 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003332 ]
3333 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3334 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3335 self.assertEqual(cl._GetChangeDetail(), 'a')
3336 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003337 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003338 self.assertEqual(cl._GetChangeDetail(), 'a')
3339 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3340
3341 def test_gerrit_change_detail_cache_options(self):
3342 self._mock_gerrit_changes_for_detail_cache()
3343 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003344 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3345 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3346 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3347 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003348 ]
3349 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3350 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3351 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3352 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3353 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3354 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3355 self.assertEqual(cl._GetChangeDetail(), 'cab')
3356
3357 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3358 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3359 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3360 self.assertEqual(cl._GetChangeDetail(), 'cab')
3361
3362 # Finally, no_cache should invalidate all caches for given change.
3363 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3364 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3365
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003366 def test_gerrit_description_caching(self):
3367 def gen_detail(rev, desc):
3368 return {
3369 'current_revision': rev,
3370 'revisions': {rev: {'commit': {'message': desc}}}
3371 }
3372 self.calls = [
3373 (('GetChangeDetail', 'host', '1',
3374 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3375 gen_detail('rev1', 'desc1')),
3376 (('GetChangeDetail', 'host', '1',
3377 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3378 gen_detail('rev2', 'desc2')),
3379 ]
3380
3381 self._mock_gerrit_changes_for_detail_cache()
3382 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3383 self.assertEqual(cl.GetDescription(), 'desc1')
3384 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3385 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003386
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003387 def test_print_current_creds(self):
3388 class CookiesAuthenticatorMock(object):
3389 def __init__(self):
3390 self.gitcookies = {
3391 'host.googlesource.com': ('user', 'pass'),
3392 'host-review.googlesource.com': ('user', 'pass'),
3393 }
3394 self.netrc = self
3395 self.netrc.hosts = {
3396 'github.com': ('user2', None, 'pass2'),
3397 'host2.googlesource.com': ('user3', None, 'pass'),
3398 }
3399 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3400 CookiesAuthenticatorMock)
3401 self.mock(sys, 'stdout', StringIO.StringIO())
3402 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3403 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3404 ' Host\t User\t Which file',
3405 '============================\t=====\t===========',
3406 'host-review.googlesource.com\t user\t.gitcookies',
3407 ' host.googlesource.com\t user\t.gitcookies',
3408 ' host2.googlesource.com\tuser3\t .netrc',
3409 ])
3410 sys.stdout.buf = ''
3411 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3412 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3413 ' Host\tUser\t Which file',
3414 '============================\t====\t===========',
3415 'host-review.googlesource.com\tuser\t.gitcookies',
3416 ' host.googlesource.com\tuser\t.gitcookies',
3417 ])
3418
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003419 def _common_creds_check_mocks(self):
3420 def exists_mock(path):
3421 dirname = os.path.dirname(path)
3422 if dirname == os.path.expanduser('~'):
3423 dirname = '~'
3424 base = os.path.basename(path)
3425 if base in ('.netrc', '.gitcookies'):
3426 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3427 # git cl also checks for existence other files not relevant to this test.
3428 return None
3429 self.mock(os.path, 'exists', exists_mock)
3430 self.mock(sys, 'stdout', StringIO.StringIO())
3431
3432 def test_creds_check_gitcookies_not_configured(self):
3433 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003434 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003435 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003436 self.calls = [
3437 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3438 (('os.path.exists', '~/.netrc'), True),
3439 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3440 'or Ctrl+C to abort'), ''),
3441 ((['git', 'config', '--global', 'http.cookiefile',
3442 os.path.expanduser('~/.gitcookies')], ), ''),
3443 ]
3444 self.assertEqual(0, git_cl.main(['creds-check']))
3445 self.assertRegexpMatches(
3446 sys.stdout.getvalue(),
3447 '^You seem to be using outdated .netrc for git credentials:')
3448 self.assertRegexpMatches(
3449 sys.stdout.getvalue(),
3450 '\nConfigured git to use .gitcookies from')
3451
3452 def test_creds_check_gitcookies_configured_custom_broken(self):
3453 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003454 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003455 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003456 self.calls = [
3457 ((['git', 'config', '--global', 'http.cookiefile'],),
3458 '/custom/.gitcookies'),
3459 (('os.path.exists', '/custom/.gitcookies'), False),
3460 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3461 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3462 ((['git', 'config', '--global', 'http.cookiefile',
3463 os.path.expanduser('~/.gitcookies')], ), ''),
3464 ]
3465 self.assertEqual(0, git_cl.main(['creds-check']))
3466 self.assertRegexpMatches(
3467 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003468 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003469 self.assertRegexpMatches(
3470 sys.stdout.getvalue(),
3471 'However, your configured .gitcookies file is missing.')
3472
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003473 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003474 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003475 lambda _, message, publish: self._mocked_call(
3476 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003477 self.calls = [
3478 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3479 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003480 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003481 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003482 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3483 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003484
3485 def test_git_cl_comment_add_gerrit(self):
3486 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003487 lambda host, change, msg, ready:
3488 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003489 self.calls = [
3490 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3491 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3492 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3493 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3494 'origin/master'),
3495 ((['git', 'config', 'remote.origin.url'],),
3496 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003497 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3498 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003499 ]
3500 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3501 '-a', 'msg']))
3502
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003503 def test_git_cl_comments_fetch_rietveld(self):
3504 self.mock(sys, 'stdout', StringIO.StringIO())
3505 self.calls = [
3506 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3507 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3508 ] * 2
3509 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3510 'messages': [
3511 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3512 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3513 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3514 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3515 # Intentionally wrong order here.
3516 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3517 'disapproval': False, 'approval': False,
3518 'sender': 'owner@example.com'},
3519 ],
3520 'owner_email': 'owner@example.com',
3521 })
3522 expected_comments_summary = [
3523 git_cl._CommentSummary(
3524 message='lgtm',
3525 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3526 disapproval=False, approval=True, sender='r@example.com'),
3527 git_cl._CommentSummary(
3528 message='not lgtm',
3529 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3530 disapproval=True, approval=False, sender='r2@example.com'),
3531 # Note: same order as in whatever Rietveld returns.
3532 git_cl._CommentSummary(
3533 message='PTAL',
3534 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3535 disapproval=False, approval=False, sender='owner@example.com'),
3536 ]
3537 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3538 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3539
3540 with git_cl.gclient_utils.temporary_directory() as tempdir:
3541 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3542 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3543 '-j', out_file]))
3544 with open(out_file) as f:
3545 read = json.load(f)
3546 self.assertEqual(len(read), 3)
3547 self.assertEqual(read[0], {
3548 'date': '2000-03-13 20:49:34.515270',
3549 'message': 'PTAL',
3550 'approval': False,
3551 'disapproval': False,
3552 'sender': 'owner@example.com'})
3553 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3554 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3555
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003556 def test_git_cl_comments_fetch_gerrit(self):
3557 self.mock(sys, 'stdout', StringIO.StringIO())
3558 self.calls = [
3559 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3560 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3561 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3562 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3563 'origin/master'),
3564 ((['git', 'config', 'remote.origin.url'],),
3565 'https://chromium.googlesource.com/infra/infra'),
3566 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3567 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003568 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003569 'messages': [
3570 {
3571 u'_revision_number': 1,
3572 u'author': {
3573 u'_account_id': 1111084,
3574 u'email': u'commit-bot@chromium.org',
3575 u'name': u'Commit Bot'
3576 },
3577 u'date': u'2017-03-15 20:08:45.000000000',
3578 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003579 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003580 u'tag': u'autogenerated:cq:dry-run'
3581 },
3582 {
3583 u'_revision_number': 2,
3584 u'author': {
3585 u'_account_id': 11151243,
3586 u'email': u'owner@example.com',
3587 u'name': u'owner'
3588 },
3589 u'date': u'2017-03-16 20:00:41.000000000',
3590 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3591 u'message': u'PTAL',
3592 },
3593 {
3594 u'_revision_number': 2,
3595 u'author': {
3596 u'_account_id': 148512 ,
3597 u'email': u'reviewer@example.com',
3598 u'name': u'reviewer'
3599 },
3600 u'date': u'2017-03-17 05:19:37.500000000',
3601 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3602 u'message': u'Patch Set 2: Code-Review+1',
3603 },
3604 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003605 }),
3606 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3607 '/COMMIT_MSG': [
3608 {
3609 'author': {'email': u'reviewer@example.com'},
3610 'updated': u'2017-03-17 05:19:37.500000000',
3611 'patch_set': 2,
3612 'side': 'REVISION',
3613 'message': 'Please include a bug link',
3614 },
3615 ],
3616 'codereview.settings': [
3617 {
3618 'author': {'email': u'owner@example.com'},
3619 'updated': u'2017-03-16 20:00:41.000000000',
3620 'patch_set': 2,
3621 'side': 'PARENT',
3622 'line': 42,
3623 'message': 'I removed this because it is bad',
3624 },
3625 ]
3626 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003627 ] * 2
3628 expected_comments_summary = [
3629 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003630 message=(
3631 u'PTAL\n' +
3632 u'\n' +
3633 u'codereview.settings\n' +
3634 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3635 u'c/1/2/codereview.settings#b42\n' +
3636 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003637 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3638 disapproval=False, approval=False, sender=u'owner@example.com'),
3639 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003640 message=(
3641 u'Patch Set 2: Code-Review+1\n' +
3642 u'\n' +
3643 u'/COMMIT_MSG\n' +
3644 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3645 u'c/1/2//COMMIT_MSG#\n' +
3646 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003647 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3648 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3649 ]
3650 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3651 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3652
3653 with git_cl.gclient_utils.temporary_directory() as tempdir:
3654 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3655 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3656 '-j', out_file]))
3657 with open(out_file) as f:
3658 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003659 self.assertEqual(len(read), 2)
3660 self.assertEqual(read[0], {
3661 u'date': u'2017-03-16 20:00:41.000000',
3662 u'message': (
3663 u'PTAL\n' +
3664 u'\n' +
3665 u'codereview.settings\n' +
3666 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3667 u'c/1/2/codereview.settings#b42\n' +
3668 u' I removed this because it is bad\n'),
3669 u'approval': False,
3670 u'disapproval': False,
3671 u'sender': u'owner@example.com'})
3672 self.assertEqual(read[1], {
3673 u'date': u'2017-03-17 05:19:37.500000',
3674 u'message': (
3675 u'Patch Set 2: Code-Review+1\n' +
3676 u'\n' +
3677 u'/COMMIT_MSG\n' +
3678 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3679 u'c/1/2//COMMIT_MSG#\n' +
3680 u' Please include a bug link\n'),
3681 u'approval': False,
3682 u'disapproval': False,
3683 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003684
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003685
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003686if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003687 logging.basicConfig(
3688 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003689 unittest.main()