blob: 91dffcab2e8e325a4582badc38acf6d76ca69833 [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
15import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000016import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017
18sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
19
20from testing_support.auto_stub import TestCase
21
22import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000023import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000024import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026
tandrii5d48c322016-08-18 16:19:37 -070027def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
28 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
29
30
31CERR1 = callError(1)
32
33
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000034class ChangelistMock(object):
35 # A class variable so we can access it when we don't have access to the
36 # instance that's being set.
37 desc = ""
38 def __init__(self, **kwargs):
39 pass
40 def GetIssue(self):
41 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080042 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070044 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000045 ChangelistMock.desc = desc
46
tandrii5d48c322016-08-18 16:19:37 -070047
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000048class PresubmitMock(object):
49 def __init__(self, *args, **kwargs):
50 self.reviewers = []
51 @staticmethod
52 def should_continue():
53 return True
54
55
56class RietveldMock(object):
57 def __init__(self, *args, **kwargs):
58 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000059
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000060 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080061 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000062 return 'Issue: %d' % issue
63
maruel@chromium.org78936cb2013-04-11 00:17:52 +000064 @staticmethod
65 def get_issue_properties(_issue, _messages):
66 return {
67 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
68 'messages': [
69 {
70 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070071 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000072 'sender': 'john@chromium.org',
73 },
74 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010075 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000076 }
77
iannuccie53c9352016-08-17 14:40:40 -070078 @staticmethod
79 def close_issue(_issue):
80 return 'Closed'
81
skobes6468b902016-10-24 08:45:10 -070082 @staticmethod
83 def get_patch(issue, patchset):
84 return 'patch set from issue %s patchset %s' % (issue, patchset)
85
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010086 @staticmethod
87 def update_description(_issue, _description):
88 return 'Updated'
89
90 @staticmethod
91 def add_comment(_issue, _comment):
92 return 'Commented'
93
94
95
skobes6468b902016-10-24 08:45:10 -070096
97class GitCheckoutMock(object):
98 def __init__(self, *args, **kwargs):
99 pass
100
101 @staticmethod
102 def reset():
103 GitCheckoutMock.conflict = False
104
105 def apply_patch(self, p):
106 if GitCheckoutMock.conflict:
107 raise Exception('failed')
108
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000109
110class WatchlistsMock(object):
111 def __init__(self, _):
112 pass
113 @staticmethod
114 def GetWatchersForPaths(_):
115 return ['joe@example.com']
116
117
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000118class CodereviewSettingsFileMock(object):
119 def __init__(self):
120 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800121 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000122 def read(self):
123 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000124 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000125
126
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000127class AuthenticatorMock(object):
128 def __init__(self, *_args):
129 pass
130 def has_cached_credentials(self):
131 return True
tandrii221ab252016-10-06 08:12:04 -0700132 def authorize(self, http):
133 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000134
135
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100136def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000137 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
138
139 Usage:
140 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100141 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000142
143 OR
144 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100145 CookiesAuthenticatorMockFactory(
146 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 """
148 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800149 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000150 # Intentionally not calling super() because it reads actual cookie files.
151 pass
152 @classmethod
153 def get_gitcookies_path(cls):
154 return '~/.gitcookies'
155 @classmethod
156 def get_netrc_path(cls):
157 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100158 def _get_auth_for_host(self, host):
159 if same_auth:
160 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000161 return (hosts_with_creds or {}).get(host)
162 return CookiesAuthenticatorMock
163
kmarshall9249e012016-08-23 12:02:16 -0700164class MockChangelistWithBranchAndIssue():
165 def __init__(self, branch, issue):
166 self.branch = branch
167 self.issue = issue
168 def GetBranch(self):
169 return self.branch
170 def GetIssue(self):
171 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000172
tandriic2405f52016-10-10 08:13:15 -0700173
174class SystemExitMock(Exception):
175 pass
176
177
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000178class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100179 def test_get_description(self):
180 cl = git_cl.Changelist(issue=1, codereview='rietveld',
181 codereview_host='host')
182 cl.description = 'x'
183 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800184 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100185 self.assertEquals(cl.GetDescription(), 'x')
186 self.assertEquals(cl.GetDescription(force=True), 'y')
187 self.assertEquals(cl.GetDescription(), 'y')
188
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700189 def test_description_footers(self):
190 cl = git_cl.Changelist(issue=1, codereview='gerrit',
191 codereview_host='host')
192 cl.description = '\n'.join([
193 'This is some message',
194 '',
195 'It has some lines',
196 'and, also',
197 '',
198 'Some: Really',
199 'Awesome: Footers',
200 ])
201 cl.has_description = True
202 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
203 msg, footers = cl.GetDescriptionFooters()
204 self.assertEquals(
205 msg, ['This is some message', '', 'It has some lines', 'and, also'])
206 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
207
208 msg.append('wut')
209 footers.append(('gnarly-dude', 'beans'))
210 cl.UpdateDescriptionFooters(msg, footers)
211 self.assertEquals(cl.GetDescription().splitlines(), [
212 'This is some message',
213 '',
214 'It has some lines',
215 'and, also',
216 'wut'
217 '',
218 'Some: Really',
219 'Awesome: Footers',
220 'Gnarly-Dude: beans',
221 ])
222
tandriif9aefb72016-07-01 09:06:51 -0700223 def test_get_bug_line_values(self):
224 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
225 self.assertEqual(f('', ''), [])
226 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
227 self.assertEqual(f('v8', '456'), ['v8:456'])
228 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
229 # Not nice, but not worth carying.
230 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
231 ['v8:456', 'chromium:123', 'v8:123'])
232
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100233 def _test_git_number(self, parent_msg, dest_ref, child_msg,
234 parent_hash='parenthash'):
235 desc = git_cl.ChangeDescription(child_msg)
236 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
237 return desc.description
238
239 def assertEqualByLine(self, actual, expected):
240 self.assertEqual(actual.splitlines(), expected.splitlines())
241
242 def test_git_number_bad_parent(self):
243 with self.assertRaises(ValueError):
244 self._test_git_number('Parent', 'refs/heads/master', 'Child')
245
246 def test_git_number_bad_parent_footer(self):
247 with self.assertRaises(AssertionError):
248 self._test_git_number(
249 'Parent\n'
250 '\n'
251 'Cr-Commit-Position: wrong',
252 'refs/heads/master', 'Child')
253
254 def test_git_number_bad_lineage_ignored(self):
255 actual = self._test_git_number(
256 'Parent\n'
257 '\n'
258 'Cr-Commit-Position: refs/heads/master@{#1}\n'
259 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
260 'refs/heads/master', 'Child')
261 self.assertEqualByLine(
262 actual,
263 'Child\n'
264 '\n'
265 'Cr-Commit-Position: refs/heads/master@{#2}\n'
266 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
267
268 def test_git_number_same_branch(self):
269 actual = self._test_git_number(
270 'Parent\n'
271 '\n'
272 'Cr-Commit-Position: refs/heads/master@{#12}',
273 dest_ref='refs/heads/master',
274 child_msg='Child')
275 self.assertEqualByLine(
276 actual,
277 'Child\n'
278 '\n'
279 'Cr-Commit-Position: refs/heads/master@{#13}')
280
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200281 def test_git_number_same_branch_mixed_footers(self):
282 actual = self._test_git_number(
283 'Parent\n'
284 '\n'
285 'Cr-Commit-Position: refs/heads/master@{#12}',
286 dest_ref='refs/heads/master',
287 child_msg='Child\n'
288 '\n'
289 'Broken-by: design\n'
290 'BUG=123')
291 self.assertEqualByLine(
292 actual,
293 'Child\n'
294 '\n'
295 'Broken-by: design\n'
296 'BUG=123\n'
297 'Cr-Commit-Position: refs/heads/master@{#13}')
298
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100299 def test_git_number_same_branch_with_originals(self):
300 actual = self._test_git_number(
301 'Parent\n'
302 '\n'
303 'Cr-Commit-Position: refs/heads/master@{#12}',
304 dest_ref='refs/heads/master',
305 child_msg='Child\n'
306 '\n'
307 'Some users are smart and insert their own footers\n'
308 '\n'
309 'Cr-Whatever: value\n'
310 'Cr-Commit-Position: refs/copy/paste@{#22}')
311 self.assertEqualByLine(
312 actual,
313 'Child\n'
314 '\n'
315 'Some users are smart and insert their own footers\n'
316 '\n'
317 'Cr-Original-Whatever: value\n'
318 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
319 'Cr-Commit-Position: refs/heads/master@{#13}')
320
321 def test_git_number_new_branch(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/branch',
327 child_msg='Child')
328 self.assertEqualByLine(
329 actual,
330 'Child\n'
331 '\n'
332 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
333 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
334
335 def test_git_number_lineage(self):
336 actual = self._test_git_number(
337 'Parent\n'
338 '\n'
339 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
340 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
341 dest_ref='refs/heads/branch',
342 child_msg='Child')
343 self.assertEqualByLine(
344 actual,
345 'Child\n'
346 '\n'
347 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
348 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
349
350 def test_git_number_moooooooore_lineage(self):
351 actual = self._test_git_number(
352 'Parent\n'
353 '\n'
354 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
355 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
356 dest_ref='refs/heads/mooore',
357 child_msg='Child')
358 self.assertEqualByLine(
359 actual,
360 'Child\n'
361 '\n'
362 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
363 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
364 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
365
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100366 def test_git_number_ever_moooooooore_lineage(self):
367 self.maxDiff = 10000
368 actual = self._test_git_number(
369 'CQ commit on fresh new branch + numbering.\n'
370 '\n'
371 'NOTRY=True\n'
372 'NOPRESUBMIT=True\n'
373 'BUG=\n'
374 '\n'
375 'Review-Url: https://codereview.chromium.org/2577703003\n'
376 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
377 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
378 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
379 dest_ref='refs/heads/gnumb-test/cl',
380 child_msg='git cl on fresh new branch + numbering.\n'
381 '\n'
382 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
383 self.assertEqualByLine(
384 actual,
385 'git cl on fresh new branch + numbering.\n'
386 '\n'
387 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
388 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
389 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
390 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
391 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100392
393 def test_git_number_cherry_pick(self):
394 actual = self._test_git_number(
395 'Parent\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
398 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
399 dest_ref='refs/heads/branch',
400 child_msg='Child, which is cherry-pick from master\n'
401 '\n'
402 'Cr-Commit-Position: refs/heads/master@{#100}\n'
403 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
404 self.assertEqualByLine(
405 actual,
406 'Child, which is cherry-pick from master\n'
407 '\n'
408 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
409 '\n'
410 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
411 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
412 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
413
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000414
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200415class TestParseIssueURL(unittest.TestCase):
416 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
417 codereview=None, fail=False):
418 self.assertIsNotNone(parsed)
419 if fail:
420 self.assertFalse(parsed.valid)
421 return
422 self.assertTrue(parsed.valid)
423 self.assertEqual(parsed.issue, issue)
424 self.assertEqual(parsed.patchset, patchset)
425 self.assertEqual(parsed.hostname, hostname)
426 self.assertEqual(parsed.codereview, codereview)
427
428 def _run_and_validate(self, func, url, *args, **kwargs):
429 result = func(urlparse.urlparse(url))
430 if kwargs.pop('fail', False):
431 self.assertIsNone(result)
432 return None
433 self._validate(result, *args, fail=False, **kwargs)
434
435 def test_rietveld(self):
436 def test(url, *args, **kwargs):
437 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
438 *args, codereview='rietveld', **kwargs)
439
440 test('http://codereview.chromium.org/123',
441 123, None, 'codereview.chromium.org')
442 test('https://codereview.chromium.org/123',
443 123, None, 'codereview.chromium.org')
444 test('https://codereview.chromium.org/123/',
445 123, None, 'codereview.chromium.org')
446 test('https://codereview.chromium.org/123/whatever',
447 123, None, 'codereview.chromium.org')
448 test('https://codereview.chromium.org/123/#ps20001',
449 123, 20001, 'codereview.chromium.org')
450 test('http://codereview.chromium.org/download/issue123_4.diff',
451 123, 4, 'codereview.chromium.org')
452 # This looks like bad Gerrit, but is actually valid Rietveld, too.
453 test('https://chrome-review.source.com/123/4/',
454 123, None, 'chrome-review.source.com')
455
456 test('https://codereview.chromium.org/deadbeaf', fail=True)
457 test('https://codereview.chromium.org/api/123', fail=True)
458 test('bad://codereview.chromium.org/123', fail=True)
459 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
460
461 def test_gerrit(self):
462 def test(url, issue=None, patchset=None, hostname=None, fail=None):
463 self._test_ParseIssueUrl(
464 git_cl._GerritChangelistImpl.ParseIssueURL,
465 url, issue, patchset, hostname, fail)
466 def test(url, *args, **kwargs):
467 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
468 *args, codereview='gerrit', **kwargs)
469
470 test('http://chrome-review.source.com/c/123',
471 123, None, 'chrome-review.source.com')
472 test('https://chrome-review.source.com/c/123/',
473 123, None, 'chrome-review.source.com')
474 test('https://chrome-review.source.com/c/123/4',
475 123, 4, 'chrome-review.source.com')
476 test('https://chrome-review.source.com/#/c/123/4',
477 123, 4, 'chrome-review.source.com')
478 test('https://chrome-review.source.com/c/123/4',
479 123, 4, 'chrome-review.source.com')
480 test('https://chrome-review.source.com/123',
481 123, None, 'chrome-review.source.com')
482 test('https://chrome-review.source.com/123/4',
483 123, 4, 'chrome-review.source.com')
484
485 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
486 test('https://chrome-review.source.com/c/abc/', fail=True)
487 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
488
489 def test_ParseIssueNumberArgument(self):
490 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200491 codereview_hint = kwargs.pop('hint', None)
492 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
493 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200494
495 test('123', 123)
496 test('', fail=True)
497 test('abc', fail=True)
498 test('123/1', fail=True)
499 test('123a', fail=True)
500 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
501 # Rietveld.
502 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200503 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200504 test('https://codereview.source.com/123',
505 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200506 # Matches both, but we take Gerrit if specifically requested.
507 test('https://codereview.source.com/123',
508 123, None, 'codereview.source.com', 'gerrit',
509 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200510 # Gerrrit.
511 test('https://chrome-review.source.com/c/123/4',
512 123, 4, 'chrome-review.source.com', 'gerrit')
513 test('https://chrome-review.source.com/bad/123/4', fail=True)
514
515
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100516class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100517 def setUp(self):
518 super(GitCookiesCheckerTest, self).setUp()
519 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100520 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100521
522 def mock_hosts_creds(self, subhost_identity_pairs):
523 def ensure_googlesource(h):
524 if not h.endswith(self.c._GOOGLESOURCE):
525 assert not h.endswith('.')
526 return h + '.' + self.c._GOOGLESOURCE
527 return h
528 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
529 for h, i in subhost_identity_pairs]
530
531 def test_analysis_nothing(self):
532 self.c._all_hosts = []
533 self.assertFalse(self.c.has_generic_host())
534 self.assertEqual(set(), self.c.get_conflicting_hosts())
535 self.assertEqual(set(), self.c.get_duplicated_hosts())
536 self.assertEqual(set(), self.c.get_partially_configured_hosts())
537 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
538
539 def test_analysis(self):
540 self.mock_hosts_creds([
541 ('.googlesource.com', 'git-example.chromium.org'),
542
543 ('chromium', 'git-example.google.com'),
544 ('chromium-review', 'git-example.google.com'),
545 ('chrome-internal', 'git-example.chromium.org'),
546 ('chrome-internal-review', 'git-example.chromium.org'),
547 ('conflict', 'git-example.google.com'),
548 ('conflict-review', 'git-example.chromium.org'),
549 ('dup', 'git-example.google.com'),
550 ('dup', 'git-example.google.com'),
551 ('dup-review', 'git-example.google.com'),
552 ('partial', 'git-example.google.com'),
553 ])
554 self.assertTrue(self.c.has_generic_host())
555 self.assertEqual(set(['conflict.googlesource.com']),
556 self.c.get_conflicting_hosts())
557 self.assertEqual(set(['dup.googlesource.com']),
558 self.c.get_duplicated_hosts())
559 self.assertEqual(set(['partial.googlesource.com']),
560 self.c.get_partially_configured_hosts())
561 self.assertEqual(set(['chromium.googlesource.com',
562 'chrome-internal.googlesource.com']),
563 self.c.get_hosts_with_wrong_identities())
564
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100565 def test_report_no_problems(self):
566 self.test_analysis_nothing()
567 self.mock(sys, 'stdout', StringIO.StringIO())
568 self.assertFalse(self.c.find_and_report_problems())
569 self.assertEqual(sys.stdout.getvalue(), '')
570
571 def test_report(self):
572 self.test_analysis()
573 self.mock(sys, 'stdout', StringIO.StringIO())
574 self.assertTrue(self.c.find_and_report_problems())
575 with open(os.path.join(os.path.dirname(__file__),
576 'git_cl_creds_check_report.txt')) as f:
577 expected = f.read()
578 def by_line(text):
579 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200580 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100581
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000582class TestGitCl(TestCase):
583 def setUp(self):
584 super(TestGitCl, self).setUp()
585 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700586 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000587 self.mock(subprocess2, 'call', self._mocked_call)
588 self.mock(subprocess2, 'check_call', self._mocked_call)
589 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700590 self.mock(subprocess2, 'communicate',
591 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000592 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000593 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000594 self.mock(git_common, 'get_or_create_merge_base',
595 lambda *a: (
596 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000597 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000598 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100599 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
600 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700601 self.mock(git_cl, 'write_json', lambda path, contents:
602 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000603 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000604 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000605 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700606 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
607 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000608 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000609 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000610 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100611 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
612 lambda *args, **kwargs: self._mocked_call(
613 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700614 self.mock(git_cl.gerrit_util, 'GetChangeComments',
615 lambda *args, **kwargs: self._mocked_call(
616 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100617 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700618 lambda h, i, reviewers, ccs, notify: self._mocked_call(
619 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700620 self.mock(git_cl.gerrit_util, 'SetReview',
621 lambda h, i, labels, notify: self._mocked_call(
622 'SetReview', h, i, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000623 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
624 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700625 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100626 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000627 # It's important to reset settings to not have inter-tests interference.
628 git_cl.settings = None
629
630 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000631 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100632 self.assertEquals([], self.calls)
633 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000634 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100635 raise
636 # Sadly, has_failed() returns True if this OR any other tests before this
637 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200638 git_cl.logging.error(
639 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100640 'There are un-consumed self.calls after this test has finished.\n'
641 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700642 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200643 'If you are already running only this test, then **first** fix the '
644 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100645 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700646 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100647 'and follow instructions above.\n' +
648 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000649 finally:
650 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000652 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000653 self.assertTrue(
654 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700655 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000656 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000657 expected_args, result = top
658
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000659 # Also logs otherwise it could get caught in a try/finally and be hard to
660 # diagnose.
661 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700662 N = 5
663 prior_calls = '\n '.join(
664 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
665 for i, c in enumerate(self._calls_done[-N:]))
666 following_calls = '\n '.join(
667 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
668 for i, c in enumerate(self.calls[:N]))
669 extended_msg = (
670 'A few prior calls:\n %s\n\n'
671 'This (expected):\n @%d: %r\n'
672 'This (actual):\n @%d: %r\n\n'
673 'A few following expected calls:\n %s' %
674 (prior_calls, len(self._calls_done), expected_args,
675 len(self._calls_done), args, following_calls))
676 git_cl.logging.error(extended_msg)
677
tandrii99a72f22016-08-17 14:33:24 -0700678 self.fail('@%d\n'
679 ' Expected: %r\n'
680 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700681 len(self._calls_done), expected_args, args))
682
683 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700684 if isinstance(result, Exception):
685 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000686 return result
687
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100688 def test_ask_for_explicit_yes_true(self):
689 self.calls = [
690 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
691 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
692 ]
693 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
694
695 def test_ask_for_explicit_yes_true(self):
696 self.calls = [
697 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
698 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
699 ]
700 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
701
tandrii48df5812016-10-17 03:55:37 -0700702 def test_LoadCodereviewSettingsFromFile_gerrit(self):
703 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
704 self.calls = [
705 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
706 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
707 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
708 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
709 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
710 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700711 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
712 CERR1),
713 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700714 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
715 CERR1),
716 ((['git', 'config', 'gerrit.host', 'true'],), ''),
717 ]
718 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
719
maruel@chromium.orga3353652011-11-30 14:26:57 +0000720 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000721 def _is_gerrit_calls(cls, gerrit=False):
722 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
723 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
724
725 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000726 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200727 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000728 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000729
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000730 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200731 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
732 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
733 ((['git', 'config', 'core.editor'],), ''),
734 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000735
736 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200737 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000738 if similarity is None:
739 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700740 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700741 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000742 else:
tandrii33a46ff2016-08-23 05:53:40 -0700743 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700744 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000745
746 if find_copies is None:
747 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700748 find_copies_call = ((['git', 'config', '--bool',
749 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000750 else:
tandrii5d48c322016-08-18 16:19:37 -0700751 val = str(find_copies).lower()
752 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000753 'branch.master.git-find-copies', val],), '')
754
755 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000756 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800757 '-l100000', '-C'+similarity,
758 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000759 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000760 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000761 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000762
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000763 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000764 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000765 similarity_call,
766 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
767 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000768 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000769 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700770 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
771 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000772 ((['git', 'config', 'rietveld.server'],),
773 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000774 ((['git', 'config', 'branch.master.merge'],), 'master'),
775 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000776 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000777 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000778 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000779 ((['git', 'rev-parse', '--show-cdup'],), ''),
780 ((['git', 'rev-parse', 'HEAD'],), '12345'),
781 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000782 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000783 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700784 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000786 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000787 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000789 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000791 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000792 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700793 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000794 ]
795
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000796 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000797 def _git_upload_calls(cls, private):
798 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000799 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000800 private_call = []
801 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000802 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000803 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000804 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000805
maruel@chromium.orga3353652011-11-30 14:26:57 +0000806 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000807 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000808 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000809 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800810 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000811 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700812 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000813 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000814 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000815 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700816 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000817 ] + cls._git_post_upload_calls()
818
819 @classmethod
820 def _git_post_upload_calls(cls):
821 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
823 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
824 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000825 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000826 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000827 ]
828
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000829 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000830 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000831 fake_ancestor = 'fake_ancestor'
832 fake_cl = 'fake_cl_for_patch'
833 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000834 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000835 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000836 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000837 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000838 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000839 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000840 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000841 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700842 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000843 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000844 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000846 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000847 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000848 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000849 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000850 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000851 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000852 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000853 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000854
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000855 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700856 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000857 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000858 return [
859 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000860 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000861 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000862 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700863 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000864 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000865 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100866 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000867 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000868 ]
869
870 def _run_reviewer_test(
871 self,
872 upload_args,
873 expected_description,
874 returned_description,
875 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000876 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700877 private=False,
878 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000879 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000880 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000881 try:
882 similarity = upload_args[upload_args.index('--similarity')+1]
883 except ValueError:
884 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000885
886 if '--find-copies' in upload_args:
887 find_copies = True
888 elif '--no-find-copies' in upload_args:
889 find_copies = False
890 else:
891 find_copies = None
892
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000893 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700894 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000895
896 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000897
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000898 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000899 self.assertEquals(
900 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000901 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000902 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000903 '#--------------------This line is 72 characters long'
904 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000905 expected_description,
906 desc)
907 return returned_description
908 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000909
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000910 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000911 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700912 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000913 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000914 return 1, 2
915 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000916
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000917 git_cl.main(['upload'] + upload_args)
918
919 def test_no_reviewer(self):
920 self._run_reviewer_test(
921 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000922 'desc\n\nBUG=',
923 '# Blah blah comment.\ndesc\n\nBUG=',
924 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000925 [])
926
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000927 def test_keep_similarity(self):
928 self._run_reviewer_test(
929 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000930 'desc\n\nBUG=',
931 '# Blah blah comment.\ndesc\n\nBUG=',
932 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000933 [])
934
iannucci@chromium.org79540052012-10-19 23:15:26 +0000935 def test_keep_find_copies(self):
936 self._run_reviewer_test(
937 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000938 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000939 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000940 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000941 [])
942
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000943 def test_private(self):
944 self._run_reviewer_test(
945 ['--private'],
946 'desc\n\nBUG=',
947 '# Blah blah comment.\ndesc\n\nBUG=\n',
948 'desc\n\nBUG=',
949 [])
950
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000951 def test_reviewers_cmd_line(self):
952 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000953 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000954 self._run_reviewer_test(
955 ['-r' 'foo@example.com'],
956 description,
957 '\n%s\n' % description,
958 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000959 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000960
961 def test_reviewer_tbr_overriden(self):
962 # Reviewer is overriden with TBR
963 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000964 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000965 self._run_reviewer_test(
966 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000967 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000968 description.strip('\n'),
969 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000970 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000971
972 def test_reviewer_multiple(self):
973 # Handles multiple R= or TBR= lines.
974 description = (
bradnelsond975b302016-10-23 12:20:23 -0700975 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
976 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000977 self._run_reviewer_test(
978 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000979 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000980 description,
981 description,
bradnelsond975b302016-10-23 12:20:23 -0700982 ['--reviewers=another@example.com,reviewer@example.com'],
983 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000984
maruel@chromium.orga3353652011-11-30 14:26:57 +0000985 def test_reviewer_send_mail(self):
986 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000987 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000988 self._run_reviewer_test(
989 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000990 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000991 description.strip('\n'),
992 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000993 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000994
995 def test_reviewer_send_mail_no_rev(self):
996 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000997 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200998 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -0700999 ((['DieWithError', 'Must specify reviewers to send email.'],),
1000 SystemExitMock())
1001 ]
1002
1003 def RunEditor(desc, _, **kwargs):
1004 return desc
1005 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1006 self.mock(sys, 'stdout', stdout)
1007 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001008 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001009 self.assertEqual(
1010 '=====================================\n'
1011 'NOTICE: Rietveld is being deprecated. '
1012 'You can upload changes to Gerrit with\n'
1013 ' git cl upload --gerrit\n'
1014 'or set Gerrit to be your default code review tool with\n'
1015 ' git config gerrit.host true\n'
1016 '=====================================\n',
1017 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001018
tandriif9aefb72016-07-01 09:06:51 -07001019 def test_bug_on_cmd(self):
1020 self._run_reviewer_test(
1021 ['--bug=500658,proj:123'],
1022 'desc\n\nBUG=500658\nBUG=proj:123',
1023 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1024 'desc\n\nBUG=500658\nBUG=proj:1234',
1025 [])
1026
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001027 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1028 parent_msg=None,
1029 new_msg=None,
1030 fail_after_parent_msg=False,
1031 fail_cherry_pick=False,
1032 fail_push_count=0,
1033 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001034 if debug:
1035 # Very useful due to finally clause in git cl land raising exceptions and
1036 # shadowing real cause of failure.
1037 self.mock(git_cl, '_IS_BEING_TESTED', True)
1038 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001039 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001040
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001041 if git_numberer_enabled:
1042 # Special mocks to check validity of timestamp.
1043 original_git_amend_head = git_cl._git_amend_head
1044 def _git_amend_head_mock(msg, tstamp):
1045 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1046 return original_git_amend_head(msg, tstamp)
1047 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1048
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001049 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1050 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001051 self.mock(RietveldMock, 'update_description', staticmethod(
1052 lambda i, d: self._mocked_call(['update_description', i, d])))
1053 self.mock(RietveldMock, 'add_comment', staticmethod(
1054 lambda i, c: self._mocked_call(['add_comment', i, c])))
1055 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001056 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1057 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1058 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1059 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1060 CERR1),
1061 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1062 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001063 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001064 ((['git', 'config', 'rietveld.server'],),
1065 'https://codereview.chromium.org'),
1066 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1067 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1068 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1069 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001070 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1071 ''), # No commits to rebase, according to local view of origin.
1072 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1073 'fake_ancestor_sha'),
1074 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1075 ((['git', 'rev-parse', '--show-cdup'],), ''),
1076 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1077 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1078 'fake_ancestor_sha...', '.'],),
1079 'M\tfile1.cpp'),
1080 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1081 ((['git', 'config', 'branch.feature.rietveldserver'],),
1082 'https://codereview.chromium.org'),
1083 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1084 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1085 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1086 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001087 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001088 # file1.cpp | 53 ++++++--
1089 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1090 ''),
1091 ((['git', 'show-ref', '--quiet', '--verify',
1092 'refs/heads/git-cl-commit'],),
1093 ''), # 0 return code means branch exists.
1094 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1095 ((['git', 'show-ref', '--quiet', '--verify',
1096 'refs/heads/git-cl-cherry-pick'],),
1097 CERR1), # This means git-cl-cherry-pick branch does not exist.
1098 ((['git', 'rev-parse', '--show-cdup'],), ''),
1099 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1100 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1101 ((['git', 'commit', '-m',
1102 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001103 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001104 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1105 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1106 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001107 repo_url),
1108
1109 ((['git', 'config', 'remote.origin.url'],), repo_url),
1110 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1111 git_numberer_enabled),
1112
1113 # Auto-rebase init.
1114 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1115 ]
1116 # Auto-rebase loops.
1117 for attempt in xrange(fail_push_count + 1):
1118 self.calls += [
1119 # Auto-rebase loop start.
1120 ((['git', 'retry', 'fetch', 'origin',
1121 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1122 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1123 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1124 # different in each loop iteration for truly realistic test.
1125 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1126 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1127 callError(1, 'failed to cherry pick') if fail_cherry_pick
1128 else ''),
1129 ]
1130 if fail_cherry_pick:
1131 return
1132
1133 if git_numberer_enabled:
1134 assert parent_msg
1135 self.calls += [
1136 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1137 parent_msg),
1138 ]
1139 if fail_after_parent_msg:
1140 return
1141 assert new_msg
1142 self.calls += [
1143 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1144 '1480022355'), # Committer's unix timestamp.
1145 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1146 '1480024000'),
1147 ((['git_amend_head committer timestamp', 1480024000],), ''),
1148 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1149 ]
1150 self.calls += [
1151 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1152 CERR1 if attempt < fail_push_count else ''),
1153 ]
1154 # End of autorebase + push.
1155
1156 self.calls += [
1157 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1158 ]
1159 if git_numberer_enabled:
1160 self.calls += [
1161 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1162 ]
1163
1164 # Cleanup calls.
1165 self.calls += [
1166 ((['git', 'checkout', '-q', 'feature'],), ''),
1167 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1168 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001169 ]
1170
1171 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001172 self._land_rietveld_calls(
1173 repo_url='https://chromium.googlesource.com/infra/infra',
1174 git_numberer_enabled=False,
1175 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001176 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001177 ((['git', 'config', 'rietveld.viewvc-url'],),
1178 'https://chromium.googlesource.com/infra/infra/+/'),
1179 ((['update_description', 123,
1180 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001181 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001182 ''),
1183 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001184 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001185 ]
1186 git_cl.main(['land'])
1187
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001188 def test_land_rietveld_fail_cherry_pick(self):
1189 self._land_rietveld_calls(
1190 repo_url='https://chromium.googlesource.com/infra/infra',
1191 git_numberer_enabled=False,
1192 fail_cherry_pick=True,
1193 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001194 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001195 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1196 'U path/file1\n'
1197 'U file2.cpp\n'),
1198 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001199 ((['git', 'checkout', '-q', 'feature'],), ''),
1200 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001201 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1202 ]
1203 git_cl.main(['land'])
1204
1205 def test_land_rietveld_git_numberer_fail_1_push(self):
1206 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1207
1208 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1209 self._land_rietveld_calls(
1210 repo_url='https://chromium.googlesource.com/chromium/src',
1211 git_numberer_enabled=True,
1212 parent_msg=('This is parent commit.\n'
1213 '\n'
1214 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1215 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1216 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1217 '\n'
1218 'Review-Url: https://codereview.chromium.org/123 .\n'
1219 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1220 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1221 fail_push_count=fail_push_count,
1222 debug=False)
1223
1224 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001225 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001226 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001227 ((['update_description', 123,
1228 'Issue: 123\n\nR=john@chromium.org\n'
1229 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001230 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001231 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1232 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1233 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001234 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001235 ''),
1236 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001237 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001238 ]
1239 git_cl.main(['land'])
1240
1241 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001242 self._land_rietveld_calls(
1243 repo_url='https://chromium.googlesource.com/v8/v8',
1244 git_numberer_enabled=True,
1245 parent_msg='This is parent commit with no footer.',
1246 fail_after_parent_msg=True,
1247 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001248 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001249 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001250 ((['git', 'checkout', '-q', 'feature'],), ''),
1251 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001252 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001253 ]
1254 with self.assertRaises(ValueError) as cm:
1255 git_cl.main(['land'])
1256 self.assertEqual(cm.exception.message,
1257 'Unable to infer commit position from footers')
1258
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001259 def test_git_numberer_not_whitelisted_repo(self):
1260 self.calls = []
1261 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001262 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1263 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001264 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001265
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001266 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001267 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1268 self.calls = [
1269 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001270 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001271 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001272 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001273 remote_url='https://chromium.googlesource.com/chromium/src',
1274 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001275 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001276
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001277 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001278 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001279 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001280 def fake_temporary_directory(**kwargs):
1281 yield tempdir
1282 self.mock(git_cl.gclient_utils, 'temporary_directory',
1283 fake_temporary_directory)
1284 self._test_GitNumbererState_valid_configs_inner(tempdir)
1285
1286 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001287 self.calls = [
1288 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001289 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001290 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1291 '''
1292 [plugin "git-numberer"]
1293 validate-enabled-refglob = refs/else/*
1294 validate-enabled-refglob = refs/heads/*
1295 validate-disabled-refglob = refs/heads/disabled
1296 validate-disabled-refglob = refs/branch-heads/*
1297 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001298 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1299 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001300 'refs/else/*\n'
1301 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001302 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1303 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001304 'refs/heads/disabled\n'
1305 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001306 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001307
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001308 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001309 remote_url='https://chromium.googlesource.com/chromium/src',
1310 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001311 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001312
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001313 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001314 remote_url='https://chromium.googlesource.com/chromium/src',
1315 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001316 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001317
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001318 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001319 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001320 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001321 remote_url='https://chromium.googlesource.com/chromium/src',
1322 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001323 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001324
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001325 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001326 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001327 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001328 if skip_auth_check:
1329 return [((cmd, ), 'true')]
1330
tandrii5d48c322016-08-18 16:19:37 -07001331 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001332 if issue:
1333 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001334 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001335 ])
1336 calls.extend([
1337 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1338 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1339 ((['git', 'config', 'remote.origin.url'],),
1340 'https://chromium.googlesource.com/my/repo'),
1341 ((['git', 'config', 'remote.origin.url'],),
1342 'https://chromium.googlesource.com/my/repo'),
1343 ])
1344 return calls
1345
1346 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001347 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001348 fetched_status=None, other_cl_owner=None,
1349 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001350 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001351 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1352 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1353 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1354 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001355 ]
1356 calls += cls._is_gerrit_calls(True)
1357 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001358 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1359 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1360 ((['git', 'config', 'branch.master.gerritissue'],),
1361 CERR1 if issue is None else str(issue)),
1362 ]
1363
1364 if custom_cl_base:
1365 ancestor_revision = custom_cl_base
1366 else:
1367 # Determine ancestor_revision to be merge base.
1368 ancestor_revision = 'fake_ancestor_sha'
1369 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001370 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001371 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001372 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001373 'refs/remotes/origin/master'],), ancestor_revision),
1374 ]
1375
1376 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001377 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1378
1379 if issue:
1380 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001381 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001382 '123456',
1383 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001384 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001385 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001386 'change_id': '123456789',
1387 'current_revision': 'sha1_of_current_revision',
1388 'revisions': { 'sha1_of_current_revision': {
1389 'commit': {'message': fetched_description},
1390 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001391 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001392 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001393 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001394 if fetched_status == 'ABANDONED':
1395 calls += [
1396 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1397 '123456 has been abandoned, new uploads are not '
1398 'allowed'), SystemExitMock()),
1399 ]
1400 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001401 if other_cl_owner:
1402 calls += [
1403 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1404 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001405
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001406 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1407 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001408 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001409 ((['git', 'rev-parse', '--show-cdup'],), ''),
1410 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001411
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001412 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1413 ancestor_revision + '...', '.'],),
1414 'M\t.gitignore\n'),
1415 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001416 ]
1417
1418 if not issue:
1419 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001420 ((['git', 'log', '--pretty=format:%s%n%n%b',
1421 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001422 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001423 ]
1424
1425 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001426 ((['git', 'config', 'user.email'],), 'me@example.com'),
1427 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1428 ([custom_cl_base] if custom_cl_base else
1429 [ancestor_revision, 'HEAD']),),
1430 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001431 ]
1432 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001433
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001434 @classmethod
1435 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001436 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001437 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001438 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001439 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001440 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001441 if post_amend_description is None:
1442 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001443 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001444 # Determined in `_gerrit_base_calls`.
1445 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1446
1447 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001448
tandriia60502f2016-06-20 02:01:53 -07001449 if squash_mode == 'default':
1450 calls.extend([
1451 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1452 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1453 ])
1454 elif squash_mode in ('override_squash', 'override_nosquash'):
1455 calls.extend([
1456 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1457 'true' if squash_mode == 'override_squash' else 'false'),
1458 ])
1459 else:
1460 assert squash_mode in ('squash', 'nosquash')
1461
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001462 # If issue is given, then description is fetched from Gerrit instead.
1463 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001464 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001465 ((['git', 'log', '--pretty=format:%s\n\n%b',
1466 ((custom_cl_base + '..') if custom_cl_base else
1467 'fake_ancestor_sha..HEAD')],),
1468 description),
1469 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001470 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001471 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001472 else:
1473 if not title:
1474 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001475 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1476 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001477 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001478 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001479 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001480 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001481 (('DownloadGerritHook', False), ''),
1482 # Amending of commit message to get the Change-Id.
1483 ((['git', 'log', '--pretty=format:%s\n\n%b',
1484 determined_ancestor_revision + '..HEAD'],),
1485 description),
1486 ((['git', 'commit', '--amend', '-m', description],), ''),
1487 ((['git', 'log', '--pretty=format:%s\n\n%b',
1488 determined_ancestor_revision + '..HEAD'],),
1489 post_amend_description)
1490 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001491 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001492 if not issue:
1493 # Prompting to edit description on first upload.
1494 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001495 ((['git', 'config', 'core.editor'],), ''),
1496 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001497 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001498 ref_to_push = 'abcdef0123456789'
1499 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001500 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1501 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1502 ]
1503
1504 if custom_cl_base is None:
1505 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001506 ((['get_or_create_merge_base', 'master',
1507 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001508 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001509 ]
1510 parent = 'origin/master'
1511 else:
1512 calls += [
1513 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1514 'refs/remotes/origin/master'],),
1515 callError(1)), # Means not ancenstor.
1516 (('ask_for_data',
1517 'Do you take responsibility for cleaning up potential mess '
1518 'resulting from proceeding with upload? Press Enter to upload, '
1519 'or Ctrl+C to abort'), ''),
1520 ]
1521 parent = custom_cl_base
1522
1523 calls += [
1524 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1525 '0123456789abcdef'),
1526 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1527 '-m', description],),
1528 ref_to_push),
1529 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001530 else:
1531 ref_to_push = 'HEAD'
1532
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001533 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001534 ((['git', 'rev-list',
1535 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1536 ref_to_push],),
1537 '1hashPerLine\n'),
1538 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001539
Aaron Gableafd52772017-06-27 16:40:10 -07001540 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001541 ref_suffix = '%ready,notify=ALL'
1542 else:
1543 if not issue:
1544 ref_suffix = '%wip'
1545 else:
1546 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001547
Aaron Gable70f4e242017-06-26 10:45:59 -07001548 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001549 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001550
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001551 if git_mirror is None:
1552 calls += [
1553 ((['git', 'config', 'remote.origin.url'],),
1554 'https://chromium.googlesource.com/yyy/zzz'),
1555 ]
1556 else:
1557 calls += [
1558 ((['git', 'config', 'remote.origin.url'],),
1559 '/cache/this-dir-exists'),
1560 (('os.path.isdir', '/cache/this-dir-exists'),
1561 True),
1562 # Runs in /cache/this-dir-exists.
1563 ((['git', 'config', 'remote.origin.url'],),
1564 'https://chromium.googlesource.com/yyy/zzz'),
1565 ]
1566
ukai@chromium.orge8077812012-02-03 03:41:46 +00001567 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001568 ((['git', 'push',
1569 'https://chromium.googlesource.com/yyy/zzz',
1570 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001571 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001572 'remote: Processing changes: (\)\n'
1573 'remote: Processing changes: (|)\n'
1574 'remote: Processing changes: (/)\n'
1575 'remote: Processing changes: (-)\n'
1576 'remote: Processing changes: new: 1 (/)\n'
1577 'remote: Processing changes: new: 1, done\n'
1578 'remote:\n'
1579 'remote: New Changes:\n'
1580 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1581 'remote:\n'
1582 'To https://chromium.googlesource.com/yyy/zzz\n'
1583 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001584 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001585 if squash:
1586 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001587 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001588 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001589 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001590 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001591 ((['git', 'config', 'branch.master.gerritsquashhash',
1592 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001593 ]
tandrii88189772016-09-29 04:29:57 -07001594 calls += [
1595 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001596 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001597 123456 if squash else None, sorted(reviewers),
1598 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001599 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001600 if tbr:
1601 calls += [
1602 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gable75e78722017-06-09 10:40:16 -07001603 123456 if squash else None, {'Code-Review': 1}, notify), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001604 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001605 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001606 return calls
1607
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001608 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001609 self,
1610 upload_args,
1611 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001612 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001613 squash=True,
1614 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001615 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001616 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001617 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001618 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001619 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001620 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001621 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001622 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001623 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001624 custom_cl_base=None,
1625 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001626 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001627 if squash_mode is None:
1628 if '--no-squash' in upload_args:
1629 squash_mode = 'nosquash'
1630 elif '--squash' in upload_args:
1631 squash_mode = 'squash'
1632 else:
1633 squash_mode = 'default'
1634
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001635 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001636 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001637 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001638 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001639 CookiesAuthenticatorMockFactory(
1640 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001641 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1642 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001643 self.mock(git_cl.gclient_utils, 'RunEditor',
1644 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001645 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1646 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001647
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001648 original_os_path_isdir = os.path.isdir
1649 def selective_os_path_isdir_mock(path):
1650 if path == '/cache/this-dir-exists':
1651 return self._mocked_call('os.path.isdir', path)
1652 return original_os_path_isdir(path)
1653 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1654
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001655 self.calls = self._gerrit_base_calls(
1656 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001657 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001658 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001659 other_cl_owner=other_cl_owner,
1660 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001661 if fetched_status != 'ABANDONED':
1662 self.calls += self._gerrit_upload_calls(
1663 description, reviewers, squash,
1664 squash_mode=squash_mode,
1665 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001666 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001667 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001668 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001669 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001670 # Uncomment when debugging.
1671 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001672 git_cl.main(['upload'] + upload_args)
1673
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001674 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001675 self._run_gerrit_upload_test(
1676 ['--no-squash'],
1677 'desc\n\nBUG=\n',
1678 [],
1679 squash=False,
1680 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1681
1682 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001683 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001684 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001685 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001686 [],
tandriia60502f2016-06-20 02:01:53 -07001687 squash=False,
1688 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001689 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001690
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001691 def test_gerrit_no_reviewer(self):
1692 self._run_gerrit_upload_test(
1693 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001694 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001695 [],
1696 squash=False,
1697 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001698
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001699 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001700 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1701 self._run_gerrit_upload_test(
1702 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1703 'desc\n\nBUG=\n\nChange-Id: I123456789',
1704 squash=False,
1705 squash_mode='override_nosquash',
1706 title='Dont_put_bad_chars')
1707 self.assertIn(
1708 'WARNING: Patchset title may only contain alphanumeric chars '
1709 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1710 'Cleaned up title: Dont put bad chars\n',
1711 git_cl.sys.stdout.getvalue())
1712
ukai@chromium.orge8077812012-02-03 03:41:46 +00001713 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001714 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001715 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001716 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001717 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001718 squash=False,
1719 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001720 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001721
1722 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001723 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001724 [],
bradnelsond975b302016-10-23 12:20:23 -07001725 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1726 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001727 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001728 ['reviewer@example.com', 'another@example.com'],
1729 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001730 squash_mode='override_nosquash',
Aaron Gablefd238082017-06-07 13:42:34 -07001731 cc=['more@example.com', 'people@example.com'],
1732 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001733
1734 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001735 self._run_gerrit_upload_test(
1736 [],
1737 'desc\nBUG=\n\nChange-Id: 123456789',
1738 [],
1739 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001740
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001741 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001742 self._run_gerrit_upload_test(
1743 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001744 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001745 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001746 squash=True,
1747 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001748
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001749 def test_gerrit_upload_squash_first_against_rev(self):
1750 custom_cl_base = 'custom_cl_base_rev_or_branch'
1751 self._run_gerrit_upload_test(
1752 ['--squash', custom_cl_base],
1753 'desc\nBUG=\n\nChange-Id: 123456789',
1754 [],
1755 squash=True,
1756 expected_upstream_ref='origin/master',
1757 custom_cl_base=custom_cl_base)
1758 self.assertIn(
1759 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1760 sys.stdout.getvalue())
1761
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001762 def test_gerrit_upload_squash_first_with_mirror(self):
1763 self._run_gerrit_upload_test(
1764 ['--squash'],
1765 'desc\nBUG=\n\nChange-Id: 123456789',
1766 [],
1767 squash=True,
1768 expected_upstream_ref='origin/master',
1769 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1770
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001771 def test_gerrit_upload_squash_reupload(self):
1772 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001773 self._run_gerrit_upload_test(
1774 ['--squash'],
1775 description,
1776 [],
1777 squash=True,
1778 expected_upstream_ref='origin/master',
1779 issue=123456)
1780
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001781 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1782 self.mock(git_cl, 'DieWithError',
1783 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1784 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1785 with self.assertRaises(SystemExitMock):
1786 self._run_gerrit_upload_test(
1787 ['--squash'],
1788 description,
1789 [],
1790 squash=True,
1791 expected_upstream_ref='origin/master',
1792 issue=123456,
1793 fetched_status='ABANDONED')
1794
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001795 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1796 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1797 lambda *_, **__: {'email': 'yet-another@example.com'})
1798 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1799 self._run_gerrit_upload_test(
1800 ['--squash'],
1801 description,
1802 [],
1803 squash=True,
1804 expected_upstream_ref='origin/master',
1805 issue=123456,
1806 other_cl_owner='other@example.com')
1807 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001808 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001809 'authenticate to Gerrit as yet-another@example.com.\n'
1810 'Uploading may fail due to lack of permissions',
1811 git_cl.sys.stdout.getvalue())
1812
rmistry@google.com2dd99862015-06-22 12:22:18 +00001813 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001814 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001815 def mock_run_git(*args, **_kwargs):
1816 if args[0] == ['for-each-ref',
1817 '--format=%(refname:short) %(upstream:short)',
1818 'refs/heads']:
1819 # Create a local branch dependency tree that looks like this:
1820 # test1 -> test2 -> test3 -> test4 -> test5
1821 # -> test3.1
1822 # test6 -> test0
1823 branch_deps = [
1824 'test2 test1', # test1 -> test2
1825 'test3 test2', # test2 -> test3
1826 'test3.1 test2', # test2 -> test3.1
1827 'test4 test3', # test3 -> test4
1828 'test5 test4', # test4 -> test5
1829 'test6 test0', # test0 -> test6
1830 'test7', # test7
1831 ]
1832 return '\n'.join(branch_deps)
1833 self.mock(git_cl, 'RunGit', mock_run_git)
1834
1835 class RecordCalls:
1836 times_called = 0
1837 record_calls = RecordCalls()
1838 def mock_CMDupload(*args, **_kwargs):
1839 record_calls.times_called += 1
1840 return 0
1841 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1842
1843 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001844 (('ask_for_data', 'This command will checkout all dependent branches '
1845 'and run "git cl upload". Press Enter to continue, '
1846 'or Ctrl+C to abort'), ''),
1847 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001848
1849 class MockChangelist():
1850 def __init__(self):
1851 pass
1852 def GetBranch(self):
1853 return 'test1'
1854 def GetIssue(self):
1855 return '123'
1856 def GetPatchset(self):
1857 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001858 def IsGerrit(self):
1859 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001860
1861 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1862 # CMDupload should have been called 5 times because of 5 dependent branches.
1863 self.assertEquals(5, record_calls.times_called)
1864 self.assertEquals(0, ret)
1865
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001866 def test_gerrit_change_id(self):
1867 self.calls = [
1868 ((['git', 'write-tree'], ),
1869 'hashtree'),
1870 ((['git', 'rev-parse', 'HEAD~0'], ),
1871 'branch-parent'),
1872 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1873 'A B <a@b.org> 1456848326 +0100'),
1874 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1875 'C D <c@d.org> 1456858326 +0100'),
1876 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1877 'hashchange'),
1878 ]
1879 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1880 self.assertEqual(change_id, 'Ihashchange')
1881
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001882 def test_desecription_append_footer(self):
1883 for init_desc, footer_line, expected_desc in [
1884 # Use unique desc first lines for easy test failure identification.
1885 ('foo', 'R=one', 'foo\n\nR=one'),
1886 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1887 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1888 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1889 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1890 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1891 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1892 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1893 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1894 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1895 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1896 ]:
1897 desc = git_cl.ChangeDescription(init_desc)
1898 desc.append_footer(footer_line)
1899 self.assertEqual(desc.description, expected_desc)
1900
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001901 def test_update_reviewers(self):
1902 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001903 ('foo', [], [],
1904 'foo'),
1905 ('foo\nR=xx', [], [],
1906 'foo\nR=xx'),
1907 ('foo\nTBR=xx', [], [],
1908 'foo\nTBR=xx'),
1909 ('foo', ['a@c'], [],
1910 'foo\n\nR=a@c'),
1911 ('foo\nR=xx', ['a@c'], [],
1912 'foo\n\nR=a@c, xx'),
1913 ('foo\nTBR=xx', ['a@c'], [],
1914 'foo\n\nR=a@c\nTBR=xx'),
1915 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1916 'foo\n\nR=a@c, yy\nTBR=xx'),
1917 ('foo\nBUG=', ['a@c'], [],
1918 'foo\nBUG=\nR=a@c'),
1919 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1920 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1921 ('foo', ['a@c', 'b@c'], [],
1922 'foo\n\nR=a@c, b@c'),
1923 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1924 'foo\nBar\n\nR=c@c\nBUG='),
1925 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1926 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001927 # Same as the line before, but full of whitespaces.
1928 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001929 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001930 'foo\nBar\n\nR=c@c\n BUG =',
1931 ),
1932 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001933 ('foo BUG=allo R=joe ', ['c@c'], [],
1934 'foo BUG=allo R=joe\n\nR=c@c'),
1935 # Redundant TBRs get promoted to Rs
1936 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1937 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001938 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001939 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001940 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001941 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001942 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001943 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001944 actual.append(obj.description)
1945 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001946
wittman@chromium.org455dc922015-01-26 20:15:50 +00001947 def test_get_target_ref(self):
1948 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001949 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001950 self.assertEqual(None, git_cl.GetTargetRef(None,
1951 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001952 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001953
wittman@chromium.org455dc922015-01-26 20:15:50 +00001954 # Check default target refs for branches.
1955 self.assertEqual('refs/heads/master',
1956 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001957 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001958 self.assertEqual('refs/heads/master',
1959 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001960 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001961 self.assertEqual('refs/heads/master',
1962 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001963 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001964 self.assertEqual('refs/branch-heads/123',
1965 git_cl.GetTargetRef('origin',
1966 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001967 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001968 self.assertEqual('refs/diff/test',
1969 git_cl.GetTargetRef('origin',
1970 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001971 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001972 self.assertEqual('refs/heads/chrome/m42',
1973 git_cl.GetTargetRef('origin',
1974 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001975 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001976
1977 # Check target refs for user-specified target branch.
1978 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1979 'refs/remotes/branch-heads/123'):
1980 self.assertEqual('refs/branch-heads/123',
1981 git_cl.GetTargetRef('origin',
1982 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001983 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001984 for branch in ('origin/master', 'remotes/origin/master',
1985 'refs/remotes/origin/master'):
1986 self.assertEqual('refs/heads/master',
1987 git_cl.GetTargetRef('origin',
1988 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001989 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001990 for branch in ('master', 'heads/master', 'refs/heads/master'):
1991 self.assertEqual('refs/heads/master',
1992 git_cl.GetTargetRef('origin',
1993 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001994 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001995
wychen@chromium.orga872e752015-04-28 23:42:18 +00001996 def test_patch_when_dirty(self):
1997 # Patch when local tree is dirty
1998 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1999 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2000
2001 def test_diff_when_dirty(self):
2002 # Do 'git cl diff' when local tree is dirty
2003 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2004 self.assertNotEqual(git_cl.main(['diff']), 0)
2005
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002006 @staticmethod
2007 def _get_gerrit_codereview_server_calls(branch, value=None,
2008 git_short_host='host',
2009 detect_branch=True):
2010 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2011
2012 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2013 """
2014 calls = []
2015 if detect_branch:
2016 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
2017 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2018 CERR1 if value is None else value))
2019 if value is None:
2020 calls += [
2021 ((['git', 'config', 'branch.' + branch + '.merge'],),
2022 'refs/heads' + branch),
2023 ((['git', 'config', 'branch.' + branch + '.remote'],),
2024 'origin'),
2025 ((['git', 'config', 'remote.origin.url'],),
2026 'https://%s.googlesource.com/my/repo' % git_short_host),
2027 ]
2028 return calls
2029
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002030 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002031 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002032 detect_gerrit_server=True,
2033 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002034 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002035 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2036 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002037 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002038 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002039 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2040
tandriidf09a462016-08-18 16:23:55 -07002041 if new_branch:
2042 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2043 else:
2044 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002045
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002046 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002047 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002048 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002049 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002050 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2051 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2052 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2053 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002054 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002055 if default_codereview == 'gerrit':
2056 if not force_codereview:
2057 self.calls += [
2058 ((['git', 'config', 'gerrit.host'],), 'true'),
2059 ]
2060 if detect_gerrit_server:
2061 self.calls += self._get_gerrit_codereview_server_calls(
2062 'master', git_short_host=git_short_host,
2063 detect_branch=not new_branch and force_codereview)
2064 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002065
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002066 elif default_codereview == 'rietveld':
2067 self.calls += [
2068 ((['git', 'config', 'gerrit.host'],), CERR1),
2069 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2070 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2071 ]
2072 actual_codereview = 'rietveld'
2073
2074 if actual_codereview == 'rietveld':
2075 self.calls += [
2076 ((['git', 'rev-parse', '--show-cdup'],), ''),
2077 ]
2078 if not default_codereview:
2079 self.calls += [
2080 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2081 ]
2082 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002083 self.calls += [
2084 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002085 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002086 {
2087 'current_revision': '7777777777',
2088 'revisions': {
2089 '1111111111': {
2090 '_number': 1,
2091 'fetch': {'http': {
2092 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2093 'ref': 'refs/changes/56/123456/1',
2094 }},
2095 },
2096 '7777777777': {
2097 '_number': 7,
2098 'fetch': {'http': {
2099 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2100 'ref': 'refs/changes/56/123456/7',
2101 }},
2102 },
2103 },
2104 }),
2105 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002106
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002107 def _common_patch_rietveld_successful(self, **kwargs):
2108 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002109 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002110 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002111 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002112 ((['git', 'config', 'branch.master.rietveldserver',
2113 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002114 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002115 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002116 ((['git', 'commit', '-m',
2117 'Description\n\n' +
2118 'patch from issue 123456 at patchset 60001 ' +
2119 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002120 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002121
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002122 def test_patch_rietveld_default(self):
2123 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002124 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2125
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002126 def test_patch_rietveld_successful_new_branch(self):
2127 self._common_patch_rietveld_successful(default_codereview='rietveld',
2128 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002129 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2130
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002131 def test_patch_rietveld_guess_by_url(self):
2132 self._common_patch_rietveld_successful(
2133 default_codereview=None, # It doesn't matter.
2134 actual_codereview='rietveld')
2135 self.assertEqual(git_cl.main(
2136 ['patch', 'https://codereview.example.com/123456']), 0)
2137
2138 def test_patch_rietveld_conflict(self):
2139 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002140 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002141 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002142
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002143 def test_patch_gerrit_default(self):
2144 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002145 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002146 self.calls += [
2147 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2148 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002149 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002150 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002151 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152 ((['git', 'config', 'branch.master.gerritserver',
2153 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002154 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002155 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2156 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2157 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 ]
2159 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2160
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002161 def test_patch_gerrit_force(self):
2162 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002163 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002164 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002165 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002166 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002167 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002168 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002169 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002170 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002171 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002172 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002173 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2174 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2175 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002176 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002177 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002178
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002179 def test_patch_gerrit_guess_by_url(self):
2180 self._patch_common(
2181 default_codereview=None, # It doesn't matter what's default.
2182 actual_codereview='gerrit',
2183 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002184 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002185 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002186 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002187 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002188 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002189 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002190 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002191 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002192 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002193 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002194 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2195 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2196 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 ]
2198 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002199 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002200
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002201 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2202 self._patch_common(
2203 default_codereview=None, # It doesn't matter what's default.
2204 actual_codereview='gerrit',
2205 git_short_host='else', detect_gerrit_server=False)
2206 self.calls += [
2207 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2208 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002209 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002210 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2211 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2212 ''),
2213 ((['git', 'config', 'branch.master.gerritserver',
2214 'https://else-review.googlesource.com'],), ''),
2215 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002216 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2217 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2218 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002219 ]
2220 self.assertEqual(git_cl.main(
2221 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2222
2223 def test_patch_gerrit_conflict(self):
2224 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002225 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002226 self.calls += [
2227 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002228 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002229 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2230 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2231 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002232 ]
2233 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002234 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002235
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002236 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002237 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002238 raise git_cl.gerrit_util.GerritError(404, '')
2239 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2240
tandriic2405f52016-10-10 08:13:15 -07002241 self.calls = [
2242 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2243 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2244 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2245 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2246 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2247 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002248 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2249 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2250 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2251 ((['git', 'config', 'remote.origin.url'],),
2252 'https://chromium.googlesource.com/my/repo'),
2253 ((['DieWithError',
2254 'change 123456 at https://chromium-review.googlesource.com does not '
2255 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002256 ]
2257 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002258 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002259
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002260 def _checkout_calls(self):
2261 return [
2262 ((['git', 'config', '--local', '--get-regexp',
2263 'branch\\..*\\.rietveldissue'], ),
2264 ('branch.retrying.rietveldissue 1111111111\n'
2265 'branch.some-fix.rietveldissue 2222222222\n')),
2266 ((['git', 'config', '--local', '--get-regexp',
2267 'branch\\..*\\.gerritissue'], ),
2268 ('branch.ger-branch.gerritissue 123456\n'
2269 'branch.gbranch654.gerritissue 654321\n')),
2270 ]
2271
2272 def test_checkout_gerrit(self):
2273 """Tests git cl checkout <issue>."""
2274 self.calls = self._checkout_calls()
2275 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2276 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2277
2278 def test_checkout_rietveld(self):
2279 """Tests git cl checkout <issue>."""
2280 self.calls = self._checkout_calls()
2281 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2282 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2283
2284 def test_checkout_not_found(self):
2285 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002286 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002287 self.calls = self._checkout_calls()
2288 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2289
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002290 def test_checkout_no_branch_issues(self):
2291 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002292 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002293 self.calls = [
2294 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002295 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002296 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002297 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002298 ]
2299 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2300
tandrii@chromium.org28253532016-04-14 13:46:56 +00002301 def _test_gerrit_ensure_authenticated_common(self, auth,
2302 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002303 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2304 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2305 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002306 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002307 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002308 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002309 cl.branch = 'master'
2310 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002311 cl.lookedup_issue = True
2312 return cl
2313
2314 def test_gerrit_ensure_authenticated_missing(self):
2315 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002316 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002317 })
2318 self.calls.append(
2319 ((['DieWithError',
2320 'Credentials for the following hosts are required:\n'
2321 ' chromium-review.googlesource.com\n'
2322 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002323 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002324 'https://chromium-review.googlesource.com/new-password'],), ''),)
2325 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2326
2327 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002328 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002329 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002330 'chromium.googlesource.com':
2331 ('git-one.example.com', None, 'secret1'),
2332 'chromium-review.googlesource.com':
2333 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002334 })
2335 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002336 (('ask_for_data', 'If you know what you are doing '
2337 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002338 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2339
2340 def test_gerrit_ensure_authenticated_ok(self):
2341 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002342 'chromium.googlesource.com':
2343 ('git-same.example.com', None, 'secret'),
2344 'chromium-review.googlesource.com':
2345 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002346 })
2347 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2348
tandrii@chromium.org28253532016-04-14 13:46:56 +00002349 def test_gerrit_ensure_authenticated_skipped(self):
2350 cl = self._test_gerrit_ensure_authenticated_common(
2351 auth={}, skip_auth_check=True)
2352 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2353
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002354 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002355 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2356 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002357 self.calls = [
2358 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002359 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002360 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2361 ((['git', 'config', 'rietveld.server'],), ''),
2362 ((['git', 'config', 'rietveld.server'],), ''),
2363 ((['git', 'config', 'branch.feature.rietveldserver'],),
2364 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002365 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002366 ]
2367 self.assertEqual(0, git_cl.main(['set-commit']))
2368
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002369 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002370 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002371 lambda h, i, labels, notify=None:
2372 self._mocked_call(['SetReview', h, i, labels, notify]))
2373
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002374 self.calls = [
2375 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002376 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2377 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002378 ((['git', 'config', 'branch.feature.gerritserver'],),
2379 'https://chromium-review.googlesource.com'),
2380 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002381 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002382 ]
tandriid9e5ce52016-07-13 02:32:59 -07002383
2384 def test_cmd_set_commit_gerrit_clear(self):
2385 self._cmd_set_commit_gerrit_common(0)
2386 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2387
2388 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002389 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002390 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2391
tandriid9e5ce52016-07-13 02:32:59 -07002392 def test_cmd_set_commit_gerrit(self):
2393 self._cmd_set_commit_gerrit_common(2)
2394 self.assertEqual(0, git_cl.main(['set-commit']))
2395
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002396 def test_description_display(self):
2397 out = StringIO.StringIO()
2398 self.mock(git_cl.sys, 'stdout', out)
2399
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002400 self.mock(git_cl, 'Changelist', ChangelistMock)
2401 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002402
2403 self.assertEqual(0, git_cl.main(['description', '-d']))
2404 self.assertEqual('foo\n', out.getvalue())
2405
2406 def test_description_rietveld(self):
2407 out = StringIO.StringIO()
2408 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002409 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002410
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002411 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002412 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002413 self.assertEqual('foobar\n', out.getvalue())
2414
iannucci3c972b92016-08-17 13:24:10 -07002415 def test_StatusFieldOverrideIssueMissingArgs(self):
2416 out = StringIO.StringIO()
2417 self.mock(git_cl.sys, 'stderr', out)
2418
2419 try:
2420 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2421 except SystemExit as ex:
2422 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002423 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002424
2425 out = StringIO.StringIO()
2426 self.mock(git_cl.sys, 'stderr', out)
2427
2428 try:
2429 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2430 except SystemExit as ex:
2431 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002432 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002433
2434 def test_StatusFieldOverrideIssue(self):
2435 out = StringIO.StringIO()
2436 self.mock(git_cl.sys, 'stdout', out)
2437
2438 def assertIssue(cl_self, *_args):
2439 self.assertEquals(cl_self.issue, 1)
2440 return 'foobar'
2441
2442 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2443 self.calls = [
2444 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2445 ((['git', 'config', 'rietveld.server'],), ''),
2446 ((['git', 'config', 'rietveld.server'],), ''),
2447 ]
iannuccie53c9352016-08-17 14:40:40 -07002448 self.assertEqual(
2449 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2450 0)
iannucci3c972b92016-08-17 13:24:10 -07002451 self.assertEqual(out.getvalue(), 'foobar\n')
2452
iannuccie53c9352016-08-17 14:40:40 -07002453 def test_SetCloseOverrideIssue(self):
2454 def assertIssue(cl_self, *_args):
2455 self.assertEquals(cl_self.issue, 1)
2456 return 'foobar'
2457
2458 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2459 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2460 self.calls = [
2461 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2462 ((['git', 'config', 'rietveld.server'],), ''),
2463 ((['git', 'config', 'rietveld.server'],), ''),
2464 ]
2465 self.assertEqual(
2466 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2467
2468 def test_SetCommitOverrideIssue(self):
2469 def assertIssue(cl_self, *_args):
2470 self.assertEquals(cl_self.issue, 1)
2471 return 'foobar'
2472
2473 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2474 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2475 self.calls = [
2476 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2477 ((['git', 'config', 'rietveld.server'],), ''),
2478 ((['git', 'config', 'rietveld.server'],), ''),
2479 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2480 ((['git', 'config', 'rietveld.server'],), ''),
2481 ((['git', 'config', 'rietveld.server'],), ''),
2482 ]
2483 self.assertEqual(
2484 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2485
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002486 def test_description_gerrit(self):
2487 out = StringIO.StringIO()
2488 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002489 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002490 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002491 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2492 {
2493 'current_revision': 'sha1',
2494 'revisions': {'sha1': {
2495 'commit': {'message': 'foobar'},
2496 }},
2497 }),
2498 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002499 self.assertEqual(0, git_cl.main([
2500 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2501 self.assertEqual('foobar\n', out.getvalue())
2502
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002503 def test_description_set_raw(self):
2504 out = StringIO.StringIO()
2505 self.mock(git_cl.sys, 'stdout', out)
2506
2507 self.mock(git_cl, 'Changelist', ChangelistMock)
2508 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2509
2510 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2511 self.assertEqual('hihi', ChangelistMock.desc)
2512
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002513 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002514 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002515
2516 def RunEditor(desc, _, **kwargs):
2517 self.assertEquals(
2518 '# Enter a description of the change.\n'
2519 '# This will be displayed on the codereview site.\n'
2520 '# The first line will also be used as the subject of the review.\n'
2521 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002522 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002523 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002524 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002525 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002526 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002527
dsansomee2d6fd92016-09-08 00:10:47 -07002528 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002529 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002530
2531 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2532 self.mock(git_cl.Changelist, 'GetDescription',
2533 lambda *args: current_desc)
2534 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2535 UpdateDescriptionRemote)
2536 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2537
2538 self.calls = [
2539 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002540 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002541 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2542 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002543 ((['git', 'config', 'core.editor'],), 'vi'),
2544 ]
2545 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2546
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002547 def test_description_set_stdin(self):
2548 out = StringIO.StringIO()
2549 self.mock(git_cl.sys, 'stdout', out)
2550
2551 self.mock(git_cl, 'Changelist', ChangelistMock)
2552 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2553
2554 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2555 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2556
kmarshall3bff56b2016-06-06 18:31:47 -07002557 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002558 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2559
kmarshall3bff56b2016-06-06 18:31:47 -07002560 self.calls = \
2561 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2562 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002563 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002564 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2565 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002566 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2567 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2568 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002569 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2570 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2571 ((['git', 'branch', '-D', 'foo'],), '')]
2572
kmarshall3bff56b2016-06-06 18:31:47 -07002573 self.mock(git_cl, 'get_cl_statuses',
2574 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002575 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2576 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2577 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002578
2579 self.assertEqual(0, git_cl.main(['archive', '-f']))
2580
2581 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002582 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002583 self.calls = \
2584 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2585 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002586 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002587 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2588 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002589 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2590
kmarshall9249e012016-08-23 12:02:16 -07002591 self.mock(git_cl, 'get_cl_statuses',
2592 lambda branches, fine_grained, max_processes:
2593 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2594
2595 self.assertEqual(1, git_cl.main(['archive', '-f']))
2596
2597 def test_archive_dry_run(self):
2598 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2599
2600 self.calls = \
2601 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2602 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2603 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2604 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2605 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2606 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2607 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2608 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2609 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002610
2611 self.mock(git_cl, 'get_cl_statuses',
2612 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002613 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2614 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2615 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002616
kmarshall9249e012016-08-23 12:02:16 -07002617 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2618
2619 def test_archive_no_tags(self):
2620 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2621
2622 self.calls = \
2623 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2624 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2625 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2626 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2627 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2628 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2629 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2630 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2631 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2632 ((['git', 'branch', '-D', 'foo'],), '')]
2633
2634 self.mock(git_cl, 'get_cl_statuses',
2635 lambda branches, fine_grained, max_processes:
2636 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2637 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2638 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2639
2640 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002641
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002642 def test_cmd_issue_erase_existing(self):
2643 out = StringIO.StringIO()
2644 self.mock(git_cl.sys, 'stdout', out)
2645 self.calls = [
2646 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002647 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2648 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002649 # Let this command raise exception (retcode=1) - it should be ignored.
2650 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002651 CERR1),
2652 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2653 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002654 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2655 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2656 ''),
2657 ]
2658 self.assertEqual(0, git_cl.main(['issue', '0']))
2659
phajdan.jre328cf92016-08-22 04:12:17 -07002660 def test_cmd_issue_json(self):
2661 out = StringIO.StringIO()
2662 self.mock(git_cl.sys, 'stdout', out)
2663 self.calls = [
2664 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002665 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002666 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2667 ((['git', 'config', 'rietveld.server'],),
2668 'https://codereview.chromium.org'),
2669 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2670 (('write_json', 'output.json',
2671 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2672 ''),
2673 ]
2674 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2675
tandriide281ae2016-10-12 06:02:30 -07002676 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002677 self.mock(git_cl.Changelist, 'GetChange',
2678 lambda _, *a: (
2679 self._mocked_call(['GetChange']+list(a))))
2680 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2681 lambda *_, **__: (
2682 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002683 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2684 lambda _, s: self._mocked_call(['SetCQState', s]))
2685 self.calls = [
2686 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002687 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002688 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2689 ((['git', 'config', 'rietveld.server'],),
2690 'https://codereview.chromium.org'),
2691 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2692 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2693 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2694 ((['get_or_create_merge_base', 'feature', 'feature'],),
2695 'fake_ancestor_sha'),
2696 ((['GetChange', 'fake_ancestor_sha', None], ),
2697 git_cl.presubmit_support.GitChange(
2698 '', '', '', '', '', '', '', '')),
2699 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2700 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002701 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2702 ]
2703 out = StringIO.StringIO()
2704 self.mock(git_cl.sys, 'stdout', out)
2705 self.assertEqual(0, git_cl.main(['try']))
2706 self.assertEqual(
2707 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002708 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002709
tandrii8c5a3532016-11-04 07:52:02 -07002710 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2711 self.mock(git_cl.Changelist, 'GetChange',
2712 lambda _, *a: (
2713 self._mocked_call(['GetChange']+list(a))))
2714 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2715 lambda *_, **__: (
2716 self._mocked_call(['DoGetTryMasters'])))
2717 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2718 lambda _, s: self._mocked_call(['SetCQState', s]))
2719
tandrii8c5a3532016-11-04 07:52:02 -07002720 self.calls = [
2721 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2722 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2723 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2724 ((['git', 'config', 'branch.feature.gerritserver'],),
2725 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002726 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2727 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2728 'project': 'depot_tools',
2729 'status': 'OPEN',
2730 'owner': {'email': 'owner@e.mail'},
2731 'revisions': {
2732 'deadbeaf': {
2733 '_number': 6,
2734 },
2735 'beeeeeef': {
2736 '_number': 7,
2737 'fetch': {'http': {
2738 'url': 'https://chromium.googlesource.com/depot_tools',
2739 'ref': 'refs/changes/56/123456/7'
2740 }},
2741 },
2742 },
2743 }),
tandrii8c5a3532016-11-04 07:52:02 -07002744 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2745 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2746 ((['get_or_create_merge_base', 'feature', 'feature'],),
2747 'fake_ancestor_sha'),
2748 ((['GetChange', 'fake_ancestor_sha', None], ),
2749 git_cl.presubmit_support.GitChange(
2750 '', '', '', '', '', '', '', '')),
2751 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2752 ((['DoGetTryMasters'], ), None),
2753 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2754 ]
2755 out = StringIO.StringIO()
2756 self.mock(git_cl.sys, 'stdout', out)
2757 self.assertEqual(0, git_cl.main(['try']))
2758 self.assertEqual(
2759 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002760 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002761 'https://chromium-review.googlesource.com/123456\n')
2762
2763 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2764 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2765 lambda _: {
2766 'owner_email': 'owner@e.mail',
2767 'private': False,
2768 'closed': False,
2769 'project': 'depot_tools',
2770 'patchsets': [20001],
2771 })
tandriide281ae2016-10-12 06:02:30 -07002772 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2773 self.calls = [
2774 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2775 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2776 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2777 ((['git', 'config', 'rietveld.server'],),
2778 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002779 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002780 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002781 ]
2782
2783 def _buildbucket_retry(*_, **kw):
2784 # self.maxDiff = 10000
2785 body = json.loads(kw['body'])
2786 self.assertEqual(len(body['builds']), 1)
2787 build = body['builds'][0]
2788 params = json.loads(build.pop('parameters_json'))
2789 self.assertEqual(params, {
2790 u'builder_name': u'win',
2791 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2792 u'revision': None}],
2793 u'properties': {
2794 u'category': u'git_cl_try',
2795 u'issue': 123,
2796 u'key': u'val',
2797 u'json': [{u'a': 1}, None],
2798 u'master': u'tryserver.chromium',
2799 u'patch_project': u'depot_tools',
2800 u'patch_storage': u'rietveld',
2801 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002802 u'rietveld': u'https://codereview.chromium.org',
2803 }
2804 })
2805 self.assertEqual(build, {
2806 u'bucket': u'master.tryserver.chromium',
2807 u'client_operation_id': u'uuid4',
2808 u'tags': [u'builder:win',
2809 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002810 u'user_agent:git_cl_try',
2811 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002812 })
2813
2814 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2815
2816 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2817 self.assertEqual(0, git_cl.main([
2818 'try', '-m', 'tryserver.chromium', '-b', 'win',
2819 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2820 self.assertRegexpMatches(
2821 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002822 'Tried jobs on:\nBucket: master.tryserver.chromium')
2823
tandrii8c5a3532016-11-04 07:52:02 -07002824 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2825 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2826 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2827
tandrii8c5a3532016-11-04 07:52:02 -07002828 self.calls = [
2829 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2830 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2831 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2832 ((['git', 'config', 'branch.feature.gerritserver'],),
2833 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002834 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002835 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002836 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002837 'status': 'OPEN',
2838 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002839 'revisions': {
2840 'deadbeaf': {
2841 '_number': 6,
2842 },
2843 'beeeeeef': {
2844 '_number': 7,
2845 'fetch': {'http': {
2846 'url': 'https://chromium.googlesource.com/depot_tools',
2847 'ref': 'refs/changes/56/123456/7'
2848 }},
2849 },
2850 },
2851 }),
2852 ]
2853
2854 def _buildbucket_retry(*_, **kw):
2855 # self.maxDiff = 10000
2856 body = json.loads(kw['body'])
2857 self.assertEqual(len(body['builds']), 1)
2858 build = body['builds'][0]
2859 params = json.loads(build.pop('parameters_json'))
2860 self.assertEqual(params, {
2861 u'builder_name': u'win',
2862 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2863 u'revision': None}],
2864 u'properties': {
2865 u'category': u'git_cl_try',
2866 u'key': u'val',
2867 u'json': [{u'a': 1}, None],
2868 u'master': u'tryserver.chromium',
2869
2870 u'patch_gerrit_url':
2871 u'https://chromium-review.googlesource.com',
2872 u'patch_issue': 123456,
2873 u'patch_project': u'depot_tools',
2874 u'patch_ref': u'refs/changes/56/123456/7',
2875 u'patch_repository_url':
2876 u'https://chromium.googlesource.com/depot_tools',
2877 u'patch_set': 7,
2878 u'patch_storage': u'gerrit',
2879 }
2880 })
2881 self.assertEqual(build, {
2882 u'bucket': u'master.tryserver.chromium',
2883 u'client_operation_id': u'uuid4',
2884 u'tags': [
2885 u'builder:win',
2886 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2887 u'user_agent:git_cl_try',
2888 u'master:tryserver.chromium'],
2889 })
2890
2891 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2892
2893 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2894 self.assertEqual(0, git_cl.main([
2895 'try', '-m', 'tryserver.chromium', '-b', 'win',
2896 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2897 self.assertRegexpMatches(
2898 git_cl.sys.stdout.getvalue(),
2899 'Tried jobs on:\nBucket: master.tryserver.chromium')
2900
borenet6c0efe62016-10-19 08:13:29 -07002901 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002902 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2903 lambda _: {
2904 'owner_email': 'owner@e.mail',
2905 'private': False,
2906 'closed': False,
2907 'project': 'depot_tools',
2908 'patchsets': [20001],
2909 })
borenet6c0efe62016-10-19 08:13:29 -07002910 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2911 self.calls = [
2912 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2913 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2914 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2915 ((['git', 'config', 'rietveld.server'],),
2916 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002917 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002918 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002919 ]
2920
2921 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002922 body = json.loads(kw['body'])
2923 self.assertEqual(len(body['builds']), 1)
2924 build = body['builds'][0]
2925 params = json.loads(build.pop('parameters_json'))
2926 self.assertEqual(params, {
2927 u'builder_name': u'win',
2928 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2929 u'revision': None}],
2930 u'properties': {
2931 u'category': u'git_cl_try',
2932 u'issue': 123,
2933 u'patch_project': u'depot_tools',
2934 u'patch_storage': u'rietveld',
2935 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002936 u'rietveld': u'https://codereview.chromium.org',
2937 }
2938 })
2939 self.assertEqual(build, {
2940 u'bucket': u'test.bucket',
2941 u'client_operation_id': u'uuid4',
2942 u'tags': [u'builder:win',
2943 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2944 u'user_agent:git_cl_try'],
2945 })
2946
2947 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2948
2949 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2950 self.assertEqual(0, git_cl.main([
2951 'try', '-B', 'test.bucket', '-b', 'win']))
2952 self.assertRegexpMatches(
2953 git_cl.sys.stdout.getvalue(),
2954 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002955
qyearsley123a4682016-10-26 09:12:17 -07002956 def test_git_cl_try_bots_on_multiple_masters(self):
2957 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2958 self.calls = [
2959 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2960 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2961 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2962 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002963 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002964 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2965 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2966 ]
2967
2968 def _buildbucket_retry(*_, **kw):
2969 body = json.loads(kw['body'])
2970 self.assertEqual(len(body['builds']), 2)
2971
2972 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2973 self.assertEqual(first_build_params['builder_name'], 'builder1')
2974 self.assertEqual(first_build_params['properties']['master'], 'master1')
2975
2976 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2977 self.assertEqual(first_build_params['builder_name'], 'builder2')
2978 self.assertEqual(first_build_params['properties']['master'], 'master2')
2979
2980 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2981
2982 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2983 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2984
2985 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2986 self.assertEqual(
2987 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2988 self.assertEqual(
2989 git_cl.sys.stdout.getvalue(),
2990 'Tried jobs on:\n'
2991 'Bucket: master.master1\n'
2992 ' builder1: []\n'
2993 'Bucket: master.master2\n'
2994 ' builder2: []\n'
2995 'To see results here, run: git cl try-results\n'
2996 'To see results in browser, run: git cl web\n')
2997
tandrii16e0b4e2016-06-07 10:34:28 -07002998 def _common_GerritCommitMsgHookCheck(self):
2999 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3000 self.mock(git_cl.os.path, 'abspath',
3001 lambda path: self._mocked_call(['abspath', path]))
3002 self.mock(git_cl.os.path, 'exists',
3003 lambda path: self._mocked_call(['exists', path]))
3004 self.mock(git_cl.gclient_utils, 'FileRead',
3005 lambda path: self._mocked_call(['FileRead', path]))
3006 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3007 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3008 self.calls = [
3009 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3010 ((['abspath', '../'],), '/abs/git_repo_root'),
3011 ]
3012 return git_cl.Changelist(codereview='gerrit', issue=123)
3013
3014 def test_GerritCommitMsgHookCheck_custom_hook(self):
3015 cl = self._common_GerritCommitMsgHookCheck()
3016 self.calls += [
3017 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3018 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3019 '#!/bin/sh\necho "custom hook"')
3020 ]
3021 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3022
3023 def test_GerritCommitMsgHookCheck_not_exists(self):
3024 cl = self._common_GerritCommitMsgHookCheck()
3025 self.calls += [
3026 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3027 ]
3028 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3029
3030 def test_GerritCommitMsgHookCheck(self):
3031 cl = self._common_GerritCommitMsgHookCheck()
3032 self.calls += [
3033 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3034 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3035 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003036 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003037 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3038 ''),
3039 ]
3040 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3041
tandriic4344b52016-08-29 06:04:54 -07003042 def test_GerritCmdLand(self):
3043 self.calls += [
3044 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3045 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3046 'deadbeaf'),
3047 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3048 ((['git', 'config', 'branch.feature.gerritserver'],),
3049 'chromium-review.googlesource.com'),
3050 ]
3051 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3052 cl._codereview_impl._GetChangeDetail = lambda _: {
3053 'labels': {},
3054 'current_revision': 'deadbeaf',
3055 }
agable32978d92016-11-01 12:55:02 -07003056 cl._codereview_impl._GetChangeCommit = lambda: {
3057 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003058 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003059 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3060 }
tandriic4344b52016-08-29 06:04:54 -07003061 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003062 out = StringIO.StringIO()
3063 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003064 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003065 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003066 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003067
tandrii221ab252016-10-06 08:12:04 -07003068 BUILDBUCKET_BUILDS_MAP = {
3069 '9000': {
3070 'id': '9000',
3071 'status': 'STARTED',
3072 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3073 'result_details_json': '{"properties": {}}',
3074 'bucket': 'master.x.y',
3075 'created_by': 'user:someone@chromium.org',
3076 'created_ts': '147200002222000',
3077 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3078 },
3079 '8000': {
3080 'id': '8000',
3081 'status': 'COMPLETED',
3082 'result': 'FAILURE',
3083 'failure_reason': 'BUILD_FAILURE',
3084 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3085 'result_details_json': '{"properties": {}}',
3086 'bucket': 'master.x.y',
3087 'created_by': 'user:someone@chromium.org',
3088 'created_ts': '147200001111000',
3089 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3090 },
3091 }
3092
3093 def test_write_try_results_json(self):
3094 expected_output = [
3095 {
3096 'buildbucket_id': '8000',
3097 'bucket': 'master.x.y',
3098 'builder_name': 'my-builder',
3099 'status': 'COMPLETED',
3100 'result': 'FAILURE',
3101 'failure_reason': 'BUILD_FAILURE',
3102 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3103 },
3104 {
3105 'buildbucket_id': '9000',
3106 'bucket': 'master.x.y',
3107 'builder_name': 'my-builder',
3108 'status': 'STARTED',
3109 'result': None,
3110 'failure_reason': None,
3111 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3112 }
3113 ]
3114 self.calls = [(('write_json', 'output.json', expected_output), '')]
3115 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3116
tandrii45b2a582016-10-11 03:14:16 -07003117 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003118 out = StringIO.StringIO()
3119 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003120 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3121 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003122 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3123 self._mocked_call(['get_authenticator_for_host', host]))
3124 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3125 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003126
3127 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3128 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003129 self.calls += [
3130 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3131 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3132 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3133 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3134 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3135 ((['git', 'config', 'branch.feature.rietveldserver'],),
3136 'codereview.example.com'),
3137 ((['get_authenticator_for_host', 'codereview.example.com'],),
3138 AuthenticatorMock()),
3139 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3140
3141 def test_fetch_try_jobs_none_rietveld(self):
3142 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003143 # Simulate that user isn't logged in.
3144 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003145 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003146 self.assertRegexpMatches(sys.stdout.getvalue(),
3147 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003148 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3149
3150 def test_fetch_try_jobs_some_rietveld(self):
3151 self._setup_fetch_try_jobs_rietveld({
3152 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3153 })
3154 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003155 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3156 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3157 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3158
3159 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3160 self._setup_fetch_try_jobs(most_recent_patchset=13)
3161 self.calls += [
3162 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3163 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3164 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003165 # TODO(tandrii): Uncomment the below if we decide to support checking
3166 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003167 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003168 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003169 ((['git', 'config', 'branch.feature.gerritserver'],),
3170 'https://x-review.googlesource.com'),
3171 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3172 AuthenticatorMock()),
3173 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3174
3175 def test_fetch_try_jobs_none_gerrit(self):
3176 self._setup_fetch_try_jobs_gerrit({})
3177 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003178 # TODO(tandrii): Uncomment the below if we decide to support checking
3179 # patchsets for Gerrit.
3180 # self.assertRegexpMatches(
3181 # sys.stdout.getvalue(),
3182 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003183 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3184
3185 def test_fetch_try_jobs_some_gerrit(self):
3186 self._setup_fetch_try_jobs_gerrit({
3187 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3188 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003189 # TODO(tandrii): Uncomment the below if we decide to support checking
3190 # patchsets for Gerrit.
3191 # self.calls.remove(
3192 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003193 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3194
3195 # ... and doesn't result in warning.
3196 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3197 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003198 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3199 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3200
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003201 def _mock_gerrit_changes_for_detail_cache(self):
3202 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003203
3204 def test_gerrit_change_detail_cache_normalize(self):
3205 self._mock_gerrit_changes_for_detail_cache()
3206 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003207 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003208 ]
3209 cl = git_cl.Changelist(codereview='gerrit')
3210 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3211 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3212 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3213 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3214
3215 def test_gerrit_change_detail_cache_simple(self):
3216 self._mock_gerrit_changes_for_detail_cache()
3217 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003218 (('GetChangeDetail', 'host', '1', []), 'a'),
3219 (('GetChangeDetail', 'host', '2', []), 'b'),
3220 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003221 ]
3222 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3223 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3224 self.assertEqual(cl._GetChangeDetail(), 'a')
3225 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003226 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003227 self.assertEqual(cl._GetChangeDetail(), 'a')
3228 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3229
3230 def test_gerrit_change_detail_cache_options(self):
3231 self._mock_gerrit_changes_for_detail_cache()
3232 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003233 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3234 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3235 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3236 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003237 ]
3238 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3239 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3240 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3241 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3242 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3243 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3244 self.assertEqual(cl._GetChangeDetail(), 'cab')
3245
3246 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3247 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3248 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3249 self.assertEqual(cl._GetChangeDetail(), 'cab')
3250
3251 # Finally, no_cache should invalidate all caches for given change.
3252 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3253 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3254
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003255 def test_gerrit_description_caching(self):
3256 def gen_detail(rev, desc):
3257 return {
3258 'current_revision': rev,
3259 'revisions': {rev: {'commit': {'message': desc}}}
3260 }
3261 self.calls = [
3262 (('GetChangeDetail', 'host', '1',
3263 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3264 gen_detail('rev1', 'desc1')),
3265 (('GetChangeDetail', 'host', '1',
3266 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3267 gen_detail('rev2', 'desc2')),
3268 ]
3269
3270 self._mock_gerrit_changes_for_detail_cache()
3271 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3272 self.assertEqual(cl.GetDescription(), 'desc1')
3273 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3274 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003275
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003276 def test_print_current_creds(self):
3277 class CookiesAuthenticatorMock(object):
3278 def __init__(self):
3279 self.gitcookies = {
3280 'host.googlesource.com': ('user', 'pass'),
3281 'host-review.googlesource.com': ('user', 'pass'),
3282 }
3283 self.netrc = self
3284 self.netrc.hosts = {
3285 'github.com': ('user2', None, 'pass2'),
3286 'host2.googlesource.com': ('user3', None, 'pass'),
3287 }
3288 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3289 CookiesAuthenticatorMock)
3290 self.mock(sys, 'stdout', StringIO.StringIO())
3291 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3292 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3293 ' Host\t User\t Which file',
3294 '============================\t=====\t===========',
3295 'host-review.googlesource.com\t user\t.gitcookies',
3296 ' host.googlesource.com\t user\t.gitcookies',
3297 ' host2.googlesource.com\tuser3\t .netrc',
3298 ])
3299 sys.stdout.buf = ''
3300 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3301 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3302 ' Host\tUser\t Which file',
3303 '============================\t====\t===========',
3304 'host-review.googlesource.com\tuser\t.gitcookies',
3305 ' host.googlesource.com\tuser\t.gitcookies',
3306 ])
3307
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003308 def _common_creds_check_mocks(self):
3309 def exists_mock(path):
3310 dirname = os.path.dirname(path)
3311 if dirname == os.path.expanduser('~'):
3312 dirname = '~'
3313 base = os.path.basename(path)
3314 if base in ('.netrc', '.gitcookies'):
3315 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3316 # git cl also checks for existence other files not relevant to this test.
3317 return None
3318 self.mock(os.path, 'exists', exists_mock)
3319 self.mock(sys, 'stdout', StringIO.StringIO())
3320
3321 def test_creds_check_gitcookies_not_configured(self):
3322 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003323 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003324 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003325 self.calls = [
3326 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3327 (('os.path.exists', '~/.netrc'), True),
3328 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3329 'or Ctrl+C to abort'), ''),
3330 ((['git', 'config', '--global', 'http.cookiefile',
3331 os.path.expanduser('~/.gitcookies')], ), ''),
3332 ]
3333 self.assertEqual(0, git_cl.main(['creds-check']))
3334 self.assertRegexpMatches(
3335 sys.stdout.getvalue(),
3336 '^You seem to be using outdated .netrc for git credentials:')
3337 self.assertRegexpMatches(
3338 sys.stdout.getvalue(),
3339 '\nConfigured git to use .gitcookies from')
3340
3341 def test_creds_check_gitcookies_configured_custom_broken(self):
3342 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003343 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003344 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003345 self.calls = [
3346 ((['git', 'config', '--global', 'http.cookiefile'],),
3347 '/custom/.gitcookies'),
3348 (('os.path.exists', '/custom/.gitcookies'), False),
3349 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3350 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3351 ((['git', 'config', '--global', 'http.cookiefile',
3352 os.path.expanduser('~/.gitcookies')], ), ''),
3353 ]
3354 self.assertEqual(0, git_cl.main(['creds-check']))
3355 self.assertRegexpMatches(
3356 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003357 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003358 self.assertRegexpMatches(
3359 sys.stdout.getvalue(),
3360 'However, your configured .gitcookies file is missing.')
3361
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003362 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003363 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3364 lambda _, message: self._mocked_call('AddComment', message))
3365 self.calls = [
3366 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3367 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3368 (('AddComment', 'msg'), ''),
3369 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003370 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3371 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003372
3373 def test_git_cl_comment_add_gerrit(self):
3374 self.mock(git_cl.gerrit_util, 'SetReview',
3375 lambda host, change, msg:
3376 self._mocked_call('SetReview', host, change, msg))
3377 self.calls = [
3378 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3379 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3380 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3381 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3382 'origin/master'),
3383 ((['git', 'config', 'remote.origin.url'],),
3384 'https://chromium.googlesource.com/infra/infra'),
3385 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3386 ]
3387 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3388 '-a', 'msg']))
3389
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003390 def test_git_cl_comments_fetch_rietveld(self):
3391 self.mock(sys, 'stdout', StringIO.StringIO())
3392 self.calls = [
3393 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3394 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3395 ] * 2
3396 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3397 'messages': [
3398 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3399 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3400 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3401 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3402 # Intentionally wrong order here.
3403 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3404 'disapproval': False, 'approval': False,
3405 'sender': 'owner@example.com'},
3406 ],
3407 'owner_email': 'owner@example.com',
3408 })
3409 expected_comments_summary = [
3410 git_cl._CommentSummary(
3411 message='lgtm',
3412 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3413 disapproval=False, approval=True, sender='r@example.com'),
3414 git_cl._CommentSummary(
3415 message='not lgtm',
3416 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3417 disapproval=True, approval=False, sender='r2@example.com'),
3418 # Note: same order as in whatever Rietveld returns.
3419 git_cl._CommentSummary(
3420 message='PTAL',
3421 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3422 disapproval=False, approval=False, sender='owner@example.com'),
3423 ]
3424 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3425 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3426
3427 with git_cl.gclient_utils.temporary_directory() as tempdir:
3428 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3429 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3430 '-j', out_file]))
3431 with open(out_file) as f:
3432 read = json.load(f)
3433 self.assertEqual(len(read), 3)
3434 self.assertEqual(read[0], {
3435 'date': '2000-03-13 20:49:34.515270',
3436 'message': 'PTAL',
3437 'approval': False,
3438 'disapproval': False,
3439 'sender': 'owner@example.com'})
3440 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3441 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3442
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003443 def test_git_cl_comments_fetch_gerrit(self):
3444 self.mock(sys, 'stdout', StringIO.StringIO())
3445 self.calls = [
3446 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3447 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3448 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3449 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3450 'origin/master'),
3451 ((['git', 'config', 'remote.origin.url'],),
3452 'https://chromium.googlesource.com/infra/infra'),
3453 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3454 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003455 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003456 'messages': [
3457 {
3458 u'_revision_number': 1,
3459 u'author': {
3460 u'_account_id': 1111084,
3461 u'email': u'commit-bot@chromium.org',
3462 u'name': u'Commit Bot'
3463 },
3464 u'date': u'2017-03-15 20:08:45.000000000',
3465 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3466 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3467 u'tag': u'autogenerated:cq:dry-run'
3468 },
3469 {
3470 u'_revision_number': 2,
3471 u'author': {
3472 u'_account_id': 11151243,
3473 u'email': u'owner@example.com',
3474 u'name': u'owner'
3475 },
3476 u'date': u'2017-03-16 20:00:41.000000000',
3477 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3478 u'message': u'PTAL',
3479 },
3480 {
3481 u'_revision_number': 2,
3482 u'author': {
3483 u'_account_id': 148512 ,
3484 u'email': u'reviewer@example.com',
3485 u'name': u'reviewer'
3486 },
3487 u'date': u'2017-03-17 05:19:37.500000000',
3488 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3489 u'message': u'Patch Set 2: Code-Review+1',
3490 },
3491 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003492 }),
3493 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3494 '/COMMIT_MSG': [
3495 {
3496 'author': {'email': u'reviewer@example.com'},
3497 'updated': u'2017-03-17 05:19:37.500000000',
3498 'patch_set': 2,
3499 'side': 'REVISION',
3500 'message': 'Please include a bug link',
3501 },
3502 ],
3503 'codereview.settings': [
3504 {
3505 'author': {'email': u'owner@example.com'},
3506 'updated': u'2017-03-16 20:00:41.000000000',
3507 'patch_set': 2,
3508 'side': 'PARENT',
3509 'line': 42,
3510 'message': 'I removed this because it is bad',
3511 },
3512 ]
3513 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003514 ] * 2
3515 expected_comments_summary = [
3516 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003517 message=(
3518 u'PTAL\n' +
3519 u'\n' +
3520 u'codereview.settings\n' +
3521 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3522 u'c/1/2/codereview.settings#b42\n' +
3523 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003524 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3525 disapproval=False, approval=False, sender=u'owner@example.com'),
3526 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003527 message=(
3528 u'Patch Set 2: Code-Review+1\n' +
3529 u'\n' +
3530 u'/COMMIT_MSG\n' +
3531 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3532 u'c/1/2//COMMIT_MSG#\n' +
3533 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003534 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3535 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3536 ]
3537 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3538 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3539
3540 with git_cl.gclient_utils.temporary_directory() as tempdir:
3541 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3542 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3543 '-j', out_file]))
3544 with open(out_file) as f:
3545 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003546 self.assertEqual(len(read), 2)
3547 self.assertEqual(read[0], {
3548 u'date': u'2017-03-16 20:00:41.000000',
3549 u'message': (
3550 u'PTAL\n' +
3551 u'\n' +
3552 u'codereview.settings\n' +
3553 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3554 u'c/1/2/codereview.settings#b42\n' +
3555 u' I removed this because it is bad\n'),
3556 u'approval': False,
3557 u'disapproval': False,
3558 u'sender': u'owner@example.com'})
3559 self.assertEqual(read[1], {
3560 u'date': u'2017-03-17 05:19:37.500000',
3561 u'message': (
3562 u'Patch Set 2: Code-Review+1\n' +
3563 u'\n' +
3564 u'/COMMIT_MSG\n' +
3565 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3566 u'c/1/2//COMMIT_MSG#\n' +
3567 u' Please include a bug link\n'),
3568 u'approval': False,
3569 u'disapproval': False,
3570 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003571
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003572
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003573if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003574 logging.basicConfig(
3575 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003576 unittest.main()