blob: 54aadfa7088999883d68b3f7c16ae37907ccbf22 [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
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000621class TestGitCl(TestCase):
622 def setUp(self):
623 super(TestGitCl, self).setUp()
624 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700625 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000626 self.mock(subprocess2, 'call', self._mocked_call)
627 self.mock(subprocess2, 'check_call', self._mocked_call)
628 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700629 self.mock(subprocess2, 'communicate',
630 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000631 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000632 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000633 self.mock(git_common, 'get_or_create_merge_base',
634 lambda *a: (
635 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000636 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000637 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100638 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
639 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700640 self.mock(git_cl, 'write_json', lambda path, contents:
641 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000642 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000643 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000644 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700645 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
646 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000647 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000648 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000649 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100650 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
651 lambda *args, **kwargs: self._mocked_call(
652 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700653 self.mock(git_cl.gerrit_util, 'GetChangeComments',
654 lambda *args, **kwargs: self._mocked_call(
655 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100656 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700657 lambda h, i, reviewers, ccs, notify: self._mocked_call(
658 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700659 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700660 lambda h, i, msg=None, labels=None, notify=None:
661 self._mocked_call('SetReview', h, i, msg, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000662 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
663 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700664 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100665 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000666 # It's important to reset settings to not have inter-tests interference.
667 git_cl.settings = None
668
669 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000670 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100671 self.assertEquals([], self.calls)
672 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000673 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100674 raise
675 # Sadly, has_failed() returns True if this OR any other tests before this
676 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200677 git_cl.logging.error(
678 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100679 'There are un-consumed self.calls after this test has finished.\n'
680 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700681 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200682 'If you are already running only this test, then **first** fix the '
683 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100684 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700685 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100686 'and follow instructions above.\n' +
687 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000688 finally:
689 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000690
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000691 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000692 self.assertTrue(
693 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700694 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000695 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000696 expected_args, result = top
697
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000698 # Also logs otherwise it could get caught in a try/finally and be hard to
699 # diagnose.
700 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700701 N = 5
702 prior_calls = '\n '.join(
703 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
704 for i, c in enumerate(self._calls_done[-N:]))
705 following_calls = '\n '.join(
706 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
707 for i, c in enumerate(self.calls[:N]))
708 extended_msg = (
709 'A few prior calls:\n %s\n\n'
710 'This (expected):\n @%d: %r\n'
711 'This (actual):\n @%d: %r\n\n'
712 'A few following expected calls:\n %s' %
713 (prior_calls, len(self._calls_done), expected_args,
714 len(self._calls_done), args, following_calls))
715 git_cl.logging.error(extended_msg)
716
tandrii99a72f22016-08-17 14:33:24 -0700717 self.fail('@%d\n'
718 ' Expected: %r\n'
719 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700720 len(self._calls_done), expected_args, args))
721
722 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700723 if isinstance(result, Exception):
724 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000725 return result
726
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100727 def test_ask_for_explicit_yes_true(self):
728 self.calls = [
729 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
730 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
731 ]
732 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
733
734 def test_ask_for_explicit_yes_true(self):
735 self.calls = [
736 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
737 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
738 ]
739 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
740
tandrii48df5812016-10-17 03:55:37 -0700741 def test_LoadCodereviewSettingsFromFile_gerrit(self):
742 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
743 self.calls = [
744 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
745 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
747 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
748 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700750 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
751 CERR1),
752 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700753 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
754 CERR1),
755 ((['git', 'config', 'gerrit.host', 'true'],), ''),
756 ]
757 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
758
maruel@chromium.orga3353652011-11-30 14:26:57 +0000759 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000760 def _is_gerrit_calls(cls, gerrit=False):
761 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
762 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
763
764 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000765 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200766 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000767 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000768
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000769 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200770 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
771 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
772 ((['git', 'config', 'core.editor'],), ''),
773 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000774
775 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200776 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000777 if similarity is None:
778 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700779 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700780 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000781 else:
tandrii33a46ff2016-08-23 05:53:40 -0700782 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700783 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000784
785 if find_copies is None:
786 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700787 find_copies_call = ((['git', 'config', '--bool',
788 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000789 else:
tandrii5d48c322016-08-18 16:19:37 -0700790 val = str(find_copies).lower()
791 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000792 'branch.master.git-find-copies', val],), '')
793
794 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000795 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800796 '-l100000', '-C'+similarity,
797 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000798 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000799 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000800 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000801
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000802 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000803 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000804 similarity_call,
805 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
806 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000807 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000808 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700809 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
810 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000811 ((['git', 'config', 'rietveld.server'],),
812 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000813 ((['git', 'config', 'branch.master.merge'],), 'master'),
814 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000815 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000816 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000817 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git', 'rev-parse', '--show-cdup'],), ''),
819 ((['git', 'rev-parse', 'HEAD'],), '12345'),
820 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000821 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000822 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700823 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000825 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000826 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000828 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000829 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000830 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000831 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700832 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000833 ]
834
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000835 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000836 def _git_upload_calls(cls, private):
837 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000838 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000839 private_call = []
840 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000841 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000842 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000844
maruel@chromium.orga3353652011-11-30 14:26:57 +0000845 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000846 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000847 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000848 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800849 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000850 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700851 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000852 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000853 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000854 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700855 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000856 ] + cls._git_post_upload_calls()
857
858 @classmethod
859 def _git_post_upload_calls(cls):
860 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000861 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
862 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
863 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000864 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000865 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000866 ]
867
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000868 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000869 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000870 fake_ancestor = 'fake_ancestor'
871 fake_cl = 'fake_cl_for_patch'
872 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000873 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000874 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000875 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000876 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000877 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000878 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000879 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000880 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700881 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000882 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000883 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000884 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000885 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000886 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000887 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000888 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000889 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000890 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000891 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000892 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000893
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000894 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700895 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000896 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897 return [
898 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000899 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000900 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000901 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700902 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000903 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000904 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100905 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000906 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000907 ]
908
909 def _run_reviewer_test(
910 self,
911 upload_args,
912 expected_description,
913 returned_description,
914 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000915 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700916 private=False,
917 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000918 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000919 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000920 try:
921 similarity = upload_args[upload_args.index('--similarity')+1]
922 except ValueError:
923 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000924
925 if '--find-copies' in upload_args:
926 find_copies = True
927 elif '--no-find-copies' in upload_args:
928 find_copies = False
929 else:
930 find_copies = None
931
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000932 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700933 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000934
935 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000936
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000937 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000938 self.assertEquals(
939 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000940 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000941 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000942 '#--------------------This line is 72 characters long'
943 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000944 expected_description,
945 desc)
946 return returned_description
947 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000948
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000949 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000950 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700951 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000952 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000953 return 1, 2
954 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000955
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956 git_cl.main(['upload'] + upload_args)
957
958 def test_no_reviewer(self):
959 self._run_reviewer_test(
960 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000961 'desc\n\nBUG=',
962 '# Blah blah comment.\ndesc\n\nBUG=',
963 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000964 [])
965
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000966 def test_keep_similarity(self):
967 self._run_reviewer_test(
968 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 'desc\n\nBUG=',
970 '# Blah blah comment.\ndesc\n\nBUG=',
971 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000972 [])
973
iannucci@chromium.org79540052012-10-19 23:15:26 +0000974 def test_keep_find_copies(self):
975 self._run_reviewer_test(
976 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000977 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000978 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000979 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000980 [])
981
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000982 def test_private(self):
983 self._run_reviewer_test(
984 ['--private'],
985 'desc\n\nBUG=',
986 '# Blah blah comment.\ndesc\n\nBUG=\n',
987 'desc\n\nBUG=',
988 [])
989
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000990 def test_reviewers_cmd_line(self):
991 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000992 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000993 self._run_reviewer_test(
994 ['-r' 'foo@example.com'],
995 description,
996 '\n%s\n' % description,
997 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000998 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000999
1000 def test_reviewer_tbr_overriden(self):
1001 # Reviewer is overriden with TBR
1002 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001003 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001004 self._run_reviewer_test(
1005 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001006 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001007 description.strip('\n'),
1008 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001009 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001010
1011 def test_reviewer_multiple(self):
1012 # Handles multiple R= or TBR= lines.
1013 description = (
bradnelsond975b302016-10-23 12:20:23 -07001014 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1015 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001016 self._run_reviewer_test(
1017 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001018 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001019 description,
1020 description,
bradnelsond975b302016-10-23 12:20:23 -07001021 ['--reviewers=another@example.com,reviewer@example.com'],
1022 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001023
maruel@chromium.orga3353652011-11-30 14:26:57 +00001024 def test_reviewer_send_mail(self):
1025 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001026 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +00001027 self._run_reviewer_test(
1028 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001029 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +00001030 description.strip('\n'),
1031 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001032 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +00001033
1034 def test_reviewer_send_mail_no_rev(self):
1035 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001036 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +02001037 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -07001038 ((['DieWithError', 'Must specify reviewers to send email.'],),
1039 SystemExitMock())
1040 ]
1041
1042 def RunEditor(desc, _, **kwargs):
1043 return desc
1044 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1045 self.mock(sys, 'stdout', stdout)
1046 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001047 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001048 self.assertEqual(
1049 '=====================================\n'
1050 'NOTICE: Rietveld is being deprecated. '
1051 'You can upload changes to Gerrit with\n'
1052 ' git cl upload --gerrit\n'
1053 'or set Gerrit to be your default code review tool with\n'
1054 ' git config gerrit.host true\n'
1055 '=====================================\n',
1056 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001057
tandriif9aefb72016-07-01 09:06:51 -07001058 def test_bug_on_cmd(self):
1059 self._run_reviewer_test(
1060 ['--bug=500658,proj:123'],
1061 'desc\n\nBUG=500658\nBUG=proj:123',
1062 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1063 'desc\n\nBUG=500658\nBUG=proj:1234',
1064 [])
1065
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001066 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1067 parent_msg=None,
1068 new_msg=None,
1069 fail_after_parent_msg=False,
1070 fail_cherry_pick=False,
1071 fail_push_count=0,
1072 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001073 if debug:
1074 # Very useful due to finally clause in git cl land raising exceptions and
1075 # shadowing real cause of failure.
1076 self.mock(git_cl, '_IS_BEING_TESTED', True)
1077 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001078 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001079
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001080 if git_numberer_enabled:
1081 # Special mocks to check validity of timestamp.
1082 original_git_amend_head = git_cl._git_amend_head
1083 def _git_amend_head_mock(msg, tstamp):
1084 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1085 return original_git_amend_head(msg, tstamp)
1086 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1087
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001088 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1089 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001090 self.mock(RietveldMock, 'update_description', staticmethod(
1091 lambda i, d: self._mocked_call(['update_description', i, d])))
1092 self.mock(RietveldMock, 'add_comment', staticmethod(
1093 lambda i, c: self._mocked_call(['add_comment', i, c])))
1094 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001095 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1096 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1097 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1098 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1099 CERR1),
1100 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1101 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001102 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001103 ((['git', 'config', 'rietveld.server'],),
1104 'https://codereview.chromium.org'),
1105 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1106 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1107 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1108 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001109 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1110 ''), # No commits to rebase, according to local view of origin.
1111 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1112 'fake_ancestor_sha'),
1113 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1114 ((['git', 'rev-parse', '--show-cdup'],), ''),
1115 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1116 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1117 'fake_ancestor_sha...', '.'],),
1118 'M\tfile1.cpp'),
1119 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1120 ((['git', 'config', 'branch.feature.rietveldserver'],),
1121 'https://codereview.chromium.org'),
1122 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1123 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1124 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1125 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001126 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001127 # file1.cpp | 53 ++++++--
1128 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1129 ''),
1130 ((['git', 'show-ref', '--quiet', '--verify',
1131 'refs/heads/git-cl-commit'],),
1132 ''), # 0 return code means branch exists.
1133 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1134 ((['git', 'show-ref', '--quiet', '--verify',
1135 'refs/heads/git-cl-cherry-pick'],),
1136 CERR1), # This means git-cl-cherry-pick branch does not exist.
1137 ((['git', 'rev-parse', '--show-cdup'],), ''),
1138 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1139 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1140 ((['git', 'commit', '-m',
1141 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001142 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001143 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1144 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1145 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001146 repo_url),
1147
1148 ((['git', 'config', 'remote.origin.url'],), repo_url),
1149 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1150 git_numberer_enabled),
1151
1152 # Auto-rebase init.
1153 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1154 ]
1155 # Auto-rebase loops.
1156 for attempt in xrange(fail_push_count + 1):
1157 self.calls += [
1158 # Auto-rebase loop start.
1159 ((['git', 'retry', 'fetch', 'origin',
1160 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1161 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1162 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1163 # different in each loop iteration for truly realistic test.
1164 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1165 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1166 callError(1, 'failed to cherry pick') if fail_cherry_pick
1167 else ''),
1168 ]
1169 if fail_cherry_pick:
1170 return
1171
1172 if git_numberer_enabled:
1173 assert parent_msg
1174 self.calls += [
1175 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1176 parent_msg),
1177 ]
1178 if fail_after_parent_msg:
1179 return
1180 assert new_msg
1181 self.calls += [
1182 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1183 '1480022355'), # Committer's unix timestamp.
1184 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1185 '1480024000'),
1186 ((['git_amend_head committer timestamp', 1480024000],), ''),
1187 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1188 ]
1189 self.calls += [
1190 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1191 CERR1 if attempt < fail_push_count else ''),
1192 ]
1193 # End of autorebase + push.
1194
1195 self.calls += [
1196 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1197 ]
1198 if git_numberer_enabled:
1199 self.calls += [
1200 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1201 ]
1202
1203 # Cleanup calls.
1204 self.calls += [
1205 ((['git', 'checkout', '-q', 'feature'],), ''),
1206 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1207 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001208 ]
1209
1210 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001211 self._land_rietveld_calls(
1212 repo_url='https://chromium.googlesource.com/infra/infra',
1213 git_numberer_enabled=False,
1214 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001215 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001216 ((['git', 'config', 'rietveld.viewvc-url'],),
1217 'https://chromium.googlesource.com/infra/infra/+/'),
1218 ((['update_description', 123,
1219 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001220 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001221 ''),
1222 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001223 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001224 ]
1225 git_cl.main(['land'])
1226
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001227 def test_land_rietveld_fail_cherry_pick(self):
1228 self._land_rietveld_calls(
1229 repo_url='https://chromium.googlesource.com/infra/infra',
1230 git_numberer_enabled=False,
1231 fail_cherry_pick=True,
1232 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001233 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001234 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1235 'U path/file1\n'
1236 'U file2.cpp\n'),
1237 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001238 ((['git', 'checkout', '-q', 'feature'],), ''),
1239 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001240 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1241 ]
1242 git_cl.main(['land'])
1243
1244 def test_land_rietveld_git_numberer_fail_1_push(self):
1245 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1246
1247 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1248 self._land_rietveld_calls(
1249 repo_url='https://chromium.googlesource.com/chromium/src',
1250 git_numberer_enabled=True,
1251 parent_msg=('This is parent commit.\n'
1252 '\n'
1253 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1254 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1255 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1256 '\n'
1257 'Review-Url: https://codereview.chromium.org/123 .\n'
1258 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1259 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1260 fail_push_count=fail_push_count,
1261 debug=False)
1262
1263 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001264 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001265 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001266 ((['update_description', 123,
1267 'Issue: 123\n\nR=john@chromium.org\n'
1268 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001269 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001270 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1271 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1272 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001273 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001274 ''),
1275 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001276 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001277 ]
1278 git_cl.main(['land'])
1279
1280 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001281 self._land_rietveld_calls(
1282 repo_url='https://chromium.googlesource.com/v8/v8',
1283 git_numberer_enabled=True,
1284 parent_msg='This is parent commit with no footer.',
1285 fail_after_parent_msg=True,
1286 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001287 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001288 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001289 ((['git', 'checkout', '-q', 'feature'],), ''),
1290 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001291 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001292 ]
1293 with self.assertRaises(ValueError) as cm:
1294 git_cl.main(['land'])
1295 self.assertEqual(cm.exception.message,
1296 'Unable to infer commit position from footers')
1297
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001298 def test_git_numberer_not_whitelisted_repo(self):
1299 self.calls = []
1300 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001301 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1302 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001303 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001304
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001305 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001306 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1307 self.calls = [
1308 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001309 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001310 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001311 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001312 remote_url='https://chromium.googlesource.com/chromium/src',
1313 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001314 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001315
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001316 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001317 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001318 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001319 def fake_temporary_directory(**kwargs):
1320 yield tempdir
1321 self.mock(git_cl.gclient_utils, 'temporary_directory',
1322 fake_temporary_directory)
1323 self._test_GitNumbererState_valid_configs_inner(tempdir)
1324
1325 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001326 self.calls = [
1327 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001328 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001329 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1330 '''
1331 [plugin "git-numberer"]
1332 validate-enabled-refglob = refs/else/*
1333 validate-enabled-refglob = refs/heads/*
1334 validate-disabled-refglob = refs/heads/disabled
1335 validate-disabled-refglob = refs/branch-heads/*
1336 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001337 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1338 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001339 'refs/else/*\n'
1340 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001341 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1342 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001343 'refs/heads/disabled\n'
1344 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001345 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001346
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001347 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001348 remote_url='https://chromium.googlesource.com/chromium/src',
1349 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001350 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001351
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001352 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001353 remote_url='https://chromium.googlesource.com/chromium/src',
1354 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001355 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001356
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001357 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001358 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001359 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001360 remote_url='https://chromium.googlesource.com/chromium/src',
1361 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001362 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001363
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001364 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001365 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001366 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001367 if skip_auth_check:
1368 return [((cmd, ), 'true')]
1369
tandrii5d48c322016-08-18 16:19:37 -07001370 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001371 if issue:
1372 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001373 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001374 ])
1375 calls.extend([
1376 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1377 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1378 ((['git', 'config', 'remote.origin.url'],),
1379 'https://chromium.googlesource.com/my/repo'),
1380 ((['git', 'config', 'remote.origin.url'],),
1381 'https://chromium.googlesource.com/my/repo'),
1382 ])
1383 return calls
1384
1385 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001386 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001387 fetched_status=None, other_cl_owner=None,
1388 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001389 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001390 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1391 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1392 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1393 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001394 ]
1395 calls += cls._is_gerrit_calls(True)
1396 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001397 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1398 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1399 ((['git', 'config', 'branch.master.gerritissue'],),
1400 CERR1 if issue is None else str(issue)),
1401 ]
1402
1403 if custom_cl_base:
1404 ancestor_revision = custom_cl_base
1405 else:
1406 # Determine ancestor_revision to be merge base.
1407 ancestor_revision = 'fake_ancestor_sha'
1408 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001409 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001410 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001411 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001412 'refs/remotes/origin/master'],), ancestor_revision),
1413 ]
1414
1415 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001416 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1417
1418 if issue:
1419 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001420 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001421 '123456',
1422 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001423 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001424 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001425 'change_id': '123456789',
1426 'current_revision': 'sha1_of_current_revision',
1427 'revisions': { 'sha1_of_current_revision': {
1428 'commit': {'message': fetched_description},
1429 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001430 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001431 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001432 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001433 if fetched_status == 'ABANDONED':
1434 calls += [
1435 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1436 '123456 has been abandoned, new uploads are not '
1437 'allowed'), SystemExitMock()),
1438 ]
1439 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001440 if other_cl_owner:
1441 calls += [
1442 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1443 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001444
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001445 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1446 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001447 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001448 ((['git', 'rev-parse', '--show-cdup'],), ''),
1449 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001450
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001451 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1452 ancestor_revision + '...', '.'],),
1453 'M\t.gitignore\n'),
1454 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001455 ]
1456
1457 if not issue:
1458 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001459 ((['git', 'log', '--pretty=format:%s%n%n%b',
1460 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001461 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001462 ]
1463
1464 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001465 ((['git', 'config', 'user.email'],), 'me@example.com'),
1466 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1467 ([custom_cl_base] if custom_cl_base else
1468 [ancestor_revision, 'HEAD']),),
1469 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001470 ]
1471 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001472
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001473 @classmethod
1474 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001475 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001476 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001477 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001478 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001479 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001480 if post_amend_description is None:
1481 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001482 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001483 # Determined in `_gerrit_base_calls`.
1484 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1485
1486 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001487
tandriia60502f2016-06-20 02:01:53 -07001488 if squash_mode == 'default':
1489 calls.extend([
1490 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1491 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1492 ])
1493 elif squash_mode in ('override_squash', 'override_nosquash'):
1494 calls.extend([
1495 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1496 'true' if squash_mode == 'override_squash' else 'false'),
1497 ])
1498 else:
1499 assert squash_mode in ('squash', 'nosquash')
1500
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001501 # If issue is given, then description is fetched from Gerrit instead.
1502 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001503 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001504 ((['git', 'log', '--pretty=format:%s\n\n%b',
1505 ((custom_cl_base + '..') if custom_cl_base else
1506 'fake_ancestor_sha..HEAD')],),
1507 description),
1508 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001509 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001510 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001511 else:
1512 if not title:
1513 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001514 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1515 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001516 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001517 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001518 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001519 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001520 (('DownloadGerritHook', False), ''),
1521 # Amending of commit message to get the Change-Id.
1522 ((['git', 'log', '--pretty=format:%s\n\n%b',
1523 determined_ancestor_revision + '..HEAD'],),
1524 description),
1525 ((['git', 'commit', '--amend', '-m', description],), ''),
1526 ((['git', 'log', '--pretty=format:%s\n\n%b',
1527 determined_ancestor_revision + '..HEAD'],),
1528 post_amend_description)
1529 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001530 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001531 if not issue:
1532 # Prompting to edit description on first upload.
1533 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001534 ((['git', 'config', 'core.editor'],), ''),
1535 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001536 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001537 ref_to_push = 'abcdef0123456789'
1538 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001539 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1540 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1541 ]
1542
1543 if custom_cl_base is None:
1544 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001545 ((['get_or_create_merge_base', 'master',
1546 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001547 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001548 ]
1549 parent = 'origin/master'
1550 else:
1551 calls += [
1552 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1553 'refs/remotes/origin/master'],),
1554 callError(1)), # Means not ancenstor.
1555 (('ask_for_data',
1556 'Do you take responsibility for cleaning up potential mess '
1557 'resulting from proceeding with upload? Press Enter to upload, '
1558 'or Ctrl+C to abort'), ''),
1559 ]
1560 parent = custom_cl_base
1561
1562 calls += [
1563 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1564 '0123456789abcdef'),
1565 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001566 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001567 ref_to_push),
1568 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001569 else:
1570 ref_to_push = 'HEAD'
1571
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001572 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001573 ((['git', 'rev-list',
1574 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1575 ref_to_push],),
1576 '1hashPerLine\n'),
1577 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001578
Aaron Gableafd52772017-06-27 16:40:10 -07001579 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001580 ref_suffix = '%ready,notify=ALL'
1581 else:
1582 if not issue:
1583 ref_suffix = '%wip'
1584 else:
1585 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001586
Aaron Gable70f4e242017-06-26 10:45:59 -07001587 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001588 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001589
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001590 if git_mirror is None:
1591 calls += [
1592 ((['git', 'config', 'remote.origin.url'],),
1593 'https://chromium.googlesource.com/yyy/zzz'),
1594 ]
1595 else:
1596 calls += [
1597 ((['git', 'config', 'remote.origin.url'],),
1598 '/cache/this-dir-exists'),
1599 (('os.path.isdir', '/cache/this-dir-exists'),
1600 True),
1601 # Runs in /cache/this-dir-exists.
1602 ((['git', 'config', 'remote.origin.url'],),
1603 'https://chromium.googlesource.com/yyy/zzz'),
1604 ]
1605
ukai@chromium.orge8077812012-02-03 03:41:46 +00001606 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001607 ((['git', 'push',
1608 'https://chromium.googlesource.com/yyy/zzz',
1609 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001610 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001611 'remote: Processing changes: (\)\n'
1612 'remote: Processing changes: (|)\n'
1613 'remote: Processing changes: (/)\n'
1614 'remote: Processing changes: (-)\n'
1615 'remote: Processing changes: new: 1 (/)\n'
1616 'remote: Processing changes: new: 1, done\n'
1617 'remote:\n'
1618 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001619 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1620 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001621 'remote:\n'
1622 'To https://chromium.googlesource.com/yyy/zzz\n'
1623 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001624 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001625 if squash:
1626 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001627 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001628 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001629 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001630 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001631 ((['git', 'config', 'branch.master.gerritsquashhash',
1632 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001633 ]
tandrii88189772016-09-29 04:29:57 -07001634 calls += [
1635 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001636 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001637 123456 if squash else None, sorted(reviewers),
1638 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001639 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001640 if tbr:
1641 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001642 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1643 ['LABELS']), {
1644 'labels': {
1645 'Code-Review': {
1646 'default_value': 0,
1647 'all': [],
1648 'values': {
1649 '+2': 'lgtm, approved',
1650 '+1': 'lgtm, but someone else must approve',
1651 ' 0': 'No score',
1652 '-1': 'Don\'t submit as-is',
1653 }
1654 }
1655 }
1656 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001657 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001658 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001659 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001660 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001661 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001662 return calls
1663
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001664 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001665 self,
1666 upload_args,
1667 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001668 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001669 squash=True,
1670 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001671 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001672 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001673 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001674 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001675 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001676 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001677 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001678 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001679 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001680 custom_cl_base=None,
1681 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001682 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001683 if squash_mode is None:
1684 if '--no-squash' in upload_args:
1685 squash_mode = 'nosquash'
1686 elif '--squash' in upload_args:
1687 squash_mode = 'squash'
1688 else:
1689 squash_mode = 'default'
1690
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001691 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001692 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001693 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001694 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001695 CookiesAuthenticatorMockFactory(
1696 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001697 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1698 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001699 self.mock(git_cl.gclient_utils, 'RunEditor',
1700 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001701 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1702 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001703
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001704 original_os_path_isdir = os.path.isdir
1705 def selective_os_path_isdir_mock(path):
1706 if path == '/cache/this-dir-exists':
1707 return self._mocked_call('os.path.isdir', path)
1708 return original_os_path_isdir(path)
1709 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1710
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001711 self.calls = self._gerrit_base_calls(
1712 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001713 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001714 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001715 other_cl_owner=other_cl_owner,
1716 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001717 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001718 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1719 expected_content=description))
1720 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001721 self.calls += self._gerrit_upload_calls(
1722 description, reviewers, squash,
1723 squash_mode=squash_mode,
1724 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001725 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001726 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001727 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001728 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001729 # Uncomment when debugging.
1730 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001731 git_cl.main(['upload'] + upload_args)
1732
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001733 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001734 self._run_gerrit_upload_test(
1735 ['--no-squash'],
1736 'desc\n\nBUG=\n',
1737 [],
1738 squash=False,
1739 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1740
1741 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001742 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001743 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001744 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001745 [],
tandriia60502f2016-06-20 02:01:53 -07001746 squash=False,
1747 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001748 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001749
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001750 def test_gerrit_no_reviewer(self):
1751 self._run_gerrit_upload_test(
1752 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001753 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001754 [],
1755 squash=False,
1756 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001757
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001758 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001759 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1760 self._run_gerrit_upload_test(
1761 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1762 'desc\n\nBUG=\n\nChange-Id: I123456789',
1763 squash=False,
1764 squash_mode='override_nosquash',
1765 title='Dont_put_bad_chars')
1766 self.assertIn(
1767 'WARNING: Patchset title may only contain alphanumeric chars '
1768 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1769 'Cleaned up title: Dont put bad chars\n',
1770 git_cl.sys.stdout.getvalue())
1771
ukai@chromium.orge8077812012-02-03 03:41:46 +00001772 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001773 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001774 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001775 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001776 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001777 squash=False,
1778 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001779 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001780
1781 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001782 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001783 [],
bradnelsond975b302016-10-23 12:20:23 -07001784 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1785 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001786 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001787 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001788 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001789 cc=['more@example.com', 'people@example.com'],
1790 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001791
1792 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001793 self._run_gerrit_upload_test(
1794 [],
1795 'desc\nBUG=\n\nChange-Id: 123456789',
1796 [],
1797 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001798
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001799 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001800 self._run_gerrit_upload_test(
1801 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001802 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001803 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001804 squash=True,
1805 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001806
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001807 def test_gerrit_upload_squash_first_against_rev(self):
1808 custom_cl_base = 'custom_cl_base_rev_or_branch'
1809 self._run_gerrit_upload_test(
1810 ['--squash', custom_cl_base],
1811 'desc\nBUG=\n\nChange-Id: 123456789',
1812 [],
1813 squash=True,
1814 expected_upstream_ref='origin/master',
1815 custom_cl_base=custom_cl_base)
1816 self.assertIn(
1817 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1818 sys.stdout.getvalue())
1819
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001820 def test_gerrit_upload_squash_first_with_mirror(self):
1821 self._run_gerrit_upload_test(
1822 ['--squash'],
1823 'desc\nBUG=\n\nChange-Id: 123456789',
1824 [],
1825 squash=True,
1826 expected_upstream_ref='origin/master',
1827 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1828
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001829 def test_gerrit_upload_squash_reupload(self):
1830 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001831 self._run_gerrit_upload_test(
1832 ['--squash'],
1833 description,
1834 [],
1835 squash=True,
1836 expected_upstream_ref='origin/master',
1837 issue=123456)
1838
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001839 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1840 self.mock(git_cl, 'DieWithError',
1841 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1842 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1843 with self.assertRaises(SystemExitMock):
1844 self._run_gerrit_upload_test(
1845 ['--squash'],
1846 description,
1847 [],
1848 squash=True,
1849 expected_upstream_ref='origin/master',
1850 issue=123456,
1851 fetched_status='ABANDONED')
1852
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001853 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1854 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1855 lambda *_, **__: {'email': 'yet-another@example.com'})
1856 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1857 self._run_gerrit_upload_test(
1858 ['--squash'],
1859 description,
1860 [],
1861 squash=True,
1862 expected_upstream_ref='origin/master',
1863 issue=123456,
1864 other_cl_owner='other@example.com')
1865 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001866 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001867 'authenticate to Gerrit as yet-another@example.com.\n'
1868 'Uploading may fail due to lack of permissions',
1869 git_cl.sys.stdout.getvalue())
1870
rmistry@google.com2dd99862015-06-22 12:22:18 +00001871 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001872 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001873 def mock_run_git(*args, **_kwargs):
1874 if args[0] == ['for-each-ref',
1875 '--format=%(refname:short) %(upstream:short)',
1876 'refs/heads']:
1877 # Create a local branch dependency tree that looks like this:
1878 # test1 -> test2 -> test3 -> test4 -> test5
1879 # -> test3.1
1880 # test6 -> test0
1881 branch_deps = [
1882 'test2 test1', # test1 -> test2
1883 'test3 test2', # test2 -> test3
1884 'test3.1 test2', # test2 -> test3.1
1885 'test4 test3', # test3 -> test4
1886 'test5 test4', # test4 -> test5
1887 'test6 test0', # test0 -> test6
1888 'test7', # test7
1889 ]
1890 return '\n'.join(branch_deps)
1891 self.mock(git_cl, 'RunGit', mock_run_git)
1892
1893 class RecordCalls:
1894 times_called = 0
1895 record_calls = RecordCalls()
1896 def mock_CMDupload(*args, **_kwargs):
1897 record_calls.times_called += 1
1898 return 0
1899 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1900
1901 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001902 (('ask_for_data', 'This command will checkout all dependent branches '
1903 'and run "git cl upload". Press Enter to continue, '
1904 'or Ctrl+C to abort'), ''),
1905 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001906
1907 class MockChangelist():
1908 def __init__(self):
1909 pass
1910 def GetBranch(self):
1911 return 'test1'
1912 def GetIssue(self):
1913 return '123'
1914 def GetPatchset(self):
1915 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001916 def IsGerrit(self):
1917 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001918
1919 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1920 # CMDupload should have been called 5 times because of 5 dependent branches.
1921 self.assertEquals(5, record_calls.times_called)
1922 self.assertEquals(0, ret)
1923
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001924 def test_gerrit_change_id(self):
1925 self.calls = [
1926 ((['git', 'write-tree'], ),
1927 'hashtree'),
1928 ((['git', 'rev-parse', 'HEAD~0'], ),
1929 'branch-parent'),
1930 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1931 'A B <a@b.org> 1456848326 +0100'),
1932 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1933 'C D <c@d.org> 1456858326 +0100'),
1934 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1935 'hashchange'),
1936 ]
1937 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1938 self.assertEqual(change_id, 'Ihashchange')
1939
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001940 def test_desecription_append_footer(self):
1941 for init_desc, footer_line, expected_desc in [
1942 # Use unique desc first lines for easy test failure identification.
1943 ('foo', 'R=one', 'foo\n\nR=one'),
1944 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1945 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1946 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1947 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1948 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1949 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1950 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1951 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1952 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1953 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1954 ]:
1955 desc = git_cl.ChangeDescription(init_desc)
1956 desc.append_footer(footer_line)
1957 self.assertEqual(desc.description, expected_desc)
1958
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001959 def test_update_reviewers(self):
1960 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001961 ('foo', [], [],
1962 'foo'),
1963 ('foo\nR=xx', [], [],
1964 'foo\nR=xx'),
1965 ('foo\nTBR=xx', [], [],
1966 'foo\nTBR=xx'),
1967 ('foo', ['a@c'], [],
1968 'foo\n\nR=a@c'),
1969 ('foo\nR=xx', ['a@c'], [],
1970 'foo\n\nR=a@c, xx'),
1971 ('foo\nTBR=xx', ['a@c'], [],
1972 'foo\n\nR=a@c\nTBR=xx'),
1973 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1974 'foo\n\nR=a@c, yy\nTBR=xx'),
1975 ('foo\nBUG=', ['a@c'], [],
1976 'foo\nBUG=\nR=a@c'),
1977 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1978 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1979 ('foo', ['a@c', 'b@c'], [],
1980 'foo\n\nR=a@c, b@c'),
1981 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1982 'foo\nBar\n\nR=c@c\nBUG='),
1983 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1984 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001985 # Same as the line before, but full of whitespaces.
1986 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001987 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001988 'foo\nBar\n\nR=c@c\n BUG =',
1989 ),
1990 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001991 ('foo BUG=allo R=joe ', ['c@c'], [],
1992 'foo BUG=allo R=joe\n\nR=c@c'),
1993 # Redundant TBRs get promoted to Rs
1994 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1995 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001996 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001997 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001998 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001999 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002000 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002001 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002002 actual.append(obj.description)
2003 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002004
wittman@chromium.org455dc922015-01-26 20:15:50 +00002005 def test_get_target_ref(self):
2006 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002007 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002008 self.assertEqual(None, git_cl.GetTargetRef(None,
2009 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002010 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002011
wittman@chromium.org455dc922015-01-26 20:15:50 +00002012 # Check default target refs for branches.
2013 self.assertEqual('refs/heads/master',
2014 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002015 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002016 self.assertEqual('refs/heads/master',
2017 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002018 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002019 self.assertEqual('refs/heads/master',
2020 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002021 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002022 self.assertEqual('refs/branch-heads/123',
2023 git_cl.GetTargetRef('origin',
2024 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002025 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002026 self.assertEqual('refs/diff/test',
2027 git_cl.GetTargetRef('origin',
2028 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002029 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00002030 self.assertEqual('refs/heads/chrome/m42',
2031 git_cl.GetTargetRef('origin',
2032 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002033 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002034
2035 # Check target refs for user-specified target branch.
2036 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
2037 'refs/remotes/branch-heads/123'):
2038 self.assertEqual('refs/branch-heads/123',
2039 git_cl.GetTargetRef('origin',
2040 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002041 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002042 for branch in ('origin/master', 'remotes/origin/master',
2043 'refs/remotes/origin/master'):
2044 self.assertEqual('refs/heads/master',
2045 git_cl.GetTargetRef('origin',
2046 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002047 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002048 for branch in ('master', 'heads/master', 'refs/heads/master'):
2049 self.assertEqual('refs/heads/master',
2050 git_cl.GetTargetRef('origin',
2051 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002052 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002053
wychen@chromium.orga872e752015-04-28 23:42:18 +00002054 def test_patch_when_dirty(self):
2055 # Patch when local tree is dirty
2056 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2057 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2058
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002059 @staticmethod
2060 def _get_gerrit_codereview_server_calls(branch, value=None,
2061 git_short_host='host',
2062 detect_branch=True):
2063 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2064
2065 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2066 """
2067 calls = []
2068 if detect_branch:
2069 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
2070 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2071 CERR1 if value is None else value))
2072 if value is None:
2073 calls += [
2074 ((['git', 'config', 'branch.' + branch + '.merge'],),
2075 'refs/heads' + branch),
2076 ((['git', 'config', 'branch.' + branch + '.remote'],),
2077 'origin'),
2078 ((['git', 'config', 'remote.origin.url'],),
2079 'https://%s.googlesource.com/my/repo' % git_short_host),
2080 ]
2081 return calls
2082
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002083 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002084 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002085 detect_gerrit_server=True,
2086 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002087 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002088 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2089 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002090 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002091 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002092 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2093
tandriidf09a462016-08-18 16:23:55 -07002094 if new_branch:
2095 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002096
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002097 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002098 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002099 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002100 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002101 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2102 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2103 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2104 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002105 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002106 if default_codereview == 'gerrit':
2107 if not force_codereview:
2108 self.calls += [
2109 ((['git', 'config', 'gerrit.host'],), 'true'),
2110 ]
2111 if detect_gerrit_server:
2112 self.calls += self._get_gerrit_codereview_server_calls(
2113 'master', git_short_host=git_short_host,
2114 detect_branch=not new_branch and force_codereview)
2115 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002116
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002117 elif default_codereview == 'rietveld':
2118 self.calls += [
2119 ((['git', 'config', 'gerrit.host'],), CERR1),
2120 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2121 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2122 ]
2123 actual_codereview = 'rietveld'
2124
2125 if actual_codereview == 'rietveld':
2126 self.calls += [
2127 ((['git', 'rev-parse', '--show-cdup'],), ''),
2128 ]
2129 if not default_codereview:
2130 self.calls += [
2131 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2132 ]
2133 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002134 self.calls += [
2135 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002136 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002137 {
2138 'current_revision': '7777777777',
2139 'revisions': {
2140 '1111111111': {
2141 '_number': 1,
2142 'fetch': {'http': {
2143 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2144 'ref': 'refs/changes/56/123456/1',
2145 }},
2146 },
2147 '7777777777': {
2148 '_number': 7,
2149 'fetch': {'http': {
2150 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2151 'ref': 'refs/changes/56/123456/7',
2152 }},
2153 },
2154 },
2155 }),
2156 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002157
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002158 def _common_patch_rietveld_successful(self, **kwargs):
2159 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002160 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002161 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002162 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002163 ((['git', 'config', 'branch.master.rietveldserver',
2164 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002165 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002166 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002167 ((['git', 'commit', '-m',
2168 'Description\n\n' +
2169 'patch from issue 123456 at patchset 60001 ' +
2170 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002171 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002172
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002173 def test_patch_rietveld_default(self):
2174 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002175 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2176
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002177 def test_patch_rietveld_successful_new_branch(self):
2178 self._common_patch_rietveld_successful(default_codereview='rietveld',
2179 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002180 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2181
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002182 def test_patch_rietveld_guess_by_url(self):
2183 self._common_patch_rietveld_successful(
2184 default_codereview=None, # It doesn't matter.
2185 actual_codereview='rietveld')
2186 self.assertEqual(git_cl.main(
2187 ['patch', 'https://codereview.example.com/123456']), 0)
2188
2189 def test_patch_rietveld_conflict(self):
2190 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002191 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002192 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002193
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002194 def test_patch_gerrit_default(self):
2195 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002196 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 self.calls += [
2198 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2199 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002200 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002201 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002202 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002203 ((['git', 'config', 'branch.master.gerritserver',
2204 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002205 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002206 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2207 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2208 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002209 ]
2210 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2211
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002212 def test_patch_gerrit_force(self):
2213 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002214 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002215 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002216 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002217 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002218 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002219 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002220 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002221 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002222 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002223 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002224 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2225 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2226 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002227 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002228 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002229
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002230 def test_patch_gerrit_guess_by_url(self):
2231 self._patch_common(
2232 default_codereview=None, # It doesn't matter what's default.
2233 actual_codereview='gerrit',
2234 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002235 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002236 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002237 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002238 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002239 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002240 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002241 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002242 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002243 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002244 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002245 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2246 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2247 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002248 ]
2249 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002250 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002251
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002252 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2253 self._patch_common(
2254 default_codereview=None, # It doesn't matter what's default.
2255 actual_codereview='gerrit',
2256 git_short_host='else', detect_gerrit_server=False)
2257 self.calls += [
2258 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2259 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002260 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002261 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2262 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2263 ''),
2264 ((['git', 'config', 'branch.master.gerritserver',
2265 'https://else-review.googlesource.com'],), ''),
2266 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002267 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2268 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2269 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002270 ]
2271 self.assertEqual(git_cl.main(
2272 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2273
2274 def test_patch_gerrit_conflict(self):
2275 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002276 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002277 self.calls += [
2278 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002279 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002280 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2281 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2282 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002283 ]
2284 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002285 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002286
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002287 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002288 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002289 raise git_cl.gerrit_util.GerritError(404, '')
2290 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2291
tandriic2405f52016-10-10 08:13:15 -07002292 self.calls = [
2293 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002294 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2295 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2296 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2297 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002298 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2299 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2300 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2301 ((['git', 'config', 'remote.origin.url'],),
2302 'https://chromium.googlesource.com/my/repo'),
2303 ((['DieWithError',
2304 'change 123456 at https://chromium-review.googlesource.com does not '
2305 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002306 ]
2307 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002308 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002309
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002310 def _checkout_calls(self):
2311 return [
2312 ((['git', 'config', '--local', '--get-regexp',
2313 'branch\\..*\\.rietveldissue'], ),
2314 ('branch.retrying.rietveldissue 1111111111\n'
2315 'branch.some-fix.rietveldissue 2222222222\n')),
2316 ((['git', 'config', '--local', '--get-regexp',
2317 'branch\\..*\\.gerritissue'], ),
2318 ('branch.ger-branch.gerritissue 123456\n'
2319 'branch.gbranch654.gerritissue 654321\n')),
2320 ]
2321
2322 def test_checkout_gerrit(self):
2323 """Tests git cl checkout <issue>."""
2324 self.calls = self._checkout_calls()
2325 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2326 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2327
2328 def test_checkout_rietveld(self):
2329 """Tests git cl checkout <issue>."""
2330 self.calls = self._checkout_calls()
2331 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2332 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2333
2334 def test_checkout_not_found(self):
2335 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002336 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002337 self.calls = self._checkout_calls()
2338 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2339
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002340 def test_checkout_no_branch_issues(self):
2341 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002342 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002343 self.calls = [
2344 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002345 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002346 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002347 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002348 ]
2349 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2350
tandrii@chromium.org28253532016-04-14 13:46:56 +00002351 def _test_gerrit_ensure_authenticated_common(self, auth,
2352 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002353 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2354 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2355 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002356 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002357 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002358 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002359 cl.branch = 'master'
2360 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002361 cl.lookedup_issue = True
2362 return cl
2363
2364 def test_gerrit_ensure_authenticated_missing(self):
2365 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002366 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002367 })
2368 self.calls.append(
2369 ((['DieWithError',
2370 'Credentials for the following hosts are required:\n'
2371 ' chromium-review.googlesource.com\n'
2372 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002373 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002374 'https://chromium-review.googlesource.com/new-password'],), ''),)
2375 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2376
2377 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002378 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002379 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002380 'chromium.googlesource.com':
2381 ('git-one.example.com', None, 'secret1'),
2382 'chromium-review.googlesource.com':
2383 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002384 })
2385 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002386 (('ask_for_data', 'If you know what you are doing '
2387 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002388 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2389
2390 def test_gerrit_ensure_authenticated_ok(self):
2391 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002392 'chromium.googlesource.com':
2393 ('git-same.example.com', None, 'secret'),
2394 'chromium-review.googlesource.com':
2395 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002396 })
2397 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2398
tandrii@chromium.org28253532016-04-14 13:46:56 +00002399 def test_gerrit_ensure_authenticated_skipped(self):
2400 cl = self._test_gerrit_ensure_authenticated_common(
2401 auth={}, skip_auth_check=True)
2402 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2403
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002404 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002405 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2406 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002407 self.calls = [
2408 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002409 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002410 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2411 ((['git', 'config', 'rietveld.server'],), ''),
2412 ((['git', 'config', 'rietveld.server'],), ''),
2413 ((['git', 'config', 'branch.feature.rietveldserver'],),
2414 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002415 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002416 ]
2417 self.assertEqual(0, git_cl.main(['set-commit']))
2418
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002419 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002420 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002421 lambda h, i, labels, notify=None:
2422 self._mocked_call(['SetReview', h, i, labels, notify]))
2423
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002424 self.calls = [
2425 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002426 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2427 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002428 ((['git', 'config', 'branch.feature.gerritserver'],),
2429 'https://chromium-review.googlesource.com'),
2430 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002431 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002432 ]
tandriid9e5ce52016-07-13 02:32:59 -07002433
2434 def test_cmd_set_commit_gerrit_clear(self):
2435 self._cmd_set_commit_gerrit_common(0)
2436 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2437
2438 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002439 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002440 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2441
tandriid9e5ce52016-07-13 02:32:59 -07002442 def test_cmd_set_commit_gerrit(self):
2443 self._cmd_set_commit_gerrit_common(2)
2444 self.assertEqual(0, git_cl.main(['set-commit']))
2445
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002446 def test_description_display(self):
2447 out = StringIO.StringIO()
2448 self.mock(git_cl.sys, 'stdout', out)
2449
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002450 self.mock(git_cl, 'Changelist', ChangelistMock)
2451 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002452
2453 self.assertEqual(0, git_cl.main(['description', '-d']))
2454 self.assertEqual('foo\n', out.getvalue())
2455
2456 def test_description_rietveld(self):
2457 out = StringIO.StringIO()
2458 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002459 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002460
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002461 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002462 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002463 self.assertEqual('foobar\n', out.getvalue())
2464
iannucci3c972b92016-08-17 13:24:10 -07002465 def test_StatusFieldOverrideIssueMissingArgs(self):
2466 out = StringIO.StringIO()
2467 self.mock(git_cl.sys, 'stderr', out)
2468
2469 try:
2470 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2471 except SystemExit as ex:
2472 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002473 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002474
2475 out = StringIO.StringIO()
2476 self.mock(git_cl.sys, 'stderr', out)
2477
2478 try:
2479 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2480 except SystemExit as ex:
2481 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002482 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002483
2484 def test_StatusFieldOverrideIssue(self):
2485 out = StringIO.StringIO()
2486 self.mock(git_cl.sys, 'stdout', out)
2487
2488 def assertIssue(cl_self, *_args):
2489 self.assertEquals(cl_self.issue, 1)
2490 return 'foobar'
2491
2492 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2493 self.calls = [
2494 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2495 ((['git', 'config', 'rietveld.server'],), ''),
2496 ((['git', 'config', 'rietveld.server'],), ''),
2497 ]
iannuccie53c9352016-08-17 14:40:40 -07002498 self.assertEqual(
2499 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2500 0)
iannucci3c972b92016-08-17 13:24:10 -07002501 self.assertEqual(out.getvalue(), 'foobar\n')
2502
iannuccie53c9352016-08-17 14:40:40 -07002503 def test_SetCloseOverrideIssue(self):
2504 def assertIssue(cl_self, *_args):
2505 self.assertEquals(cl_self.issue, 1)
2506 return 'foobar'
2507
2508 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2509 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2510 self.calls = [
2511 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2512 ((['git', 'config', 'rietveld.server'],), ''),
2513 ((['git', 'config', 'rietveld.server'],), ''),
2514 ]
2515 self.assertEqual(
2516 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2517
2518 def test_SetCommitOverrideIssue(self):
2519 def assertIssue(cl_self, *_args):
2520 self.assertEquals(cl_self.issue, 1)
2521 return 'foobar'
2522
2523 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2524 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2525 self.calls = [
2526 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2527 ((['git', 'config', 'rietveld.server'],), ''),
2528 ((['git', 'config', 'rietveld.server'],), ''),
2529 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2530 ((['git', 'config', 'rietveld.server'],), ''),
2531 ((['git', 'config', 'rietveld.server'],), ''),
2532 ]
2533 self.assertEqual(
2534 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2535
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002536 def test_description_gerrit(self):
2537 out = StringIO.StringIO()
2538 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002539 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002540 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002541 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2542 {
2543 'current_revision': 'sha1',
2544 'revisions': {'sha1': {
2545 'commit': {'message': 'foobar'},
2546 }},
2547 }),
2548 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002549 self.assertEqual(0, git_cl.main([
2550 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2551 self.assertEqual('foobar\n', out.getvalue())
2552
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002553 def test_description_set_raw(self):
2554 out = StringIO.StringIO()
2555 self.mock(git_cl.sys, 'stdout', out)
2556
2557 self.mock(git_cl, 'Changelist', ChangelistMock)
2558 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2559
2560 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2561 self.assertEqual('hihi', ChangelistMock.desc)
2562
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002563 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002564 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002565
2566 def RunEditor(desc, _, **kwargs):
2567 self.assertEquals(
2568 '# Enter a description of the change.\n'
2569 '# This will be displayed on the codereview site.\n'
2570 '# The first line will also be used as the subject of the review.\n'
2571 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002572 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002573 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002574 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002575 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002576 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002577
dsansomee2d6fd92016-09-08 00:10:47 -07002578 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002579 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002580
2581 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2582 self.mock(git_cl.Changelist, 'GetDescription',
2583 lambda *args: current_desc)
2584 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2585 UpdateDescriptionRemote)
2586 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2587
2588 self.calls = [
2589 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002590 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002591 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2592 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002593 ((['git', 'config', 'core.editor'],), 'vi'),
2594 ]
2595 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2596
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002597 def test_description_set_stdin(self):
2598 out = StringIO.StringIO()
2599 self.mock(git_cl.sys, 'stdout', out)
2600
2601 self.mock(git_cl, 'Changelist', ChangelistMock)
2602 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2603
2604 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2605 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2606
kmarshall3bff56b2016-06-06 18:31:47 -07002607 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002608 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2609
kmarshall3bff56b2016-06-06 18:31:47 -07002610 self.calls = \
2611 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2612 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002613 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002614 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2615 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002616 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2617 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2618 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002619 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2620 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2621 ((['git', 'branch', '-D', 'foo'],), '')]
2622
kmarshall3bff56b2016-06-06 18:31:47 -07002623 self.mock(git_cl, 'get_cl_statuses',
2624 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002625 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2626 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2627 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002628
2629 self.assertEqual(0, git_cl.main(['archive', '-f']))
2630
2631 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002632 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002633 self.calls = \
2634 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2635 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002636 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002637 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2638 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002639 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2640
kmarshall9249e012016-08-23 12:02:16 -07002641 self.mock(git_cl, 'get_cl_statuses',
2642 lambda branches, fine_grained, max_processes:
2643 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2644
2645 self.assertEqual(1, git_cl.main(['archive', '-f']))
2646
2647 def test_archive_dry_run(self):
2648 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2649
2650 self.calls = \
2651 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2652 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2653 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2654 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2655 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2656 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2657 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2658 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2659 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002660
2661 self.mock(git_cl, 'get_cl_statuses',
2662 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002663 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2664 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2665 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002666
kmarshall9249e012016-08-23 12:02:16 -07002667 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2668
2669 def test_archive_no_tags(self):
2670 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2671
2672 self.calls = \
2673 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2674 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2675 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2676 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2677 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2678 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2679 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2680 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2681 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2682 ((['git', 'branch', '-D', 'foo'],), '')]
2683
2684 self.mock(git_cl, 'get_cl_statuses',
2685 lambda branches, fine_grained, max_processes:
2686 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2687 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2688 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2689
2690 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002691
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002692 def test_cmd_issue_erase_existing(self):
2693 out = StringIO.StringIO()
2694 self.mock(git_cl.sys, 'stdout', out)
2695 self.calls = [
2696 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002697 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2698 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002699 # Let this command raise exception (retcode=1) - it should be ignored.
2700 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002701 CERR1),
2702 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2703 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002704 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2705 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2706 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002707 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002708 ]
2709 self.assertEqual(0, git_cl.main(['issue', '0']))
2710
Aaron Gable400e9892017-07-12 15:31:21 -07002711 def test_cmd_issue_erase_existing_with_change_id(self):
2712 out = StringIO.StringIO()
2713 self.mock(git_cl.sys, 'stdout', out)
2714 self.mock(git_cl.Changelist, 'GetDescription',
2715 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2716 self.calls = [
2717 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2718 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2719 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002720 # Let this command raise exception (retcode=1) - it should be ignored.
2721 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2722 CERR1),
2723 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2724 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2725 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2726 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2727 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002728 ((['git', 'log', '-1', '--format=%B'],),
2729 'This is a description\n\nChange-Id: Ideadbeef'),
2730 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002731 ]
2732 self.assertEqual(0, git_cl.main(['issue', '0']))
2733
phajdan.jre328cf92016-08-22 04:12:17 -07002734 def test_cmd_issue_json(self):
2735 out = StringIO.StringIO()
2736 self.mock(git_cl.sys, 'stdout', out)
2737 self.calls = [
2738 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002739 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002740 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2741 ((['git', 'config', 'rietveld.server'],),
2742 'https://codereview.chromium.org'),
2743 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2744 (('write_json', 'output.json',
2745 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2746 ''),
2747 ]
2748 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2749
tandriide281ae2016-10-12 06:02:30 -07002750 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002751 self.mock(git_cl.Changelist, 'GetChange',
2752 lambda _, *a: (
2753 self._mocked_call(['GetChange']+list(a))))
2754 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2755 lambda *_, **__: (
2756 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002757 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2758 lambda _, s: self._mocked_call(['SetCQState', s]))
2759 self.calls = [
2760 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002761 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002762 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2763 ((['git', 'config', 'rietveld.server'],),
2764 'https://codereview.chromium.org'),
2765 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2766 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2767 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2768 ((['get_or_create_merge_base', 'feature', 'feature'],),
2769 'fake_ancestor_sha'),
2770 ((['GetChange', 'fake_ancestor_sha', None], ),
2771 git_cl.presubmit_support.GitChange(
2772 '', '', '', '', '', '', '', '')),
2773 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2774 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002775 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2776 ]
2777 out = StringIO.StringIO()
2778 self.mock(git_cl.sys, 'stdout', out)
2779 self.assertEqual(0, git_cl.main(['try']))
2780 self.assertEqual(
2781 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002782 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002783
tandrii8c5a3532016-11-04 07:52:02 -07002784 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2785 self.mock(git_cl.Changelist, 'GetChange',
2786 lambda _, *a: (
2787 self._mocked_call(['GetChange']+list(a))))
2788 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2789 lambda *_, **__: (
2790 self._mocked_call(['DoGetTryMasters'])))
2791 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2792 lambda _, s: self._mocked_call(['SetCQState', s]))
2793
tandrii8c5a3532016-11-04 07:52:02 -07002794 self.calls = [
2795 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2796 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2797 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2798 ((['git', 'config', 'branch.feature.gerritserver'],),
2799 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002800 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2801 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2802 'project': 'depot_tools',
2803 'status': 'OPEN',
2804 'owner': {'email': 'owner@e.mail'},
2805 'revisions': {
2806 'deadbeaf': {
2807 '_number': 6,
2808 },
2809 'beeeeeef': {
2810 '_number': 7,
2811 'fetch': {'http': {
2812 'url': 'https://chromium.googlesource.com/depot_tools',
2813 'ref': 'refs/changes/56/123456/7'
2814 }},
2815 },
2816 },
2817 }),
tandrii8c5a3532016-11-04 07:52:02 -07002818 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2819 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2820 ((['get_or_create_merge_base', 'feature', 'feature'],),
2821 'fake_ancestor_sha'),
2822 ((['GetChange', 'fake_ancestor_sha', None], ),
2823 git_cl.presubmit_support.GitChange(
2824 '', '', '', '', '', '', '', '')),
2825 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2826 ((['DoGetTryMasters'], ), None),
2827 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2828 ]
2829 out = StringIO.StringIO()
2830 self.mock(git_cl.sys, 'stdout', out)
2831 self.assertEqual(0, git_cl.main(['try']))
2832 self.assertEqual(
2833 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002834 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002835 'https://chromium-review.googlesource.com/123456\n')
2836
2837 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2838 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2839 lambda _: {
2840 'owner_email': 'owner@e.mail',
2841 'private': False,
2842 'closed': False,
2843 'project': 'depot_tools',
2844 'patchsets': [20001],
2845 })
tandriide281ae2016-10-12 06:02:30 -07002846 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2847 self.calls = [
2848 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2849 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2850 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2851 ((['git', 'config', 'rietveld.server'],),
2852 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002853 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002854 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002855 ]
2856
2857 def _buildbucket_retry(*_, **kw):
2858 # self.maxDiff = 10000
2859 body = json.loads(kw['body'])
2860 self.assertEqual(len(body['builds']), 1)
2861 build = body['builds'][0]
2862 params = json.loads(build.pop('parameters_json'))
2863 self.assertEqual(params, {
2864 u'builder_name': u'win',
2865 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2866 u'revision': None}],
2867 u'properties': {
2868 u'category': u'git_cl_try',
2869 u'issue': 123,
2870 u'key': u'val',
2871 u'json': [{u'a': 1}, None],
2872 u'master': u'tryserver.chromium',
2873 u'patch_project': u'depot_tools',
2874 u'patch_storage': u'rietveld',
2875 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002876 u'rietveld': u'https://codereview.chromium.org',
2877 }
2878 })
2879 self.assertEqual(build, {
2880 u'bucket': u'master.tryserver.chromium',
2881 u'client_operation_id': u'uuid4',
2882 u'tags': [u'builder:win',
2883 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002884 u'user_agent:git_cl_try',
2885 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002886 })
2887
2888 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2889
2890 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2891 self.assertEqual(0, git_cl.main([
2892 'try', '-m', 'tryserver.chromium', '-b', 'win',
2893 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2894 self.assertRegexpMatches(
2895 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002896 'Tried jobs on:\nBucket: master.tryserver.chromium')
2897
tandrii8c5a3532016-11-04 07:52:02 -07002898 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2899 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2900 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2901
tandrii8c5a3532016-11-04 07:52:02 -07002902 self.calls = [
2903 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2904 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2905 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2906 ((['git', 'config', 'branch.feature.gerritserver'],),
2907 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002908 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002909 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002910 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002911 'status': 'OPEN',
2912 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002913 'revisions': {
2914 'deadbeaf': {
2915 '_number': 6,
2916 },
2917 'beeeeeef': {
2918 '_number': 7,
2919 'fetch': {'http': {
2920 'url': 'https://chromium.googlesource.com/depot_tools',
2921 'ref': 'refs/changes/56/123456/7'
2922 }},
2923 },
2924 },
2925 }),
2926 ]
2927
2928 def _buildbucket_retry(*_, **kw):
2929 # self.maxDiff = 10000
2930 body = json.loads(kw['body'])
2931 self.assertEqual(len(body['builds']), 1)
2932 build = body['builds'][0]
2933 params = json.loads(build.pop('parameters_json'))
2934 self.assertEqual(params, {
2935 u'builder_name': u'win',
2936 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2937 u'revision': None}],
2938 u'properties': {
2939 u'category': u'git_cl_try',
2940 u'key': u'val',
2941 u'json': [{u'a': 1}, None],
2942 u'master': u'tryserver.chromium',
2943
2944 u'patch_gerrit_url':
2945 u'https://chromium-review.googlesource.com',
2946 u'patch_issue': 123456,
2947 u'patch_project': u'depot_tools',
2948 u'patch_ref': u'refs/changes/56/123456/7',
2949 u'patch_repository_url':
2950 u'https://chromium.googlesource.com/depot_tools',
2951 u'patch_set': 7,
2952 u'patch_storage': u'gerrit',
2953 }
2954 })
2955 self.assertEqual(build, {
2956 u'bucket': u'master.tryserver.chromium',
2957 u'client_operation_id': u'uuid4',
2958 u'tags': [
2959 u'builder:win',
2960 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2961 u'user_agent:git_cl_try',
2962 u'master:tryserver.chromium'],
2963 })
2964
2965 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2966
2967 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2968 self.assertEqual(0, git_cl.main([
2969 'try', '-m', 'tryserver.chromium', '-b', 'win',
2970 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2971 self.assertRegexpMatches(
2972 git_cl.sys.stdout.getvalue(),
2973 'Tried jobs on:\nBucket: master.tryserver.chromium')
2974
borenet6c0efe62016-10-19 08:13:29 -07002975 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002976 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2977 lambda _: {
2978 'owner_email': 'owner@e.mail',
2979 'private': False,
2980 'closed': False,
2981 'project': 'depot_tools',
2982 'patchsets': [20001],
2983 })
borenet6c0efe62016-10-19 08:13:29 -07002984 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2985 self.calls = [
2986 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2987 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2988 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2989 ((['git', 'config', 'rietveld.server'],),
2990 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002991 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002992 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002993 ]
2994
2995 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002996 body = json.loads(kw['body'])
2997 self.assertEqual(len(body['builds']), 1)
2998 build = body['builds'][0]
2999 params = json.loads(build.pop('parameters_json'))
3000 self.assertEqual(params, {
3001 u'builder_name': u'win',
3002 u'changes': [{u'author': {u'email': u'owner@e.mail'},
3003 u'revision': None}],
3004 u'properties': {
3005 u'category': u'git_cl_try',
3006 u'issue': 123,
3007 u'patch_project': u'depot_tools',
3008 u'patch_storage': u'rietveld',
3009 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07003010 u'rietveld': u'https://codereview.chromium.org',
3011 }
3012 })
3013 self.assertEqual(build, {
3014 u'bucket': u'test.bucket',
3015 u'client_operation_id': u'uuid4',
3016 u'tags': [u'builder:win',
3017 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
3018 u'user_agent:git_cl_try'],
3019 })
3020
3021 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3022
3023 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3024 self.assertEqual(0, git_cl.main([
3025 'try', '-B', 'test.bucket', '-b', 'win']))
3026 self.assertRegexpMatches(
3027 git_cl.sys.stdout.getvalue(),
3028 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07003029
qyearsley123a4682016-10-26 09:12:17 -07003030 def test_git_cl_try_bots_on_multiple_masters(self):
3031 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
3032 self.calls = [
3033 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3034 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3035 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3036 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07003037 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07003038 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
3039 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3040 ]
3041
3042 def _buildbucket_retry(*_, **kw):
3043 body = json.loads(kw['body'])
3044 self.assertEqual(len(body['builds']), 2)
3045
3046 first_build_params = json.loads(body['builds'][0]['parameters_json'])
3047 self.assertEqual(first_build_params['builder_name'], 'builder1')
3048 self.assertEqual(first_build_params['properties']['master'], 'master1')
3049
3050 first_build_params = json.loads(body['builds'][1]['parameters_json'])
3051 self.assertEqual(first_build_params['builder_name'], 'builder2')
3052 self.assertEqual(first_build_params['properties']['master'], 'master2')
3053
3054 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3055
3056 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
3057 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3058
3059 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3060 self.assertEqual(
3061 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3062 self.assertEqual(
3063 git_cl.sys.stdout.getvalue(),
3064 'Tried jobs on:\n'
3065 'Bucket: master.master1\n'
3066 ' builder1: []\n'
3067 'Bucket: master.master2\n'
3068 ' builder2: []\n'
3069 'To see results here, run: git cl try-results\n'
3070 'To see results in browser, run: git cl web\n')
3071
tandrii16e0b4e2016-06-07 10:34:28 -07003072 def _common_GerritCommitMsgHookCheck(self):
3073 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3074 self.mock(git_cl.os.path, 'abspath',
3075 lambda path: self._mocked_call(['abspath', path]))
3076 self.mock(git_cl.os.path, 'exists',
3077 lambda path: self._mocked_call(['exists', path]))
3078 self.mock(git_cl.gclient_utils, 'FileRead',
3079 lambda path: self._mocked_call(['FileRead', path]))
3080 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3081 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3082 self.calls = [
3083 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3084 ((['abspath', '../'],), '/abs/git_repo_root'),
3085 ]
3086 return git_cl.Changelist(codereview='gerrit', issue=123)
3087
3088 def test_GerritCommitMsgHookCheck_custom_hook(self):
3089 cl = self._common_GerritCommitMsgHookCheck()
3090 self.calls += [
3091 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3092 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3093 '#!/bin/sh\necho "custom hook"')
3094 ]
3095 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3096
3097 def test_GerritCommitMsgHookCheck_not_exists(self):
3098 cl = self._common_GerritCommitMsgHookCheck()
3099 self.calls += [
3100 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3101 ]
3102 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3103
3104 def test_GerritCommitMsgHookCheck(self):
3105 cl = self._common_GerritCommitMsgHookCheck()
3106 self.calls += [
3107 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3108 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3109 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003110 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003111 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3112 ''),
3113 ]
3114 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3115
tandriic4344b52016-08-29 06:04:54 -07003116 def test_GerritCmdLand(self):
3117 self.calls += [
3118 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3119 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3120 'deadbeaf'),
3121 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3122 ((['git', 'config', 'branch.feature.gerritserver'],),
3123 'chromium-review.googlesource.com'),
3124 ]
3125 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3126 cl._codereview_impl._GetChangeDetail = lambda _: {
3127 'labels': {},
3128 'current_revision': 'deadbeaf',
3129 }
agable32978d92016-11-01 12:55:02 -07003130 cl._codereview_impl._GetChangeCommit = lambda: {
3131 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003132 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003133 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3134 }
tandriic4344b52016-08-29 06:04:54 -07003135 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003136 out = StringIO.StringIO()
3137 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003138 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003139 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003140 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003141
tandrii221ab252016-10-06 08:12:04 -07003142 BUILDBUCKET_BUILDS_MAP = {
3143 '9000': {
3144 'id': '9000',
3145 'status': 'STARTED',
3146 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3147 'result_details_json': '{"properties": {}}',
3148 'bucket': 'master.x.y',
3149 'created_by': 'user:someone@chromium.org',
3150 'created_ts': '147200002222000',
3151 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3152 },
3153 '8000': {
3154 'id': '8000',
3155 'status': 'COMPLETED',
3156 'result': 'FAILURE',
3157 'failure_reason': 'BUILD_FAILURE',
3158 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3159 'result_details_json': '{"properties": {}}',
3160 'bucket': 'master.x.y',
3161 'created_by': 'user:someone@chromium.org',
3162 'created_ts': '147200001111000',
3163 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3164 },
3165 }
3166
3167 def test_write_try_results_json(self):
3168 expected_output = [
3169 {
3170 'buildbucket_id': '8000',
3171 'bucket': 'master.x.y',
3172 'builder_name': 'my-builder',
3173 'status': 'COMPLETED',
3174 'result': 'FAILURE',
3175 'failure_reason': 'BUILD_FAILURE',
3176 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3177 },
3178 {
3179 'buildbucket_id': '9000',
3180 'bucket': 'master.x.y',
3181 'builder_name': 'my-builder',
3182 'status': 'STARTED',
3183 'result': None,
3184 'failure_reason': None,
3185 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3186 }
3187 ]
3188 self.calls = [(('write_json', 'output.json', expected_output), '')]
3189 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3190
tandrii45b2a582016-10-11 03:14:16 -07003191 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003192 out = StringIO.StringIO()
3193 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003194 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3195 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003196 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3197 self._mocked_call(['get_authenticator_for_host', host]))
3198 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3199 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003200
3201 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3202 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003203 self.calls += [
3204 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3205 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3206 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3207 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3208 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3209 ((['git', 'config', 'branch.feature.rietveldserver'],),
3210 'codereview.example.com'),
3211 ((['get_authenticator_for_host', 'codereview.example.com'],),
3212 AuthenticatorMock()),
3213 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3214
3215 def test_fetch_try_jobs_none_rietveld(self):
3216 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003217 # Simulate that user isn't logged in.
3218 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003219 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003220 self.assertRegexpMatches(sys.stdout.getvalue(),
3221 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003222 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3223
3224 def test_fetch_try_jobs_some_rietveld(self):
3225 self._setup_fetch_try_jobs_rietveld({
3226 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3227 })
3228 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003229 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3230 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3231 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3232
3233 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3234 self._setup_fetch_try_jobs(most_recent_patchset=13)
3235 self.calls += [
3236 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3237 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3238 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003239 # TODO(tandrii): Uncomment the below if we decide to support checking
3240 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003241 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003242 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003243 ((['git', 'config', 'branch.feature.gerritserver'],),
3244 'https://x-review.googlesource.com'),
3245 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3246 AuthenticatorMock()),
3247 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3248
3249 def test_fetch_try_jobs_none_gerrit(self):
3250 self._setup_fetch_try_jobs_gerrit({})
3251 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003252 # TODO(tandrii): Uncomment the below if we decide to support checking
3253 # patchsets for Gerrit.
3254 # self.assertRegexpMatches(
3255 # sys.stdout.getvalue(),
3256 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003257 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3258
3259 def test_fetch_try_jobs_some_gerrit(self):
3260 self._setup_fetch_try_jobs_gerrit({
3261 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3262 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003263 # TODO(tandrii): Uncomment the below if we decide to support checking
3264 # patchsets for Gerrit.
3265 # self.calls.remove(
3266 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003267 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3268
3269 # ... and doesn't result in warning.
3270 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3271 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003272 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3273 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3274
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003275 def _mock_gerrit_changes_for_detail_cache(self):
3276 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003277
3278 def test_gerrit_change_detail_cache_normalize(self):
3279 self._mock_gerrit_changes_for_detail_cache()
3280 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003281 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003282 ]
3283 cl = git_cl.Changelist(codereview='gerrit')
3284 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3285 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3286 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3287 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3288
3289 def test_gerrit_change_detail_cache_simple(self):
3290 self._mock_gerrit_changes_for_detail_cache()
3291 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003292 (('GetChangeDetail', 'host', '1', []), 'a'),
3293 (('GetChangeDetail', 'host', '2', []), 'b'),
3294 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003295 ]
3296 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3297 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3298 self.assertEqual(cl._GetChangeDetail(), 'a')
3299 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003300 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003301 self.assertEqual(cl._GetChangeDetail(), 'a')
3302 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3303
3304 def test_gerrit_change_detail_cache_options(self):
3305 self._mock_gerrit_changes_for_detail_cache()
3306 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003307 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3308 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3309 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3310 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003311 ]
3312 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3313 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3314 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3315 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3316 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3317 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3318 self.assertEqual(cl._GetChangeDetail(), 'cab')
3319
3320 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3321 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3322 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3323 self.assertEqual(cl._GetChangeDetail(), 'cab')
3324
3325 # Finally, no_cache should invalidate all caches for given change.
3326 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3327 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3328
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003329 def test_gerrit_description_caching(self):
3330 def gen_detail(rev, desc):
3331 return {
3332 'current_revision': rev,
3333 'revisions': {rev: {'commit': {'message': desc}}}
3334 }
3335 self.calls = [
3336 (('GetChangeDetail', 'host', '1',
3337 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3338 gen_detail('rev1', 'desc1')),
3339 (('GetChangeDetail', 'host', '1',
3340 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3341 gen_detail('rev2', 'desc2')),
3342 ]
3343
3344 self._mock_gerrit_changes_for_detail_cache()
3345 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3346 self.assertEqual(cl.GetDescription(), 'desc1')
3347 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3348 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003349
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003350 def test_print_current_creds(self):
3351 class CookiesAuthenticatorMock(object):
3352 def __init__(self):
3353 self.gitcookies = {
3354 'host.googlesource.com': ('user', 'pass'),
3355 'host-review.googlesource.com': ('user', 'pass'),
3356 }
3357 self.netrc = self
3358 self.netrc.hosts = {
3359 'github.com': ('user2', None, 'pass2'),
3360 'host2.googlesource.com': ('user3', None, 'pass'),
3361 }
3362 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3363 CookiesAuthenticatorMock)
3364 self.mock(sys, 'stdout', StringIO.StringIO())
3365 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3366 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3367 ' Host\t User\t Which file',
3368 '============================\t=====\t===========',
3369 'host-review.googlesource.com\t user\t.gitcookies',
3370 ' host.googlesource.com\t user\t.gitcookies',
3371 ' host2.googlesource.com\tuser3\t .netrc',
3372 ])
3373 sys.stdout.buf = ''
3374 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3375 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3376 ' Host\tUser\t Which file',
3377 '============================\t====\t===========',
3378 'host-review.googlesource.com\tuser\t.gitcookies',
3379 ' host.googlesource.com\tuser\t.gitcookies',
3380 ])
3381
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003382 def _common_creds_check_mocks(self):
3383 def exists_mock(path):
3384 dirname = os.path.dirname(path)
3385 if dirname == os.path.expanduser('~'):
3386 dirname = '~'
3387 base = os.path.basename(path)
3388 if base in ('.netrc', '.gitcookies'):
3389 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3390 # git cl also checks for existence other files not relevant to this test.
3391 return None
3392 self.mock(os.path, 'exists', exists_mock)
3393 self.mock(sys, 'stdout', StringIO.StringIO())
3394
3395 def test_creds_check_gitcookies_not_configured(self):
3396 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003397 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003398 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003399 self.calls = [
3400 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3401 (('os.path.exists', '~/.netrc'), True),
3402 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3403 'or Ctrl+C to abort'), ''),
3404 ((['git', 'config', '--global', 'http.cookiefile',
3405 os.path.expanduser('~/.gitcookies')], ), ''),
3406 ]
3407 self.assertEqual(0, git_cl.main(['creds-check']))
3408 self.assertRegexpMatches(
3409 sys.stdout.getvalue(),
3410 '^You seem to be using outdated .netrc for git credentials:')
3411 self.assertRegexpMatches(
3412 sys.stdout.getvalue(),
3413 '\nConfigured git to use .gitcookies from')
3414
3415 def test_creds_check_gitcookies_configured_custom_broken(self):
3416 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003417 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003418 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003419 self.calls = [
3420 ((['git', 'config', '--global', 'http.cookiefile'],),
3421 '/custom/.gitcookies'),
3422 (('os.path.exists', '/custom/.gitcookies'), False),
3423 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3424 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3425 ((['git', 'config', '--global', 'http.cookiefile',
3426 os.path.expanduser('~/.gitcookies')], ), ''),
3427 ]
3428 self.assertEqual(0, git_cl.main(['creds-check']))
3429 self.assertRegexpMatches(
3430 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003431 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003432 self.assertRegexpMatches(
3433 sys.stdout.getvalue(),
3434 'However, your configured .gitcookies file is missing.')
3435
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003436 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003437 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003438 lambda _, message, publish: self._mocked_call(
3439 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003440 self.calls = [
3441 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3442 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003443 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003444 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003445 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3446 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003447
3448 def test_git_cl_comment_add_gerrit(self):
3449 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003450 lambda host, change, msg, ready:
3451 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003452 self.calls = [
3453 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3454 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3455 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3456 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3457 'origin/master'),
3458 ((['git', 'config', 'remote.origin.url'],),
3459 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003460 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3461 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003462 ]
3463 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3464 '-a', 'msg']))
3465
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003466 def test_git_cl_comments_fetch_rietveld(self):
3467 self.mock(sys, 'stdout', StringIO.StringIO())
3468 self.calls = [
3469 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3470 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3471 ] * 2
3472 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3473 'messages': [
3474 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3475 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3476 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3477 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3478 # Intentionally wrong order here.
3479 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3480 'disapproval': False, 'approval': False,
3481 'sender': 'owner@example.com'},
3482 ],
3483 'owner_email': 'owner@example.com',
3484 })
3485 expected_comments_summary = [
3486 git_cl._CommentSummary(
3487 message='lgtm',
3488 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3489 disapproval=False, approval=True, sender='r@example.com'),
3490 git_cl._CommentSummary(
3491 message='not lgtm',
3492 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3493 disapproval=True, approval=False, sender='r2@example.com'),
3494 # Note: same order as in whatever Rietveld returns.
3495 git_cl._CommentSummary(
3496 message='PTAL',
3497 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3498 disapproval=False, approval=False, sender='owner@example.com'),
3499 ]
3500 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3501 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3502
3503 with git_cl.gclient_utils.temporary_directory() as tempdir:
3504 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3505 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3506 '-j', out_file]))
3507 with open(out_file) as f:
3508 read = json.load(f)
3509 self.assertEqual(len(read), 3)
3510 self.assertEqual(read[0], {
3511 'date': '2000-03-13 20:49:34.515270',
3512 'message': 'PTAL',
3513 'approval': False,
3514 'disapproval': False,
3515 'sender': 'owner@example.com'})
3516 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3517 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3518
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003519 def test_git_cl_comments_fetch_gerrit(self):
3520 self.mock(sys, 'stdout', StringIO.StringIO())
3521 self.calls = [
3522 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3523 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3524 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3525 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3526 'origin/master'),
3527 ((['git', 'config', 'remote.origin.url'],),
3528 'https://chromium.googlesource.com/infra/infra'),
3529 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3530 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003531 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003532 'messages': [
3533 {
3534 u'_revision_number': 1,
3535 u'author': {
3536 u'_account_id': 1111084,
3537 u'email': u'commit-bot@chromium.org',
3538 u'name': u'Commit Bot'
3539 },
3540 u'date': u'2017-03-15 20:08:45.000000000',
3541 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003542 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003543 u'tag': u'autogenerated:cq:dry-run'
3544 },
3545 {
3546 u'_revision_number': 2,
3547 u'author': {
3548 u'_account_id': 11151243,
3549 u'email': u'owner@example.com',
3550 u'name': u'owner'
3551 },
3552 u'date': u'2017-03-16 20:00:41.000000000',
3553 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3554 u'message': u'PTAL',
3555 },
3556 {
3557 u'_revision_number': 2,
3558 u'author': {
3559 u'_account_id': 148512 ,
3560 u'email': u'reviewer@example.com',
3561 u'name': u'reviewer'
3562 },
3563 u'date': u'2017-03-17 05:19:37.500000000',
3564 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3565 u'message': u'Patch Set 2: Code-Review+1',
3566 },
3567 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003568 }),
3569 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3570 '/COMMIT_MSG': [
3571 {
3572 'author': {'email': u'reviewer@example.com'},
3573 'updated': u'2017-03-17 05:19:37.500000000',
3574 'patch_set': 2,
3575 'side': 'REVISION',
3576 'message': 'Please include a bug link',
3577 },
3578 ],
3579 'codereview.settings': [
3580 {
3581 'author': {'email': u'owner@example.com'},
3582 'updated': u'2017-03-16 20:00:41.000000000',
3583 'patch_set': 2,
3584 'side': 'PARENT',
3585 'line': 42,
3586 'message': 'I removed this because it is bad',
3587 },
3588 ]
3589 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003590 ] * 2
3591 expected_comments_summary = [
3592 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003593 message=(
3594 u'PTAL\n' +
3595 u'\n' +
3596 u'codereview.settings\n' +
3597 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3598 u'c/1/2/codereview.settings#b42\n' +
3599 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003600 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3601 disapproval=False, approval=False, sender=u'owner@example.com'),
3602 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003603 message=(
3604 u'Patch Set 2: Code-Review+1\n' +
3605 u'\n' +
3606 u'/COMMIT_MSG\n' +
3607 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3608 u'c/1/2//COMMIT_MSG#\n' +
3609 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003610 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3611 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3612 ]
3613 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3614 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3615
3616 with git_cl.gclient_utils.temporary_directory() as tempdir:
3617 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3618 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3619 '-j', out_file]))
3620 with open(out_file) as f:
3621 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003622 self.assertEqual(len(read), 2)
3623 self.assertEqual(read[0], {
3624 u'date': u'2017-03-16 20:00:41.000000',
3625 u'message': (
3626 u'PTAL\n' +
3627 u'\n' +
3628 u'codereview.settings\n' +
3629 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3630 u'c/1/2/codereview.settings#b42\n' +
3631 u' I removed this because it is bad\n'),
3632 u'approval': False,
3633 u'disapproval': False,
3634 u'sender': u'owner@example.com'})
3635 self.assertEqual(read[1], {
3636 u'date': u'2017-03-17 05:19:37.500000',
3637 u'message': (
3638 u'Patch Set 2: Code-Review+1\n' +
3639 u'\n' +
3640 u'/COMMIT_MSG\n' +
3641 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3642 u'c/1/2//COMMIT_MSG#\n' +
3643 u' Please include a bug link\n'),
3644 u'approval': False,
3645 u'disapproval': False,
3646 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003647
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003648
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003649if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003650 logging.basicConfig(
3651 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003652 unittest.main()