blob: b966c06716dc25947260d13fc466f715b2e98306 [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
281 def test_git_number_same_branch_with_originals(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 'Some users are smart and insert their own footers\n'
290 '\n'
291 'Cr-Whatever: value\n'
292 'Cr-Commit-Position: refs/copy/paste@{#22}')
293 self.assertEqualByLine(
294 actual,
295 'Child\n'
296 '\n'
297 'Some users are smart and insert their own footers\n'
298 '\n'
299 'Cr-Original-Whatever: value\n'
300 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
301 'Cr-Commit-Position: refs/heads/master@{#13}')
302
303 def test_git_number_new_branch(self):
304 actual = self._test_git_number(
305 'Parent\n'
306 '\n'
307 'Cr-Commit-Position: refs/heads/master@{#12}',
308 dest_ref='refs/heads/branch',
309 child_msg='Child')
310 self.assertEqualByLine(
311 actual,
312 'Child\n'
313 '\n'
314 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
315 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
316
317 def test_git_number_lineage(self):
318 actual = self._test_git_number(
319 'Parent\n'
320 '\n'
321 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
322 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
323 dest_ref='refs/heads/branch',
324 child_msg='Child')
325 self.assertEqualByLine(
326 actual,
327 'Child\n'
328 '\n'
329 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
330 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
331
332 def test_git_number_moooooooore_lineage(self):
333 actual = self._test_git_number(
334 'Parent\n'
335 '\n'
336 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
337 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
338 dest_ref='refs/heads/mooore',
339 child_msg='Child')
340 self.assertEqualByLine(
341 actual,
342 'Child\n'
343 '\n'
344 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
345 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
346 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
347
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100348 def test_git_number_ever_moooooooore_lineage(self):
349 self.maxDiff = 10000
350 actual = self._test_git_number(
351 'CQ commit on fresh new branch + numbering.\n'
352 '\n'
353 'NOTRY=True\n'
354 'NOPRESUBMIT=True\n'
355 'BUG=\n'
356 '\n'
357 'Review-Url: https://codereview.chromium.org/2577703003\n'
358 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
359 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
360 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
361 dest_ref='refs/heads/gnumb-test/cl',
362 child_msg='git cl on fresh new branch + numbering.\n'
363 '\n'
364 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
365 self.assertEqualByLine(
366 actual,
367 'git cl on fresh new branch + numbering.\n'
368 '\n'
369 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
370 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
371 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
372 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
373 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100374
375 def test_git_number_cherry_pick(self):
376 actual = self._test_git_number(
377 'Parent\n'
378 '\n'
379 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
380 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
381 dest_ref='refs/heads/branch',
382 child_msg='Child, which is cherry-pick from master\n'
383 '\n'
384 'Cr-Commit-Position: refs/heads/master@{#100}\n'
385 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
386 self.assertEqualByLine(
387 actual,
388 'Child, which is cherry-pick from master\n'
389 '\n'
390 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
391 '\n'
392 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
393 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
394 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
395
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000396
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200397class TestParseIssueURL(unittest.TestCase):
398 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
399 codereview=None, fail=False):
400 self.assertIsNotNone(parsed)
401 if fail:
402 self.assertFalse(parsed.valid)
403 return
404 self.assertTrue(parsed.valid)
405 self.assertEqual(parsed.issue, issue)
406 self.assertEqual(parsed.patchset, patchset)
407 self.assertEqual(parsed.hostname, hostname)
408 self.assertEqual(parsed.codereview, codereview)
409
410 def _run_and_validate(self, func, url, *args, **kwargs):
411 result = func(urlparse.urlparse(url))
412 if kwargs.pop('fail', False):
413 self.assertIsNone(result)
414 return None
415 self._validate(result, *args, fail=False, **kwargs)
416
417 def test_rietveld(self):
418 def test(url, *args, **kwargs):
419 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
420 *args, codereview='rietveld', **kwargs)
421
422 test('http://codereview.chromium.org/123',
423 123, None, 'codereview.chromium.org')
424 test('https://codereview.chromium.org/123',
425 123, None, 'codereview.chromium.org')
426 test('https://codereview.chromium.org/123/',
427 123, None, 'codereview.chromium.org')
428 test('https://codereview.chromium.org/123/whatever',
429 123, None, 'codereview.chromium.org')
430 test('https://codereview.chromium.org/123/#ps20001',
431 123, 20001, 'codereview.chromium.org')
432 test('http://codereview.chromium.org/download/issue123_4.diff',
433 123, 4, 'codereview.chromium.org')
434 # This looks like bad Gerrit, but is actually valid Rietveld, too.
435 test('https://chrome-review.source.com/123/4/',
436 123, None, 'chrome-review.source.com')
437
438 test('https://codereview.chromium.org/deadbeaf', fail=True)
439 test('https://codereview.chromium.org/api/123', fail=True)
440 test('bad://codereview.chromium.org/123', fail=True)
441 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
442
443 def test_gerrit(self):
444 def test(url, issue=None, patchset=None, hostname=None, fail=None):
445 self._test_ParseIssueUrl(
446 git_cl._GerritChangelistImpl.ParseIssueURL,
447 url, issue, patchset, hostname, fail)
448 def test(url, *args, **kwargs):
449 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
450 *args, codereview='gerrit', **kwargs)
451
452 test('http://chrome-review.source.com/c/123',
453 123, None, 'chrome-review.source.com')
454 test('https://chrome-review.source.com/c/123/',
455 123, None, 'chrome-review.source.com')
456 test('https://chrome-review.source.com/c/123/4',
457 123, 4, 'chrome-review.source.com')
458 test('https://chrome-review.source.com/#/c/123/4',
459 123, 4, 'chrome-review.source.com')
460 test('https://chrome-review.source.com/c/123/4',
461 123, 4, 'chrome-review.source.com')
462 test('https://chrome-review.source.com/123',
463 123, None, 'chrome-review.source.com')
464 test('https://chrome-review.source.com/123/4',
465 123, 4, 'chrome-review.source.com')
466
467 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
468 test('https://chrome-review.source.com/c/abc/', fail=True)
469 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
470
471 def test_ParseIssueNumberArgument(self):
472 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200473 codereview_hint = kwargs.pop('hint', None)
474 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
475 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200476
477 test('123', 123)
478 test('', fail=True)
479 test('abc', fail=True)
480 test('123/1', fail=True)
481 test('123a', fail=True)
482 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
483 # Rietveld.
484 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200485 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200486 test('https://codereview.source.com/123',
487 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200488 # Matches both, but we take Gerrit if specifically requested.
489 test('https://codereview.source.com/123',
490 123, None, 'codereview.source.com', 'gerrit',
491 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200492 # Gerrrit.
493 test('https://chrome-review.source.com/c/123/4',
494 123, 4, 'chrome-review.source.com', 'gerrit')
495 test('https://chrome-review.source.com/bad/123/4', fail=True)
496
497
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100498class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100499 def setUp(self):
500 super(GitCookiesCheckerTest, self).setUp()
501 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100502 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100503
504 def mock_hosts_creds(self, subhost_identity_pairs):
505 def ensure_googlesource(h):
506 if not h.endswith(self.c._GOOGLESOURCE):
507 assert not h.endswith('.')
508 return h + '.' + self.c._GOOGLESOURCE
509 return h
510 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
511 for h, i in subhost_identity_pairs]
512
513 def test_analysis_nothing(self):
514 self.c._all_hosts = []
515 self.assertFalse(self.c.has_generic_host())
516 self.assertEqual(set(), self.c.get_conflicting_hosts())
517 self.assertEqual(set(), self.c.get_duplicated_hosts())
518 self.assertEqual(set(), self.c.get_partially_configured_hosts())
519 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
520
521 def test_analysis(self):
522 self.mock_hosts_creds([
523 ('.googlesource.com', 'git-example.chromium.org'),
524
525 ('chromium', 'git-example.google.com'),
526 ('chromium-review', 'git-example.google.com'),
527 ('chrome-internal', 'git-example.chromium.org'),
528 ('chrome-internal-review', 'git-example.chromium.org'),
529 ('conflict', 'git-example.google.com'),
530 ('conflict-review', 'git-example.chromium.org'),
531 ('dup', 'git-example.google.com'),
532 ('dup', 'git-example.google.com'),
533 ('dup-review', 'git-example.google.com'),
534 ('partial', 'git-example.google.com'),
535 ])
536 self.assertTrue(self.c.has_generic_host())
537 self.assertEqual(set(['conflict.googlesource.com']),
538 self.c.get_conflicting_hosts())
539 self.assertEqual(set(['dup.googlesource.com']),
540 self.c.get_duplicated_hosts())
541 self.assertEqual(set(['partial.googlesource.com']),
542 self.c.get_partially_configured_hosts())
543 self.assertEqual(set(['chromium.googlesource.com',
544 'chrome-internal.googlesource.com']),
545 self.c.get_hosts_with_wrong_identities())
546
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100547 def test_report_no_problems(self):
548 self.test_analysis_nothing()
549 self.mock(sys, 'stdout', StringIO.StringIO())
550 self.assertFalse(self.c.find_and_report_problems())
551 self.assertEqual(sys.stdout.getvalue(), '')
552
553 def test_report(self):
554 self.test_analysis()
555 self.mock(sys, 'stdout', StringIO.StringIO())
556 self.assertTrue(self.c.find_and_report_problems())
557 with open(os.path.join(os.path.dirname(__file__),
558 'git_cl_creds_check_report.txt')) as f:
559 expected = f.read()
560 def by_line(text):
561 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200562 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100563
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000564class TestGitCl(TestCase):
565 def setUp(self):
566 super(TestGitCl, self).setUp()
567 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700568 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000569 self.mock(subprocess2, 'call', self._mocked_call)
570 self.mock(subprocess2, 'check_call', self._mocked_call)
571 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700572 self.mock(subprocess2, 'communicate',
573 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000574 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000575 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000576 self.mock(git_common, 'get_or_create_merge_base',
577 lambda *a: (
578 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000579 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000580 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100581 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
582 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700583 self.mock(git_cl, 'write_json', lambda path, contents:
584 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000585 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000586 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000587 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700588 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
589 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000590 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000591 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000592 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100593 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
594 lambda *args, **kwargs: self._mocked_call(
595 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700596 self.mock(git_cl.gerrit_util, 'GetChangeComments',
597 lambda *args, **kwargs: self._mocked_call(
598 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100599 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700600 lambda h, i, reviewers, ccs, notify: self._mocked_call(
601 'AddReviewers', h, i, reviewers, ccs, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000602 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
603 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700604 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100605 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000606 # It's important to reset settings to not have inter-tests interference.
607 git_cl.settings = None
608
609 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000610 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100611 self.assertEquals([], self.calls)
612 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000613 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100614 raise
615 # Sadly, has_failed() returns True if this OR any other tests before this
616 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200617 git_cl.logging.error(
618 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100619 'There are un-consumed self.calls after this test has finished.\n'
620 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700621 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200622 'If you are already running only this test, then **first** fix the '
623 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100624 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700625 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100626 'and follow instructions above.\n' +
627 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000628 finally:
629 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000630
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000631 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000632 self.assertTrue(
633 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700634 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000635 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000636 expected_args, result = top
637
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000638 # Also logs otherwise it could get caught in a try/finally and be hard to
639 # diagnose.
640 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700641 N = 5
642 prior_calls = '\n '.join(
643 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
644 for i, c in enumerate(self._calls_done[-N:]))
645 following_calls = '\n '.join(
646 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
647 for i, c in enumerate(self.calls[:N]))
648 extended_msg = (
649 'A few prior calls:\n %s\n\n'
650 'This (expected):\n @%d: %r\n'
651 'This (actual):\n @%d: %r\n\n'
652 'A few following expected calls:\n %s' %
653 (prior_calls, len(self._calls_done), expected_args,
654 len(self._calls_done), args, following_calls))
655 git_cl.logging.error(extended_msg)
656
tandrii99a72f22016-08-17 14:33:24 -0700657 self.fail('@%d\n'
658 ' Expected: %r\n'
659 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700660 len(self._calls_done), expected_args, args))
661
662 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700663 if isinstance(result, Exception):
664 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000665 return result
666
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100667 def test_ask_for_explicit_yes_true(self):
668 self.calls = [
669 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
670 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
671 ]
672 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
673
674 def test_ask_for_explicit_yes_true(self):
675 self.calls = [
676 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
677 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
678 ]
679 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
680
tandrii48df5812016-10-17 03:55:37 -0700681 def test_LoadCodereviewSettingsFromFile_gerrit(self):
682 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
683 self.calls = [
684 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
685 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
686 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
687 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
688 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
689 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700690 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
691 CERR1),
692 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700693 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
694 CERR1),
695 ((['git', 'config', 'gerrit.host', 'true'],), ''),
696 ]
697 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
698
maruel@chromium.orga3353652011-11-30 14:26:57 +0000699 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000700 def _is_gerrit_calls(cls, gerrit=False):
701 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
702 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
703
704 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000705 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200706 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000707 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000708
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000709 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200710 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
711 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
712 ((['git', 'config', 'core.editor'],), ''),
713 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000714
715 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200716 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000717 if similarity is None:
718 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700719 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700720 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000721 else:
tandrii33a46ff2016-08-23 05:53:40 -0700722 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700723 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000724
725 if find_copies is None:
726 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700727 find_copies_call = ((['git', 'config', '--bool',
728 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000729 else:
tandrii5d48c322016-08-18 16:19:37 -0700730 val = str(find_copies).lower()
731 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000732 'branch.master.git-find-copies', val],), '')
733
734 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000735 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800736 '-l100000', '-C'+similarity,
737 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000738 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000739 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000740 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000741
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000742 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000743 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000744 similarity_call,
745 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
746 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000747 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000748 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700749 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
750 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000751 ((['git', 'config', 'rietveld.server'],),
752 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000753 ((['git', 'config', 'branch.master.merge'],), 'master'),
754 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000755 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000756 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000757 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000758 ((['git', 'rev-parse', '--show-cdup'],), ''),
759 ((['git', 'rev-parse', 'HEAD'],), '12345'),
760 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000761 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000762 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700763 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000764 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000765 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000766 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000767 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000768 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000769 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000770 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000771 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700772 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000773 ]
774
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000775 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000776 def _git_upload_calls(cls, private):
777 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000778 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000779 private_call = []
780 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000781 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000782 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000784
maruel@chromium.orga3353652011-11-30 14:26:57 +0000785 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000786 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000787 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800789 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000790 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700791 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000792 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000793 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700795 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000796 ] + cls._git_post_upload_calls()
797
798 @classmethod
799 def _git_post_upload_calls(cls):
800 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000801 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
802 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
803 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000804 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000805 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000806 ]
807
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000808 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000809 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000810 fake_ancestor = 'fake_ancestor'
811 fake_cl = 'fake_cl_for_patch'
812 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000813 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000814 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000815 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000816 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000817 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000818 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000819 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000820 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700821 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000822 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000823 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000825 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000826 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000828 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000829 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000830 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000831 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000832 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000833
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000834 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700835 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000836 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000837 return [
838 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000839 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000840 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000841 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700842 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000843 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000844 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100845 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000846 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000847 ]
848
849 def _run_reviewer_test(
850 self,
851 upload_args,
852 expected_description,
853 returned_description,
854 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000855 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700856 private=False,
857 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000858 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000859 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000860 try:
861 similarity = upload_args[upload_args.index('--similarity')+1]
862 except ValueError:
863 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000864
865 if '--find-copies' in upload_args:
866 find_copies = True
867 elif '--no-find-copies' in upload_args:
868 find_copies = False
869 else:
870 find_copies = None
871
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000872 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700873 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000874
875 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000876
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000877 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000878 self.assertEquals(
879 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000880 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000881 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000882 '#--------------------This line is 72 characters long'
883 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000884 expected_description,
885 desc)
886 return returned_description
887 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000888
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000889 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000890 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700891 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000892 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000893 return 1, 2
894 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000895
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000896 git_cl.main(['upload'] + upload_args)
897
898 def test_no_reviewer(self):
899 self._run_reviewer_test(
900 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000901 'desc\n\nBUG=',
902 '# Blah blah comment.\ndesc\n\nBUG=',
903 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000904 [])
905
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000906 def test_keep_similarity(self):
907 self._run_reviewer_test(
908 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000909 'desc\n\nBUG=',
910 '# Blah blah comment.\ndesc\n\nBUG=',
911 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000912 [])
913
iannucci@chromium.org79540052012-10-19 23:15:26 +0000914 def test_keep_find_copies(self):
915 self._run_reviewer_test(
916 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000917 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000918 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000919 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000920 [])
921
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000922 def test_private(self):
923 self._run_reviewer_test(
924 ['--private'],
925 'desc\n\nBUG=',
926 '# Blah blah comment.\ndesc\n\nBUG=\n',
927 'desc\n\nBUG=',
928 [])
929
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000930 def test_reviewers_cmd_line(self):
931 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000932 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000933 self._run_reviewer_test(
934 ['-r' 'foo@example.com'],
935 description,
936 '\n%s\n' % description,
937 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000938 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000939
940 def test_reviewer_tbr_overriden(self):
941 # Reviewer is overriden with TBR
942 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000943 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000944 self._run_reviewer_test(
945 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000946 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 description.strip('\n'),
948 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000949 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950
951 def test_reviewer_multiple(self):
952 # Handles multiple R= or TBR= lines.
953 description = (
bradnelsond975b302016-10-23 12:20:23 -0700954 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
955 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956 self._run_reviewer_test(
957 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000958 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000959 description,
960 description,
bradnelsond975b302016-10-23 12:20:23 -0700961 ['--reviewers=another@example.com,reviewer@example.com'],
962 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000963
maruel@chromium.orga3353652011-11-30 14:26:57 +0000964 def test_reviewer_send_mail(self):
965 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000966 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000967 self._run_reviewer_test(
968 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000970 description.strip('\n'),
971 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000972 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000973
974 def test_reviewer_send_mail_no_rev(self):
975 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000976 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200977 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -0700978 ((['DieWithError', 'Must specify reviewers to send email.'],),
979 SystemExitMock())
980 ]
981
982 def RunEditor(desc, _, **kwargs):
983 return desc
984 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
985 self.mock(sys, 'stdout', stdout)
986 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000987 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -0700988 self.assertEqual(
989 '=====================================\n'
990 'NOTICE: Rietveld is being deprecated. '
991 'You can upload changes to Gerrit with\n'
992 ' git cl upload --gerrit\n'
993 'or set Gerrit to be your default code review tool with\n'
994 ' git config gerrit.host true\n'
995 '=====================================\n',
996 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000997
tandriif9aefb72016-07-01 09:06:51 -0700998 def test_bug_on_cmd(self):
999 self._run_reviewer_test(
1000 ['--bug=500658,proj:123'],
1001 'desc\n\nBUG=500658\nBUG=proj:123',
1002 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1003 'desc\n\nBUG=500658\nBUG=proj:1234',
1004 [])
1005
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001006 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1007 parent_msg=None,
1008 new_msg=None,
1009 fail_after_parent_msg=False,
1010 fail_cherry_pick=False,
1011 fail_push_count=0,
1012 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001013 if debug:
1014 # Very useful due to finally clause in git cl land raising exceptions and
1015 # shadowing real cause of failure.
1016 self.mock(git_cl, '_IS_BEING_TESTED', True)
1017 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001018 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001019
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001020 if git_numberer_enabled:
1021 # Special mocks to check validity of timestamp.
1022 original_git_amend_head = git_cl._git_amend_head
1023 def _git_amend_head_mock(msg, tstamp):
1024 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1025 return original_git_amend_head(msg, tstamp)
1026 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1027
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001028 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1029 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001030 self.mock(RietveldMock, 'update_description', staticmethod(
1031 lambda i, d: self._mocked_call(['update_description', i, d])))
1032 self.mock(RietveldMock, 'add_comment', staticmethod(
1033 lambda i, c: self._mocked_call(['add_comment', i, c])))
1034 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001035 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1036 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1037 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1038 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1039 CERR1),
1040 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1041 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001042 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001043 ((['git', 'config', 'rietveld.server'],),
1044 'https://codereview.chromium.org'),
1045 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1046 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1047 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1048 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001049 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1050 ''), # No commits to rebase, according to local view of origin.
1051 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1052 'fake_ancestor_sha'),
1053 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1054 ((['git', 'rev-parse', '--show-cdup'],), ''),
1055 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1056 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1057 'fake_ancestor_sha...', '.'],),
1058 'M\tfile1.cpp'),
1059 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1060 ((['git', 'config', 'branch.feature.rietveldserver'],),
1061 'https://codereview.chromium.org'),
1062 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1063 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1064 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1065 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001066 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001067 # file1.cpp | 53 ++++++--
1068 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1069 ''),
1070 ((['git', 'show-ref', '--quiet', '--verify',
1071 'refs/heads/git-cl-commit'],),
1072 ''), # 0 return code means branch exists.
1073 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1074 ((['git', 'show-ref', '--quiet', '--verify',
1075 'refs/heads/git-cl-cherry-pick'],),
1076 CERR1), # This means git-cl-cherry-pick branch does not exist.
1077 ((['git', 'rev-parse', '--show-cdup'],), ''),
1078 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1079 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1080 ((['git', 'commit', '-m',
1081 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001082 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001083 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1084 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1085 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001086 repo_url),
1087
1088 ((['git', 'config', 'remote.origin.url'],), repo_url),
1089 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1090 git_numberer_enabled),
1091
1092 # Auto-rebase init.
1093 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1094 ]
1095 # Auto-rebase loops.
1096 for attempt in xrange(fail_push_count + 1):
1097 self.calls += [
1098 # Auto-rebase loop start.
1099 ((['git', 'retry', 'fetch', 'origin',
1100 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1101 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1102 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1103 # different in each loop iteration for truly realistic test.
1104 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1105 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1106 callError(1, 'failed to cherry pick') if fail_cherry_pick
1107 else ''),
1108 ]
1109 if fail_cherry_pick:
1110 return
1111
1112 if git_numberer_enabled:
1113 assert parent_msg
1114 self.calls += [
1115 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1116 parent_msg),
1117 ]
1118 if fail_after_parent_msg:
1119 return
1120 assert new_msg
1121 self.calls += [
1122 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1123 '1480022355'), # Committer's unix timestamp.
1124 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1125 '1480024000'),
1126 ((['git_amend_head committer timestamp', 1480024000],), ''),
1127 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1128 ]
1129 self.calls += [
1130 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1131 CERR1 if attempt < fail_push_count else ''),
1132 ]
1133 # End of autorebase + push.
1134
1135 self.calls += [
1136 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1137 ]
1138 if git_numberer_enabled:
1139 self.calls += [
1140 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1141 ]
1142
1143 # Cleanup calls.
1144 self.calls += [
1145 ((['git', 'checkout', '-q', 'feature'],), ''),
1146 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1147 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001148 ]
1149
1150 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001151 self._land_rietveld_calls(
1152 repo_url='https://chromium.googlesource.com/infra/infra',
1153 git_numberer_enabled=False,
1154 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001155 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001156 ((['git', 'config', 'rietveld.viewvc-url'],),
1157 'https://chromium.googlesource.com/infra/infra/+/'),
1158 ((['update_description', 123,
1159 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001160 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001161 ''),
1162 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001163 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001164 ]
1165 git_cl.main(['land'])
1166
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001167 def test_land_rietveld_fail_cherry_pick(self):
1168 self._land_rietveld_calls(
1169 repo_url='https://chromium.googlesource.com/infra/infra',
1170 git_numberer_enabled=False,
1171 fail_cherry_pick=True,
1172 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001173 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001174 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1175 'U path/file1\n'
1176 'U file2.cpp\n'),
1177 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001178 ((['git', 'checkout', '-q', 'feature'],), ''),
1179 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001180 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1181 ]
1182 git_cl.main(['land'])
1183
1184 def test_land_rietveld_git_numberer_fail_1_push(self):
1185 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1186
1187 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1188 self._land_rietveld_calls(
1189 repo_url='https://chromium.googlesource.com/chromium/src',
1190 git_numberer_enabled=True,
1191 parent_msg=('This is parent commit.\n'
1192 '\n'
1193 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1194 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1195 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1196 '\n'
1197 'Review-Url: https://codereview.chromium.org/123 .\n'
1198 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1199 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1200 fail_push_count=fail_push_count,
1201 debug=False)
1202
1203 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001204 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001205 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001206 ((['update_description', 123,
1207 'Issue: 123\n\nR=john@chromium.org\n'
1208 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001209 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001210 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1211 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1212 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001213 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001214 ''),
1215 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001216 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001217 ]
1218 git_cl.main(['land'])
1219
1220 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001221 self._land_rietveld_calls(
1222 repo_url='https://chromium.googlesource.com/v8/v8',
1223 git_numberer_enabled=True,
1224 parent_msg='This is parent commit with no footer.',
1225 fail_after_parent_msg=True,
1226 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001227 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001228 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001229 ((['git', 'checkout', '-q', 'feature'],), ''),
1230 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001231 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001232 ]
1233 with self.assertRaises(ValueError) as cm:
1234 git_cl.main(['land'])
1235 self.assertEqual(cm.exception.message,
1236 'Unable to infer commit position from footers')
1237
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001238 def test_git_numberer_not_whitelisted_repo(self):
1239 self.calls = []
1240 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001241 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1242 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001243 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001244
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001245 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001246 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1247 self.calls = [
1248 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001249 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001250 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001251 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001252 remote_url='https://chromium.googlesource.com/chromium/src',
1253 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001254 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001255
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001256 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001257 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001258 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001259 def fake_temporary_directory(**kwargs):
1260 yield tempdir
1261 self.mock(git_cl.gclient_utils, 'temporary_directory',
1262 fake_temporary_directory)
1263 self._test_GitNumbererState_valid_configs_inner(tempdir)
1264
1265 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001266 self.calls = [
1267 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001268 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001269 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1270 '''
1271 [plugin "git-numberer"]
1272 validate-enabled-refglob = refs/else/*
1273 validate-enabled-refglob = refs/heads/*
1274 validate-disabled-refglob = refs/heads/disabled
1275 validate-disabled-refglob = refs/branch-heads/*
1276 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001277 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1278 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001279 'refs/else/*\n'
1280 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001281 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1282 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001283 'refs/heads/disabled\n'
1284 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001285 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001286
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001287 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001288 remote_url='https://chromium.googlesource.com/chromium/src',
1289 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001290 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001291
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001292 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001293 remote_url='https://chromium.googlesource.com/chromium/src',
1294 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001295 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001296
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001297 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001298 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001299 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001300 remote_url='https://chromium.googlesource.com/chromium/src',
1301 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001302 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001303
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001305 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001306 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001307 if skip_auth_check:
1308 return [((cmd, ), 'true')]
1309
tandrii5d48c322016-08-18 16:19:37 -07001310 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001311 if issue:
1312 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001313 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001314 ])
1315 calls.extend([
1316 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1317 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1318 ((['git', 'config', 'remote.origin.url'],),
1319 'https://chromium.googlesource.com/my/repo'),
1320 ((['git', 'config', 'remote.origin.url'],),
1321 'https://chromium.googlesource.com/my/repo'),
1322 ])
1323 return calls
1324
1325 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001326 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001327 fetched_status=None, other_cl_owner=None,
1328 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001329 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001330 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1331 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1332 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1333 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001334 ]
1335 calls += cls._is_gerrit_calls(True)
1336 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001337 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1338 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1339 ((['git', 'config', 'branch.master.gerritissue'],),
1340 CERR1 if issue is None else str(issue)),
1341 ]
1342
1343 if custom_cl_base:
1344 ancestor_revision = custom_cl_base
1345 else:
1346 # Determine ancestor_revision to be merge base.
1347 ancestor_revision = 'fake_ancestor_sha'
1348 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001349 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001350 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001351 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001352 'refs/remotes/origin/master'],), ancestor_revision),
1353 ]
1354
1355 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001356 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1357
1358 if issue:
1359 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001360 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001361 '123456',
1362 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001363 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001364 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001365 'change_id': '123456789',
1366 'current_revision': 'sha1_of_current_revision',
1367 'revisions': { 'sha1_of_current_revision': {
1368 'commit': {'message': fetched_description},
1369 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001370 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001371 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001372 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001373 if fetched_status == 'ABANDONED':
1374 calls += [
1375 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1376 '123456 has been abandoned, new uploads are not '
1377 'allowed'), SystemExitMock()),
1378 ]
1379 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001380 if other_cl_owner:
1381 calls += [
1382 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1383 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001384
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001385 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1386 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001387 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 ((['git', 'rev-parse', '--show-cdup'],), ''),
1389 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001390
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001391 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1392 ancestor_revision + '...', '.'],),
1393 'M\t.gitignore\n'),
1394 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001395 ]
1396
1397 if not issue:
1398 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001399 ((['git', 'log', '--pretty=format:%s%n%n%b',
1400 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001401 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001402 ]
1403
1404 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001405 ((['git', 'config', 'user.email'],), 'me@example.com'),
1406 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1407 ([custom_cl_base] if custom_cl_base else
1408 [ancestor_revision, 'HEAD']),),
1409 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001410 ]
1411 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001412
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001413 @classmethod
1414 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001415 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001416 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001417 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001418 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001419 git_mirror=None,
1420 custom_cl_base=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001421 if post_amend_description is None:
1422 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001423 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001424 # Determined in `_gerrit_base_calls`.
1425 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1426
1427 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001428
tandriia60502f2016-06-20 02:01:53 -07001429 if squash_mode == 'default':
1430 calls.extend([
1431 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1432 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1433 ])
1434 elif squash_mode in ('override_squash', 'override_nosquash'):
1435 calls.extend([
1436 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1437 'true' if squash_mode == 'override_squash' else 'false'),
1438 ])
1439 else:
1440 assert squash_mode in ('squash', 'nosquash')
1441
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001442 # If issue is given, then description is fetched from Gerrit instead.
1443 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001444 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001445 ((['git', 'log', '--pretty=format:%s\n\n%b',
1446 ((custom_cl_base + '..') if custom_cl_base else
1447 'fake_ancestor_sha..HEAD')],),
1448 description),
1449 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001450 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001451 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001452 else:
1453 if not title:
1454 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001455 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1456 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001457 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001458 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001459 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001460 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001461 (('DownloadGerritHook', False), ''),
1462 # Amending of commit message to get the Change-Id.
1463 ((['git', 'log', '--pretty=format:%s\n\n%b',
1464 determined_ancestor_revision + '..HEAD'],),
1465 description),
1466 ((['git', 'commit', '--amend', '-m', description],), ''),
1467 ((['git', 'log', '--pretty=format:%s\n\n%b',
1468 determined_ancestor_revision + '..HEAD'],),
1469 post_amend_description)
1470 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001471 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001472 if not issue:
1473 # Prompting to edit description on first upload.
1474 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001475 ((['git', 'config', 'core.editor'],), ''),
1476 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001477 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001478 ref_to_push = 'abcdef0123456789'
1479 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001480 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1481 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1482 ]
1483
1484 if custom_cl_base is None:
1485 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001486 ((['get_or_create_merge_base', 'master',
1487 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001488 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001489 ]
1490 parent = 'origin/master'
1491 else:
1492 calls += [
1493 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1494 'refs/remotes/origin/master'],),
1495 callError(1)), # Means not ancenstor.
1496 (('ask_for_data',
1497 'Do you take responsibility for cleaning up potential mess '
1498 'resulting from proceeding with upload? Press Enter to upload, '
1499 'or Ctrl+C to abort'), ''),
1500 ]
1501 parent = custom_cl_base
1502
1503 calls += [
1504 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1505 '0123456789abcdef'),
1506 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1507 '-m', description],),
1508 ref_to_push),
1509 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001510 else:
1511 ref_to_push = 'HEAD'
1512
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001513 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001514 ((['git', 'rev-list',
1515 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1516 ref_to_push],),
1517 '1hashPerLine\n'),
1518 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001519
Aaron Gable9b713dd2016-12-14 16:04:21 -08001520 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001521 if ref_suffix:
1522 ref_suffix += ',m=' + title
1523 else:
1524 ref_suffix = '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001525
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001526 notify_suffix = 'notify=NONE'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001527 if ref_suffix:
1528 ref_suffix += ',' + notify_suffix
1529 else:
1530 ref_suffix = '%' + notify_suffix
1531
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001532 if git_mirror is None:
1533 calls += [
1534 ((['git', 'config', 'remote.origin.url'],),
1535 'https://chromium.googlesource.com/yyy/zzz'),
1536 ]
1537 else:
1538 calls += [
1539 ((['git', 'config', 'remote.origin.url'],),
1540 '/cache/this-dir-exists'),
1541 (('os.path.isdir', '/cache/this-dir-exists'),
1542 True),
1543 # Runs in /cache/this-dir-exists.
1544 ((['git', 'config', 'remote.origin.url'],),
1545 'https://chromium.googlesource.com/yyy/zzz'),
1546 ]
1547
ukai@chromium.orge8077812012-02-03 03:41:46 +00001548 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001549 ((['git', 'push',
1550 'https://chromium.googlesource.com/yyy/zzz',
1551 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001552 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001553 'remote: Processing changes: (\)\n'
1554 'remote: Processing changes: (|)\n'
1555 'remote: Processing changes: (/)\n'
1556 'remote: Processing changes: (-)\n'
1557 'remote: Processing changes: new: 1 (/)\n'
1558 'remote: Processing changes: new: 1, done\n'
1559 'remote:\n'
1560 'remote: New Changes:\n'
1561 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1562 'remote:\n'
1563 'To https://chromium.googlesource.com/yyy/zzz\n'
1564 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001565 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001566 if squash:
1567 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001568 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001569 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001570 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001571 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001572 ((['git', 'config', 'branch.master.gerritsquashhash',
1573 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001574 ]
tandrii88189772016-09-29 04:29:57 -07001575 calls += [
1576 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001577 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001578 123456 if squash else None, sorted(reviewers),
1579 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001580 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001581 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001582 return calls
1583
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001584 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001585 self,
1586 upload_args,
1587 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001588 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001589 squash=True,
1590 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001591 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001592 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001593 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001594 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001595 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001596 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001597 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001598 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001599 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001600 other_cl_owner=None,
1601 custom_cl_base=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001602 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001603 if squash_mode is None:
1604 if '--no-squash' in upload_args:
1605 squash_mode = 'nosquash'
1606 elif '--squash' in upload_args:
1607 squash_mode = 'squash'
1608 else:
1609 squash_mode = 'default'
1610
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001611 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001612 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001613 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001614 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001615 CookiesAuthenticatorMockFactory(
1616 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001617 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1618 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001619 self.mock(git_cl.gclient_utils, 'RunEditor',
1620 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001621 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1622 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001623
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001624 original_os_path_isdir = os.path.isdir
1625 def selective_os_path_isdir_mock(path):
1626 if path == '/cache/this-dir-exists':
1627 return self._mocked_call('os.path.isdir', path)
1628 return original_os_path_isdir(path)
1629 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1630
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001631 self.calls = self._gerrit_base_calls(
1632 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001633 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001634 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001635 other_cl_owner=other_cl_owner,
1636 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001637 if fetched_status != 'ABANDONED':
1638 self.calls += self._gerrit_upload_calls(
1639 description, reviewers, squash,
1640 squash_mode=squash_mode,
1641 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001642 ref_suffix=ref_suffix, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001643 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001644 issue=issue, cc=cc, git_mirror=git_mirror,
1645 custom_cl_base=custom_cl_base)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001646 # Uncomment when debugging.
1647 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001648 git_cl.main(['upload'] + upload_args)
1649
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001650 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001651 self._run_gerrit_upload_test(
1652 ['--no-squash'],
1653 'desc\n\nBUG=\n',
1654 [],
1655 squash=False,
1656 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1657
1658 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001659 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001660 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001661 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001662 [],
tandriia60502f2016-06-20 02:01:53 -07001663 squash=False,
1664 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001665 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001666
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001667 def test_gerrit_no_reviewer(self):
1668 self._run_gerrit_upload_test(
1669 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001670 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001671 [],
1672 squash=False,
1673 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001674
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001675 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001676 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1677 self._run_gerrit_upload_test(
1678 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1679 'desc\n\nBUG=\n\nChange-Id: I123456789',
1680 squash=False,
1681 squash_mode='override_nosquash',
1682 title='Dont_put_bad_chars')
1683 self.assertIn(
1684 'WARNING: Patchset title may only contain alphanumeric chars '
1685 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1686 'Cleaned up title: Dont put bad chars\n',
1687 git_cl.sys.stdout.getvalue())
1688
ukai@chromium.orge8077812012-02-03 03:41:46 +00001689 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001690 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001691 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001692 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001693 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001694 squash=False,
1695 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001696 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001697
1698 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001699 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001700 [],
bradnelsond975b302016-10-23 12:20:23 -07001701 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1702 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001703 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001704 ['reviewer@example.com', 'another@example.com'],
1705 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001706 squash_mode='override_nosquash',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001707 ref_suffix='%l=Code-Review+1',
bradnelsond975b302016-10-23 12:20:23 -07001708 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001709
1710 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001711 self._run_gerrit_upload_test(
1712 [],
1713 'desc\nBUG=\n\nChange-Id: 123456789',
1714 [],
1715 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001716
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001717 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001718 self._run_gerrit_upload_test(
1719 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001720 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001721 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001722 squash=True,
1723 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001724
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001725 def test_gerrit_upload_squash_first_against_rev(self):
1726 custom_cl_base = 'custom_cl_base_rev_or_branch'
1727 self._run_gerrit_upload_test(
1728 ['--squash', custom_cl_base],
1729 'desc\nBUG=\n\nChange-Id: 123456789',
1730 [],
1731 squash=True,
1732 expected_upstream_ref='origin/master',
1733 custom_cl_base=custom_cl_base)
1734 self.assertIn(
1735 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1736 sys.stdout.getvalue())
1737
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001738 def test_gerrit_upload_squash_first_with_mirror(self):
1739 self._run_gerrit_upload_test(
1740 ['--squash'],
1741 'desc\nBUG=\n\nChange-Id: 123456789',
1742 [],
1743 squash=True,
1744 expected_upstream_ref='origin/master',
1745 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1746
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001747 def test_gerrit_upload_squash_reupload(self):
1748 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001749 self._run_gerrit_upload_test(
1750 ['--squash'],
1751 description,
1752 [],
1753 squash=True,
1754 expected_upstream_ref='origin/master',
1755 issue=123456)
1756
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001757 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1758 self.mock(git_cl, 'DieWithError',
1759 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1760 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1761 with self.assertRaises(SystemExitMock):
1762 self._run_gerrit_upload_test(
1763 ['--squash'],
1764 description,
1765 [],
1766 squash=True,
1767 expected_upstream_ref='origin/master',
1768 issue=123456,
1769 fetched_status='ABANDONED')
1770
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001771 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1772 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1773 lambda *_, **__: {'email': 'yet-another@example.com'})
1774 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1775 self._run_gerrit_upload_test(
1776 ['--squash'],
1777 description,
1778 [],
1779 squash=True,
1780 expected_upstream_ref='origin/master',
1781 issue=123456,
1782 other_cl_owner='other@example.com')
1783 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001784 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001785 'authenticate to Gerrit as yet-another@example.com.\n'
1786 'Uploading may fail due to lack of permissions',
1787 git_cl.sys.stdout.getvalue())
1788
rmistry@google.com2dd99862015-06-22 12:22:18 +00001789 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001790 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001791 def mock_run_git(*args, **_kwargs):
1792 if args[0] == ['for-each-ref',
1793 '--format=%(refname:short) %(upstream:short)',
1794 'refs/heads']:
1795 # Create a local branch dependency tree that looks like this:
1796 # test1 -> test2 -> test3 -> test4 -> test5
1797 # -> test3.1
1798 # test6 -> test0
1799 branch_deps = [
1800 'test2 test1', # test1 -> test2
1801 'test3 test2', # test2 -> test3
1802 'test3.1 test2', # test2 -> test3.1
1803 'test4 test3', # test3 -> test4
1804 'test5 test4', # test4 -> test5
1805 'test6 test0', # test0 -> test6
1806 'test7', # test7
1807 ]
1808 return '\n'.join(branch_deps)
1809 self.mock(git_cl, 'RunGit', mock_run_git)
1810
1811 class RecordCalls:
1812 times_called = 0
1813 record_calls = RecordCalls()
1814 def mock_CMDupload(*args, **_kwargs):
1815 record_calls.times_called += 1
1816 return 0
1817 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1818
1819 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001820 (('ask_for_data', 'This command will checkout all dependent branches '
1821 'and run "git cl upload". Press Enter to continue, '
1822 'or Ctrl+C to abort'), ''),
1823 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001824
1825 class MockChangelist():
1826 def __init__(self):
1827 pass
1828 def GetBranch(self):
1829 return 'test1'
1830 def GetIssue(self):
1831 return '123'
1832 def GetPatchset(self):
1833 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001834 def IsGerrit(self):
1835 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001836
1837 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1838 # CMDupload should have been called 5 times because of 5 dependent branches.
1839 self.assertEquals(5, record_calls.times_called)
1840 self.assertEquals(0, ret)
1841
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001842 def test_gerrit_change_id(self):
1843 self.calls = [
1844 ((['git', 'write-tree'], ),
1845 'hashtree'),
1846 ((['git', 'rev-parse', 'HEAD~0'], ),
1847 'branch-parent'),
1848 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1849 'A B <a@b.org> 1456848326 +0100'),
1850 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1851 'C D <c@d.org> 1456858326 +0100'),
1852 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1853 'hashchange'),
1854 ]
1855 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1856 self.assertEqual(change_id, 'Ihashchange')
1857
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001858 def test_desecription_append_footer(self):
1859 for init_desc, footer_line, expected_desc in [
1860 # Use unique desc first lines for easy test failure identification.
1861 ('foo', 'R=one', 'foo\n\nR=one'),
1862 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1863 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1864 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1865 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1866 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1867 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1868 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1869 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1870 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1871 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1872 ]:
1873 desc = git_cl.ChangeDescription(init_desc)
1874 desc.append_footer(footer_line)
1875 self.assertEqual(desc.description, expected_desc)
1876
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001877 def test_update_reviewers(self):
1878 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001879 ('foo', [], [],
1880 'foo'),
1881 ('foo\nR=xx', [], [],
1882 'foo\nR=xx'),
1883 ('foo\nTBR=xx', [], [],
1884 'foo\nTBR=xx'),
1885 ('foo', ['a@c'], [],
1886 'foo\n\nR=a@c'),
1887 ('foo\nR=xx', ['a@c'], [],
1888 'foo\n\nR=a@c, xx'),
1889 ('foo\nTBR=xx', ['a@c'], [],
1890 'foo\n\nR=a@c\nTBR=xx'),
1891 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1892 'foo\n\nR=a@c, yy\nTBR=xx'),
1893 ('foo\nBUG=', ['a@c'], [],
1894 'foo\nBUG=\nR=a@c'),
1895 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1896 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1897 ('foo', ['a@c', 'b@c'], [],
1898 'foo\n\nR=a@c, b@c'),
1899 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1900 'foo\nBar\n\nR=c@c\nBUG='),
1901 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1902 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001903 # Same as the line before, but full of whitespaces.
1904 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001905 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001906 'foo\nBar\n\nR=c@c\n BUG =',
1907 ),
1908 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001909 ('foo BUG=allo R=joe ', ['c@c'], [],
1910 'foo BUG=allo R=joe\n\nR=c@c'),
1911 # Redundant TBRs get promoted to Rs
1912 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1913 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001914 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001915 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001916 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001917 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001918 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001919 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001920 actual.append(obj.description)
1921 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001922
wittman@chromium.org455dc922015-01-26 20:15:50 +00001923 def test_get_target_ref(self):
1924 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001925 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001926 self.assertEqual(None, git_cl.GetTargetRef(None,
1927 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001928 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001929
wittman@chromium.org455dc922015-01-26 20:15:50 +00001930 # Check default target refs for branches.
1931 self.assertEqual('refs/heads/master',
1932 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001933 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001934 self.assertEqual('refs/heads/master',
1935 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001936 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001937 self.assertEqual('refs/heads/master',
1938 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001939 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001940 self.assertEqual('refs/branch-heads/123',
1941 git_cl.GetTargetRef('origin',
1942 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001943 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001944 self.assertEqual('refs/diff/test',
1945 git_cl.GetTargetRef('origin',
1946 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001947 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001948 self.assertEqual('refs/heads/chrome/m42',
1949 git_cl.GetTargetRef('origin',
1950 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001951 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001952
1953 # Check target refs for user-specified target branch.
1954 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1955 'refs/remotes/branch-heads/123'):
1956 self.assertEqual('refs/branch-heads/123',
1957 git_cl.GetTargetRef('origin',
1958 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001959 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001960 for branch in ('origin/master', 'remotes/origin/master',
1961 'refs/remotes/origin/master'):
1962 self.assertEqual('refs/heads/master',
1963 git_cl.GetTargetRef('origin',
1964 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001965 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001966 for branch in ('master', 'heads/master', 'refs/heads/master'):
1967 self.assertEqual('refs/heads/master',
1968 git_cl.GetTargetRef('origin',
1969 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001970 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001971
wychen@chromium.orga872e752015-04-28 23:42:18 +00001972 def test_patch_when_dirty(self):
1973 # Patch when local tree is dirty
1974 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1975 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1976
1977 def test_diff_when_dirty(self):
1978 # Do 'git cl diff' when local tree is dirty
1979 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1980 self.assertNotEqual(git_cl.main(['diff']), 0)
1981
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001982 @staticmethod
1983 def _get_gerrit_codereview_server_calls(branch, value=None,
1984 git_short_host='host',
1985 detect_branch=True):
1986 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1987
1988 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1989 """
1990 calls = []
1991 if detect_branch:
1992 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1993 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1994 CERR1 if value is None else value))
1995 if value is None:
1996 calls += [
1997 ((['git', 'config', 'branch.' + branch + '.merge'],),
1998 'refs/heads' + branch),
1999 ((['git', 'config', 'branch.' + branch + '.remote'],),
2000 'origin'),
2001 ((['git', 'config', 'remote.origin.url'],),
2002 'https://%s.googlesource.com/my/repo' % git_short_host),
2003 ]
2004 return calls
2005
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002006 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002007 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002008 detect_gerrit_server=True,
2009 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002010 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002011 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2012 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002013 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002014 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002015 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2016
tandriidf09a462016-08-18 16:23:55 -07002017 if new_branch:
2018 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2019 else:
2020 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002021
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002022 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002023 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002024 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002025 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002026 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2027 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2028 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2029 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002030 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002031 if default_codereview == 'gerrit':
2032 if not force_codereview:
2033 self.calls += [
2034 ((['git', 'config', 'gerrit.host'],), 'true'),
2035 ]
2036 if detect_gerrit_server:
2037 self.calls += self._get_gerrit_codereview_server_calls(
2038 'master', git_short_host=git_short_host,
2039 detect_branch=not new_branch and force_codereview)
2040 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002041
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002042 elif default_codereview == 'rietveld':
2043 self.calls += [
2044 ((['git', 'config', 'gerrit.host'],), CERR1),
2045 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2046 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2047 ]
2048 actual_codereview = 'rietveld'
2049
2050 if actual_codereview == 'rietveld':
2051 self.calls += [
2052 ((['git', 'rev-parse', '--show-cdup'],), ''),
2053 ]
2054 if not default_codereview:
2055 self.calls += [
2056 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2057 ]
2058 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002059 self.calls += [
2060 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002061 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002062 {
2063 'current_revision': '7777777777',
2064 'revisions': {
2065 '1111111111': {
2066 '_number': 1,
2067 'fetch': {'http': {
2068 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2069 'ref': 'refs/changes/56/123456/1',
2070 }},
2071 },
2072 '7777777777': {
2073 '_number': 7,
2074 'fetch': {'http': {
2075 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2076 'ref': 'refs/changes/56/123456/7',
2077 }},
2078 },
2079 },
2080 }),
2081 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002082
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002083 def _common_patch_rietveld_successful(self, **kwargs):
2084 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002085 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002086 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002087 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002088 ((['git', 'config', 'branch.master.rietveldserver',
2089 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002090 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002091 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002092 ((['git', 'commit', '-m',
2093 'Description\n\n' +
2094 'patch from issue 123456 at patchset 60001 ' +
2095 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002096 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002097
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002098 def test_patch_rietveld_default(self):
2099 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002100 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2101
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002102 def test_patch_rietveld_successful_new_branch(self):
2103 self._common_patch_rietveld_successful(default_codereview='rietveld',
2104 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002105 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2106
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002107 def test_patch_rietveld_guess_by_url(self):
2108 self._common_patch_rietveld_successful(
2109 default_codereview=None, # It doesn't matter.
2110 actual_codereview='rietveld')
2111 self.assertEqual(git_cl.main(
2112 ['patch', 'https://codereview.example.com/123456']), 0)
2113
2114 def test_patch_rietveld_conflict(self):
2115 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002116 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002117 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002118
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002119 def test_patch_gerrit_default(self):
2120 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002121 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002122 self.calls += [
2123 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2124 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002125 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002126 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002127 ((['git', 'config', 'branch.master.gerritserver',
2128 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002129 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002130 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002131 ]
2132 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2133
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002134 def test_patch_gerrit_force(self):
2135 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002136 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002137 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002138 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002139 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002140 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002141 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002142 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002143 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002144 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002145 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002146 ]
2147 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2148
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002149 def test_patch_gerrit_guess_by_url(self):
2150 self._patch_common(
2151 default_codereview=None, # It doesn't matter what's default.
2152 actual_codereview='gerrit',
2153 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002155 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002156 'refs/changes/56/123456/1'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002157 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002158 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002159 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002160 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002161 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002162 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002163 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 ]
2165 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002166 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002167
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002168 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2169 self._patch_common(
2170 default_codereview=None, # It doesn't matter what's default.
2171 actual_codereview='gerrit',
2172 git_short_host='else', detect_gerrit_server=False)
2173 self.calls += [
2174 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2175 'refs/changes/56/123456/1'],), ''),
2176 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2177 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2178 ''),
2179 ((['git', 'config', 'branch.master.gerritserver',
2180 'https://else-review.googlesource.com'],), ''),
2181 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2182 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2183 ]
2184 self.assertEqual(git_cl.main(
2185 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2186
2187 def test_patch_gerrit_conflict(self):
2188 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002189 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002190 self.calls += [
2191 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002192 'refs/changes/56/123456/7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002193 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2194 ''),
2195 ((['git', 'config', 'branch.master.gerritserver',
2196 'https://chromium-review.googlesource.com'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002197 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002198 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2199 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2200 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201 ]
2202 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002203 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002204
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002205 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002206 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002207 raise git_cl.gerrit_util.GerritError(404, '')
2208 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2209
tandriic2405f52016-10-10 08:13:15 -07002210 self.calls = [
2211 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2212 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2213 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2214 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2215 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2216 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002217 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2218 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2219 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2220 ((['git', 'config', 'remote.origin.url'],),
2221 'https://chromium.googlesource.com/my/repo'),
2222 ((['DieWithError',
2223 'change 123456 at https://chromium-review.googlesource.com does not '
2224 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002225 ]
2226 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002227 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002228
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002229 def _checkout_calls(self):
2230 return [
2231 ((['git', 'config', '--local', '--get-regexp',
2232 'branch\\..*\\.rietveldissue'], ),
2233 ('branch.retrying.rietveldissue 1111111111\n'
2234 'branch.some-fix.rietveldissue 2222222222\n')),
2235 ((['git', 'config', '--local', '--get-regexp',
2236 'branch\\..*\\.gerritissue'], ),
2237 ('branch.ger-branch.gerritissue 123456\n'
2238 'branch.gbranch654.gerritissue 654321\n')),
2239 ]
2240
2241 def test_checkout_gerrit(self):
2242 """Tests git cl checkout <issue>."""
2243 self.calls = self._checkout_calls()
2244 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2245 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2246
2247 def test_checkout_rietveld(self):
2248 """Tests git cl checkout <issue>."""
2249 self.calls = self._checkout_calls()
2250 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2251 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2252
2253 def test_checkout_not_found(self):
2254 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002255 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002256 self.calls = self._checkout_calls()
2257 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2258
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002259 def test_checkout_no_branch_issues(self):
2260 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002261 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002262 self.calls = [
2263 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002264 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002265 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002266 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002267 ]
2268 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2269
tandrii@chromium.org28253532016-04-14 13:46:56 +00002270 def _test_gerrit_ensure_authenticated_common(self, auth,
2271 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002272 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2273 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2274 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002275 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002276 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002277 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002278 cl.branch = 'master'
2279 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002280 cl.lookedup_issue = True
2281 return cl
2282
2283 def test_gerrit_ensure_authenticated_missing(self):
2284 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002285 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002286 })
2287 self.calls.append(
2288 ((['DieWithError',
2289 'Credentials for the following hosts are required:\n'
2290 ' chromium-review.googlesource.com\n'
2291 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002292 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002293 'https://chromium-review.googlesource.com/new-password'],), ''),)
2294 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2295
2296 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002297 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002298 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002299 'chromium.googlesource.com':
2300 ('git-one.example.com', None, 'secret1'),
2301 'chromium-review.googlesource.com':
2302 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002303 })
2304 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002305 (('ask_for_data', 'If you know what you are doing '
2306 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002307 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2308
2309 def test_gerrit_ensure_authenticated_ok(self):
2310 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002311 'chromium.googlesource.com':
2312 ('git-same.example.com', None, 'secret'),
2313 'chromium-review.googlesource.com':
2314 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002315 })
2316 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2317
tandrii@chromium.org28253532016-04-14 13:46:56 +00002318 def test_gerrit_ensure_authenticated_skipped(self):
2319 cl = self._test_gerrit_ensure_authenticated_common(
2320 auth={}, skip_auth_check=True)
2321 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2322
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002323 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002324 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2325 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002326 self.calls = [
2327 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002328 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002329 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2330 ((['git', 'config', 'rietveld.server'],), ''),
2331 ((['git', 'config', 'rietveld.server'],), ''),
2332 ((['git', 'config', 'branch.feature.rietveldserver'],),
2333 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002334 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002335 ]
2336 self.assertEqual(0, git_cl.main(['set-commit']))
2337
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002338 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002339 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002340 lambda h, i, labels, notify=None:
2341 self._mocked_call(['SetReview', h, i, labels, notify]))
2342
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002343 self.calls = [
2344 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002345 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2346 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002347 ((['git', 'config', 'branch.feature.gerritserver'],),
2348 'https://chromium-review.googlesource.com'),
2349 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002350 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002351 ]
tandriid9e5ce52016-07-13 02:32:59 -07002352
2353 def test_cmd_set_commit_gerrit_clear(self):
2354 self._cmd_set_commit_gerrit_common(0)
2355 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2356
2357 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002358 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002359 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2360
tandriid9e5ce52016-07-13 02:32:59 -07002361 def test_cmd_set_commit_gerrit(self):
2362 self._cmd_set_commit_gerrit_common(2)
2363 self.assertEqual(0, git_cl.main(['set-commit']))
2364
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002365 def test_description_display(self):
2366 out = StringIO.StringIO()
2367 self.mock(git_cl.sys, 'stdout', out)
2368
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002369 self.mock(git_cl, 'Changelist', ChangelistMock)
2370 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002371
2372 self.assertEqual(0, git_cl.main(['description', '-d']))
2373 self.assertEqual('foo\n', out.getvalue())
2374
2375 def test_description_rietveld(self):
2376 out = StringIO.StringIO()
2377 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002378 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002379
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002380 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002381 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002382 self.assertEqual('foobar\n', out.getvalue())
2383
iannucci3c972b92016-08-17 13:24:10 -07002384 def test_StatusFieldOverrideIssueMissingArgs(self):
2385 out = StringIO.StringIO()
2386 self.mock(git_cl.sys, 'stderr', out)
2387
2388 try:
2389 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2390 except SystemExit as ex:
2391 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002392 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002393
2394 out = StringIO.StringIO()
2395 self.mock(git_cl.sys, 'stderr', out)
2396
2397 try:
2398 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2399 except SystemExit as ex:
2400 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002401 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002402
2403 def test_StatusFieldOverrideIssue(self):
2404 out = StringIO.StringIO()
2405 self.mock(git_cl.sys, 'stdout', out)
2406
2407 def assertIssue(cl_self, *_args):
2408 self.assertEquals(cl_self.issue, 1)
2409 return 'foobar'
2410
2411 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2412 self.calls = [
2413 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2414 ((['git', 'config', 'rietveld.server'],), ''),
2415 ((['git', 'config', 'rietveld.server'],), ''),
2416 ]
iannuccie53c9352016-08-17 14:40:40 -07002417 self.assertEqual(
2418 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2419 0)
iannucci3c972b92016-08-17 13:24:10 -07002420 self.assertEqual(out.getvalue(), 'foobar\n')
2421
iannuccie53c9352016-08-17 14:40:40 -07002422 def test_SetCloseOverrideIssue(self):
2423 def assertIssue(cl_self, *_args):
2424 self.assertEquals(cl_self.issue, 1)
2425 return 'foobar'
2426
2427 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2428 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2429 self.calls = [
2430 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2431 ((['git', 'config', 'rietveld.server'],), ''),
2432 ((['git', 'config', 'rietveld.server'],), ''),
2433 ]
2434 self.assertEqual(
2435 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2436
2437 def test_SetCommitOverrideIssue(self):
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.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2444 self.calls = [
2445 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2446 ((['git', 'config', 'rietveld.server'],), ''),
2447 ((['git', 'config', 'rietveld.server'],), ''),
2448 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2449 ((['git', 'config', 'rietveld.server'],), ''),
2450 ((['git', 'config', 'rietveld.server'],), ''),
2451 ]
2452 self.assertEqual(
2453 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2454
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002455 def test_description_gerrit(self):
2456 out = StringIO.StringIO()
2457 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002458 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002459 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002460 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2461 {
2462 'current_revision': 'sha1',
2463 'revisions': {'sha1': {
2464 'commit': {'message': 'foobar'},
2465 }},
2466 }),
2467 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002468 self.assertEqual(0, git_cl.main([
2469 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2470 self.assertEqual('foobar\n', out.getvalue())
2471
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002472 def test_description_set_raw(self):
2473 out = StringIO.StringIO()
2474 self.mock(git_cl.sys, 'stdout', out)
2475
2476 self.mock(git_cl, 'Changelist', ChangelistMock)
2477 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2478
2479 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2480 self.assertEqual('hihi', ChangelistMock.desc)
2481
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002482 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002483 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002484
2485 def RunEditor(desc, _, **kwargs):
2486 self.assertEquals(
2487 '# Enter a description of the change.\n'
2488 '# This will be displayed on the codereview site.\n'
2489 '# The first line will also be used as the subject of the review.\n'
2490 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002491 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002492 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002493 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002494 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002495 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002496
dsansomee2d6fd92016-09-08 00:10:47 -07002497 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002498 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002499
2500 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2501 self.mock(git_cl.Changelist, 'GetDescription',
2502 lambda *args: current_desc)
2503 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2504 UpdateDescriptionRemote)
2505 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2506
2507 self.calls = [
2508 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002509 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002510 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2511 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002512 ((['git', 'config', 'core.editor'],), 'vi'),
2513 ]
2514 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2515
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002516 def test_description_set_stdin(self):
2517 out = StringIO.StringIO()
2518 self.mock(git_cl.sys, 'stdout', out)
2519
2520 self.mock(git_cl, 'Changelist', ChangelistMock)
2521 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2522
2523 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2524 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2525
kmarshall3bff56b2016-06-06 18:31:47 -07002526 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002527 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2528
kmarshall3bff56b2016-06-06 18:31:47 -07002529 self.calls = \
2530 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2531 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002532 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002533 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2534 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002535 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2536 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2537 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002538 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2539 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2540 ((['git', 'branch', '-D', 'foo'],), '')]
2541
kmarshall3bff56b2016-06-06 18:31:47 -07002542 self.mock(git_cl, 'get_cl_statuses',
2543 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002544 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2545 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2546 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002547
2548 self.assertEqual(0, git_cl.main(['archive', '-f']))
2549
2550 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002551 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002552 self.calls = \
2553 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2554 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002555 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002556 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2557 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002558 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2559
kmarshall9249e012016-08-23 12:02:16 -07002560 self.mock(git_cl, 'get_cl_statuses',
2561 lambda branches, fine_grained, max_processes:
2562 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2563
2564 self.assertEqual(1, git_cl.main(['archive', '-f']))
2565
2566 def test_archive_dry_run(self):
2567 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2568
2569 self.calls = \
2570 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2571 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2572 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2573 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2574 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2575 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2576 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2577 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2578 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002579
2580 self.mock(git_cl, 'get_cl_statuses',
2581 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002582 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2583 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2584 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002585
kmarshall9249e012016-08-23 12:02:16 -07002586 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2587
2588 def test_archive_no_tags(self):
2589 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2590
2591 self.calls = \
2592 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2593 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2594 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2595 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2596 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2597 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2598 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2599 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2600 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2601 ((['git', 'branch', '-D', 'foo'],), '')]
2602
2603 self.mock(git_cl, 'get_cl_statuses',
2604 lambda branches, fine_grained, max_processes:
2605 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2606 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2607 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2608
2609 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002610
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002611 def test_cmd_issue_erase_existing(self):
2612 out = StringIO.StringIO()
2613 self.mock(git_cl.sys, 'stdout', out)
2614 self.calls = [
2615 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002616 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2617 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002618 # Let this command raise exception (retcode=1) - it should be ignored.
2619 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002620 CERR1),
2621 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2622 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002623 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2624 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2625 ''),
2626 ]
2627 self.assertEqual(0, git_cl.main(['issue', '0']))
2628
phajdan.jre328cf92016-08-22 04:12:17 -07002629 def test_cmd_issue_json(self):
2630 out = StringIO.StringIO()
2631 self.mock(git_cl.sys, 'stdout', out)
2632 self.calls = [
2633 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002634 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002635 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2636 ((['git', 'config', 'rietveld.server'],),
2637 'https://codereview.chromium.org'),
2638 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2639 (('write_json', 'output.json',
2640 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2641 ''),
2642 ]
2643 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2644
tandriide281ae2016-10-12 06:02:30 -07002645 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002646 self.mock(git_cl.Changelist, 'GetChange',
2647 lambda _, *a: (
2648 self._mocked_call(['GetChange']+list(a))))
2649 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2650 lambda *_, **__: (
2651 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002652 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2653 lambda _, s: self._mocked_call(['SetCQState', s]))
2654 self.calls = [
2655 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002656 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002657 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2658 ((['git', 'config', 'rietveld.server'],),
2659 'https://codereview.chromium.org'),
2660 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2661 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2662 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2663 ((['get_or_create_merge_base', 'feature', 'feature'],),
2664 'fake_ancestor_sha'),
2665 ((['GetChange', 'fake_ancestor_sha', None], ),
2666 git_cl.presubmit_support.GitChange(
2667 '', '', '', '', '', '', '', '')),
2668 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2669 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002670 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2671 ]
2672 out = StringIO.StringIO()
2673 self.mock(git_cl.sys, 'stdout', out)
2674 self.assertEqual(0, git_cl.main(['try']))
2675 self.assertEqual(
2676 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002677 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002678
tandrii8c5a3532016-11-04 07:52:02 -07002679 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2680 self.mock(git_cl.Changelist, 'GetChange',
2681 lambda _, *a: (
2682 self._mocked_call(['GetChange']+list(a))))
2683 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2684 lambda *_, **__: (
2685 self._mocked_call(['DoGetTryMasters'])))
2686 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2687 lambda _, s: self._mocked_call(['SetCQState', s]))
2688
tandrii8c5a3532016-11-04 07:52:02 -07002689 self.calls = [
2690 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2691 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2692 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2693 ((['git', 'config', 'branch.feature.gerritserver'],),
2694 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002695 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2696 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2697 'project': 'depot_tools',
2698 'status': 'OPEN',
2699 'owner': {'email': 'owner@e.mail'},
2700 'revisions': {
2701 'deadbeaf': {
2702 '_number': 6,
2703 },
2704 'beeeeeef': {
2705 '_number': 7,
2706 'fetch': {'http': {
2707 'url': 'https://chromium.googlesource.com/depot_tools',
2708 'ref': 'refs/changes/56/123456/7'
2709 }},
2710 },
2711 },
2712 }),
tandrii8c5a3532016-11-04 07:52:02 -07002713 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2714 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2715 ((['get_or_create_merge_base', 'feature', 'feature'],),
2716 'fake_ancestor_sha'),
2717 ((['GetChange', 'fake_ancestor_sha', None], ),
2718 git_cl.presubmit_support.GitChange(
2719 '', '', '', '', '', '', '', '')),
2720 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2721 ((['DoGetTryMasters'], ), None),
2722 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2723 ]
2724 out = StringIO.StringIO()
2725 self.mock(git_cl.sys, 'stdout', out)
2726 self.assertEqual(0, git_cl.main(['try']))
2727 self.assertEqual(
2728 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002729 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002730 'https://chromium-review.googlesource.com/123456\n')
2731
2732 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2733 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2734 lambda _: {
2735 'owner_email': 'owner@e.mail',
2736 'private': False,
2737 'closed': False,
2738 'project': 'depot_tools',
2739 'patchsets': [20001],
2740 })
tandriide281ae2016-10-12 06:02:30 -07002741 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2742 self.calls = [
2743 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2744 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2745 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2746 ((['git', 'config', 'rietveld.server'],),
2747 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002748 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002749 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002750 ]
2751
2752 def _buildbucket_retry(*_, **kw):
2753 # self.maxDiff = 10000
2754 body = json.loads(kw['body'])
2755 self.assertEqual(len(body['builds']), 1)
2756 build = body['builds'][0]
2757 params = json.loads(build.pop('parameters_json'))
2758 self.assertEqual(params, {
2759 u'builder_name': u'win',
2760 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2761 u'revision': None}],
2762 u'properties': {
2763 u'category': u'git_cl_try',
2764 u'issue': 123,
2765 u'key': u'val',
2766 u'json': [{u'a': 1}, None],
2767 u'master': u'tryserver.chromium',
2768 u'patch_project': u'depot_tools',
2769 u'patch_storage': u'rietveld',
2770 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002771 u'rietveld': u'https://codereview.chromium.org',
2772 }
2773 })
2774 self.assertEqual(build, {
2775 u'bucket': u'master.tryserver.chromium',
2776 u'client_operation_id': u'uuid4',
2777 u'tags': [u'builder:win',
2778 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002779 u'user_agent:git_cl_try',
2780 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002781 })
2782
2783 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2784
2785 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2786 self.assertEqual(0, git_cl.main([
2787 'try', '-m', 'tryserver.chromium', '-b', 'win',
2788 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2789 self.assertRegexpMatches(
2790 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002791 'Tried jobs on:\nBucket: master.tryserver.chromium')
2792
tandrii8c5a3532016-11-04 07:52:02 -07002793 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2794 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2795 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2796
tandrii8c5a3532016-11-04 07:52:02 -07002797 self.calls = [
2798 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2799 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2800 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2801 ((['git', 'config', 'branch.feature.gerritserver'],),
2802 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002803 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002804 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002805 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002806 'status': 'OPEN',
2807 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002808 'revisions': {
2809 'deadbeaf': {
2810 '_number': 6,
2811 },
2812 'beeeeeef': {
2813 '_number': 7,
2814 'fetch': {'http': {
2815 'url': 'https://chromium.googlesource.com/depot_tools',
2816 'ref': 'refs/changes/56/123456/7'
2817 }},
2818 },
2819 },
2820 }),
2821 ]
2822
2823 def _buildbucket_retry(*_, **kw):
2824 # self.maxDiff = 10000
2825 body = json.loads(kw['body'])
2826 self.assertEqual(len(body['builds']), 1)
2827 build = body['builds'][0]
2828 params = json.loads(build.pop('parameters_json'))
2829 self.assertEqual(params, {
2830 u'builder_name': u'win',
2831 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2832 u'revision': None}],
2833 u'properties': {
2834 u'category': u'git_cl_try',
2835 u'key': u'val',
2836 u'json': [{u'a': 1}, None],
2837 u'master': u'tryserver.chromium',
2838
2839 u'patch_gerrit_url':
2840 u'https://chromium-review.googlesource.com',
2841 u'patch_issue': 123456,
2842 u'patch_project': u'depot_tools',
2843 u'patch_ref': u'refs/changes/56/123456/7',
2844 u'patch_repository_url':
2845 u'https://chromium.googlesource.com/depot_tools',
2846 u'patch_set': 7,
2847 u'patch_storage': u'gerrit',
2848 }
2849 })
2850 self.assertEqual(build, {
2851 u'bucket': u'master.tryserver.chromium',
2852 u'client_operation_id': u'uuid4',
2853 u'tags': [
2854 u'builder:win',
2855 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2856 u'user_agent:git_cl_try',
2857 u'master:tryserver.chromium'],
2858 })
2859
2860 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2861
2862 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2863 self.assertEqual(0, git_cl.main([
2864 'try', '-m', 'tryserver.chromium', '-b', 'win',
2865 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2866 self.assertRegexpMatches(
2867 git_cl.sys.stdout.getvalue(),
2868 'Tried jobs on:\nBucket: master.tryserver.chromium')
2869
borenet6c0efe62016-10-19 08:13:29 -07002870 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002871 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2872 lambda _: {
2873 'owner_email': 'owner@e.mail',
2874 'private': False,
2875 'closed': False,
2876 'project': 'depot_tools',
2877 'patchsets': [20001],
2878 })
borenet6c0efe62016-10-19 08:13:29 -07002879 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2880 self.calls = [
2881 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2882 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2883 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2884 ((['git', 'config', 'rietveld.server'],),
2885 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002886 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002887 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002888 ]
2889
2890 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002891 body = json.loads(kw['body'])
2892 self.assertEqual(len(body['builds']), 1)
2893 build = body['builds'][0]
2894 params = json.loads(build.pop('parameters_json'))
2895 self.assertEqual(params, {
2896 u'builder_name': u'win',
2897 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2898 u'revision': None}],
2899 u'properties': {
2900 u'category': u'git_cl_try',
2901 u'issue': 123,
2902 u'patch_project': u'depot_tools',
2903 u'patch_storage': u'rietveld',
2904 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002905 u'rietveld': u'https://codereview.chromium.org',
2906 }
2907 })
2908 self.assertEqual(build, {
2909 u'bucket': u'test.bucket',
2910 u'client_operation_id': u'uuid4',
2911 u'tags': [u'builder:win',
2912 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2913 u'user_agent:git_cl_try'],
2914 })
2915
2916 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2917
2918 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2919 self.assertEqual(0, git_cl.main([
2920 'try', '-B', 'test.bucket', '-b', 'win']))
2921 self.assertRegexpMatches(
2922 git_cl.sys.stdout.getvalue(),
2923 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002924
qyearsley123a4682016-10-26 09:12:17 -07002925 def test_git_cl_try_bots_on_multiple_masters(self):
2926 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2927 self.calls = [
2928 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2929 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2930 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2931 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002932 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002933 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2934 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2935 ]
2936
2937 def _buildbucket_retry(*_, **kw):
2938 body = json.loads(kw['body'])
2939 self.assertEqual(len(body['builds']), 2)
2940
2941 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2942 self.assertEqual(first_build_params['builder_name'], 'builder1')
2943 self.assertEqual(first_build_params['properties']['master'], 'master1')
2944
2945 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2946 self.assertEqual(first_build_params['builder_name'], 'builder2')
2947 self.assertEqual(first_build_params['properties']['master'], 'master2')
2948
2949 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2950
2951 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2952 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2953
2954 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2955 self.assertEqual(
2956 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2957 self.assertEqual(
2958 git_cl.sys.stdout.getvalue(),
2959 'Tried jobs on:\n'
2960 'Bucket: master.master1\n'
2961 ' builder1: []\n'
2962 'Bucket: master.master2\n'
2963 ' builder2: []\n'
2964 'To see results here, run: git cl try-results\n'
2965 'To see results in browser, run: git cl web\n')
2966
tandrii16e0b4e2016-06-07 10:34:28 -07002967 def _common_GerritCommitMsgHookCheck(self):
2968 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2969 self.mock(git_cl.os.path, 'abspath',
2970 lambda path: self._mocked_call(['abspath', path]))
2971 self.mock(git_cl.os.path, 'exists',
2972 lambda path: self._mocked_call(['exists', path]))
2973 self.mock(git_cl.gclient_utils, 'FileRead',
2974 lambda path: self._mocked_call(['FileRead', path]))
2975 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2976 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2977 self.calls = [
2978 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2979 ((['abspath', '../'],), '/abs/git_repo_root'),
2980 ]
2981 return git_cl.Changelist(codereview='gerrit', issue=123)
2982
2983 def test_GerritCommitMsgHookCheck_custom_hook(self):
2984 cl = self._common_GerritCommitMsgHookCheck()
2985 self.calls += [
2986 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2987 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2988 '#!/bin/sh\necho "custom hook"')
2989 ]
2990 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2991
2992 def test_GerritCommitMsgHookCheck_not_exists(self):
2993 cl = self._common_GerritCommitMsgHookCheck()
2994 self.calls += [
2995 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2996 ]
2997 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2998
2999 def test_GerritCommitMsgHookCheck(self):
3000 cl = self._common_GerritCommitMsgHookCheck()
3001 self.calls += [
3002 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3003 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3004 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003005 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003006 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3007 ''),
3008 ]
3009 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3010
tandriic4344b52016-08-29 06:04:54 -07003011 def test_GerritCmdLand(self):
3012 self.calls += [
3013 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3014 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3015 'deadbeaf'),
3016 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3017 ((['git', 'config', 'branch.feature.gerritserver'],),
3018 'chromium-review.googlesource.com'),
3019 ]
3020 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3021 cl._codereview_impl._GetChangeDetail = lambda _: {
3022 'labels': {},
3023 'current_revision': 'deadbeaf',
3024 }
agable32978d92016-11-01 12:55:02 -07003025 cl._codereview_impl._GetChangeCommit = lambda: {
3026 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003027 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003028 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3029 }
tandriic4344b52016-08-29 06:04:54 -07003030 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003031 out = StringIO.StringIO()
3032 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003033 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003034 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003035 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003036
tandrii221ab252016-10-06 08:12:04 -07003037 BUILDBUCKET_BUILDS_MAP = {
3038 '9000': {
3039 'id': '9000',
3040 'status': 'STARTED',
3041 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3042 'result_details_json': '{"properties": {}}',
3043 'bucket': 'master.x.y',
3044 'created_by': 'user:someone@chromium.org',
3045 'created_ts': '147200002222000',
3046 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3047 },
3048 '8000': {
3049 'id': '8000',
3050 'status': 'COMPLETED',
3051 'result': 'FAILURE',
3052 'failure_reason': 'BUILD_FAILURE',
3053 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3054 'result_details_json': '{"properties": {}}',
3055 'bucket': 'master.x.y',
3056 'created_by': 'user:someone@chromium.org',
3057 'created_ts': '147200001111000',
3058 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3059 },
3060 }
3061
3062 def test_write_try_results_json(self):
3063 expected_output = [
3064 {
3065 'buildbucket_id': '8000',
3066 'bucket': 'master.x.y',
3067 'builder_name': 'my-builder',
3068 'status': 'COMPLETED',
3069 'result': 'FAILURE',
3070 'failure_reason': 'BUILD_FAILURE',
3071 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3072 },
3073 {
3074 'buildbucket_id': '9000',
3075 'bucket': 'master.x.y',
3076 'builder_name': 'my-builder',
3077 'status': 'STARTED',
3078 'result': None,
3079 'failure_reason': None,
3080 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3081 }
3082 ]
3083 self.calls = [(('write_json', 'output.json', expected_output), '')]
3084 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3085
tandrii45b2a582016-10-11 03:14:16 -07003086 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003087 out = StringIO.StringIO()
3088 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003089 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3090 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003091 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3092 self._mocked_call(['get_authenticator_for_host', host]))
3093 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3094 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003095
3096 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3097 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003098 self.calls += [
3099 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3100 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3101 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3102 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3103 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3104 ((['git', 'config', 'branch.feature.rietveldserver'],),
3105 'codereview.example.com'),
3106 ((['get_authenticator_for_host', 'codereview.example.com'],),
3107 AuthenticatorMock()),
3108 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3109
3110 def test_fetch_try_jobs_none_rietveld(self):
3111 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003112 # Simulate that user isn't logged in.
3113 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003114 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003115 self.assertRegexpMatches(sys.stdout.getvalue(),
3116 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003117 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3118
3119 def test_fetch_try_jobs_some_rietveld(self):
3120 self._setup_fetch_try_jobs_rietveld({
3121 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3122 })
3123 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003124 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3125 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3126 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3127
3128 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3129 self._setup_fetch_try_jobs(most_recent_patchset=13)
3130 self.calls += [
3131 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3132 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3133 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003134 # TODO(tandrii): Uncomment the below if we decide to support checking
3135 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003136 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003137 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003138 ((['git', 'config', 'branch.feature.gerritserver'],),
3139 'https://x-review.googlesource.com'),
3140 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3141 AuthenticatorMock()),
3142 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3143
3144 def test_fetch_try_jobs_none_gerrit(self):
3145 self._setup_fetch_try_jobs_gerrit({})
3146 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003147 # TODO(tandrii): Uncomment the below if we decide to support checking
3148 # patchsets for Gerrit.
3149 # self.assertRegexpMatches(
3150 # sys.stdout.getvalue(),
3151 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003152 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3153
3154 def test_fetch_try_jobs_some_gerrit(self):
3155 self._setup_fetch_try_jobs_gerrit({
3156 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3157 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003158 # TODO(tandrii): Uncomment the below if we decide to support checking
3159 # patchsets for Gerrit.
3160 # self.calls.remove(
3161 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003162 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3163
3164 # ... and doesn't result in warning.
3165 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3166 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003167 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3168 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3169
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003170 def _mock_gerrit_changes_for_detail_cache(self):
3171 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003172
3173 def test_gerrit_change_detail_cache_normalize(self):
3174 self._mock_gerrit_changes_for_detail_cache()
3175 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003176 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003177 ]
3178 cl = git_cl.Changelist(codereview='gerrit')
3179 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3180 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3181 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3182 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3183
3184 def test_gerrit_change_detail_cache_simple(self):
3185 self._mock_gerrit_changes_for_detail_cache()
3186 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003187 (('GetChangeDetail', 'host', '1', []), 'a'),
3188 (('GetChangeDetail', 'host', '2', []), 'b'),
3189 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003190 ]
3191 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3192 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3193 self.assertEqual(cl._GetChangeDetail(), 'a')
3194 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003195 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003196 self.assertEqual(cl._GetChangeDetail(), 'a')
3197 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3198
3199 def test_gerrit_change_detail_cache_options(self):
3200 self._mock_gerrit_changes_for_detail_cache()
3201 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003202 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3203 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3204 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3205 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003206 ]
3207 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3208 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3209 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3210 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3211 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3212 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3213 self.assertEqual(cl._GetChangeDetail(), 'cab')
3214
3215 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3216 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3217 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3218 self.assertEqual(cl._GetChangeDetail(), 'cab')
3219
3220 # Finally, no_cache should invalidate all caches for given change.
3221 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3222 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3223
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003224 def test_gerrit_description_caching(self):
3225 def gen_detail(rev, desc):
3226 return {
3227 'current_revision': rev,
3228 'revisions': {rev: {'commit': {'message': desc}}}
3229 }
3230 self.calls = [
3231 (('GetChangeDetail', 'host', '1',
3232 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3233 gen_detail('rev1', 'desc1')),
3234 (('GetChangeDetail', 'host', '1',
3235 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3236 gen_detail('rev2', 'desc2')),
3237 ]
3238
3239 self._mock_gerrit_changes_for_detail_cache()
3240 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3241 self.assertEqual(cl.GetDescription(), 'desc1')
3242 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3243 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003244
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003245 def test_print_current_creds(self):
3246 class CookiesAuthenticatorMock(object):
3247 def __init__(self):
3248 self.gitcookies = {
3249 'host.googlesource.com': ('user', 'pass'),
3250 'host-review.googlesource.com': ('user', 'pass'),
3251 }
3252 self.netrc = self
3253 self.netrc.hosts = {
3254 'github.com': ('user2', None, 'pass2'),
3255 'host2.googlesource.com': ('user3', None, 'pass'),
3256 }
3257 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3258 CookiesAuthenticatorMock)
3259 self.mock(sys, 'stdout', StringIO.StringIO())
3260 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3261 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3262 ' Host\t User\t Which file',
3263 '============================\t=====\t===========',
3264 'host-review.googlesource.com\t user\t.gitcookies',
3265 ' host.googlesource.com\t user\t.gitcookies',
3266 ' host2.googlesource.com\tuser3\t .netrc',
3267 ])
3268 sys.stdout.buf = ''
3269 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3270 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3271 ' Host\tUser\t Which file',
3272 '============================\t====\t===========',
3273 'host-review.googlesource.com\tuser\t.gitcookies',
3274 ' host.googlesource.com\tuser\t.gitcookies',
3275 ])
3276
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003277 def _common_creds_check_mocks(self):
3278 def exists_mock(path):
3279 dirname = os.path.dirname(path)
3280 if dirname == os.path.expanduser('~'):
3281 dirname = '~'
3282 base = os.path.basename(path)
3283 if base in ('.netrc', '.gitcookies'):
3284 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3285 # git cl also checks for existence other files not relevant to this test.
3286 return None
3287 self.mock(os.path, 'exists', exists_mock)
3288 self.mock(sys, 'stdout', StringIO.StringIO())
3289
3290 def test_creds_check_gitcookies_not_configured(self):
3291 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003292 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003293 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003294 self.calls = [
3295 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3296 (('os.path.exists', '~/.netrc'), True),
3297 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3298 'or Ctrl+C to abort'), ''),
3299 ((['git', 'config', '--global', 'http.cookiefile',
3300 os.path.expanduser('~/.gitcookies')], ), ''),
3301 ]
3302 self.assertEqual(0, git_cl.main(['creds-check']))
3303 self.assertRegexpMatches(
3304 sys.stdout.getvalue(),
3305 '^You seem to be using outdated .netrc for git credentials:')
3306 self.assertRegexpMatches(
3307 sys.stdout.getvalue(),
3308 '\nConfigured git to use .gitcookies from')
3309
3310 def test_creds_check_gitcookies_configured_custom_broken(self):
3311 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003312 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003313 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003314 self.calls = [
3315 ((['git', 'config', '--global', 'http.cookiefile'],),
3316 '/custom/.gitcookies'),
3317 (('os.path.exists', '/custom/.gitcookies'), False),
3318 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3319 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3320 ((['git', 'config', '--global', 'http.cookiefile',
3321 os.path.expanduser('~/.gitcookies')], ), ''),
3322 ]
3323 self.assertEqual(0, git_cl.main(['creds-check']))
3324 self.assertRegexpMatches(
3325 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003326 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003327 self.assertRegexpMatches(
3328 sys.stdout.getvalue(),
3329 'However, your configured .gitcookies file is missing.')
3330
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003331 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003332 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3333 lambda _, message: self._mocked_call('AddComment', message))
3334 self.calls = [
3335 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3336 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3337 (('AddComment', 'msg'), ''),
3338 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003339 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3340 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003341
3342 def test_git_cl_comment_add_gerrit(self):
3343 self.mock(git_cl.gerrit_util, 'SetReview',
3344 lambda host, change, msg:
3345 self._mocked_call('SetReview', host, change, msg))
3346 self.calls = [
3347 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3348 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3349 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3350 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3351 'origin/master'),
3352 ((['git', 'config', 'remote.origin.url'],),
3353 'https://chromium.googlesource.com/infra/infra'),
3354 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3355 ]
3356 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3357 '-a', 'msg']))
3358
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003359 def test_git_cl_comments_fetch_rietveld(self):
3360 self.mock(sys, 'stdout', StringIO.StringIO())
3361 self.calls = [
3362 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3363 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3364 ] * 2
3365 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3366 'messages': [
3367 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3368 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3369 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3370 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3371 # Intentionally wrong order here.
3372 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3373 'disapproval': False, 'approval': False,
3374 'sender': 'owner@example.com'},
3375 ],
3376 'owner_email': 'owner@example.com',
3377 })
3378 expected_comments_summary = [
3379 git_cl._CommentSummary(
3380 message='lgtm',
3381 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3382 disapproval=False, approval=True, sender='r@example.com'),
3383 git_cl._CommentSummary(
3384 message='not lgtm',
3385 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3386 disapproval=True, approval=False, sender='r2@example.com'),
3387 # Note: same order as in whatever Rietveld returns.
3388 git_cl._CommentSummary(
3389 message='PTAL',
3390 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3391 disapproval=False, approval=False, sender='owner@example.com'),
3392 ]
3393 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3394 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3395
3396 with git_cl.gclient_utils.temporary_directory() as tempdir:
3397 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3398 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3399 '-j', out_file]))
3400 with open(out_file) as f:
3401 read = json.load(f)
3402 self.assertEqual(len(read), 3)
3403 self.assertEqual(read[0], {
3404 'date': '2000-03-13 20:49:34.515270',
3405 'message': 'PTAL',
3406 'approval': False,
3407 'disapproval': False,
3408 'sender': 'owner@example.com'})
3409 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3410 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3411
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003412 def test_git_cl_comments_fetch_gerrit(self):
3413 self.mock(sys, 'stdout', StringIO.StringIO())
3414 self.calls = [
3415 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3416 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3417 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3418 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3419 'origin/master'),
3420 ((['git', 'config', 'remote.origin.url'],),
3421 'https://chromium.googlesource.com/infra/infra'),
3422 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3423 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003424 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003425 'messages': [
3426 {
3427 u'_revision_number': 1,
3428 u'author': {
3429 u'_account_id': 1111084,
3430 u'email': u'commit-bot@chromium.org',
3431 u'name': u'Commit Bot'
3432 },
3433 u'date': u'2017-03-15 20:08:45.000000000',
3434 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3435 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3436 u'tag': u'autogenerated:cq:dry-run'
3437 },
3438 {
3439 u'_revision_number': 2,
3440 u'author': {
3441 u'_account_id': 11151243,
3442 u'email': u'owner@example.com',
3443 u'name': u'owner'
3444 },
3445 u'date': u'2017-03-16 20:00:41.000000000',
3446 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3447 u'message': u'PTAL',
3448 },
3449 {
3450 u'_revision_number': 2,
3451 u'author': {
3452 u'_account_id': 148512 ,
3453 u'email': u'reviewer@example.com',
3454 u'name': u'reviewer'
3455 },
3456 u'date': u'2017-03-17 05:19:37.500000000',
3457 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3458 u'message': u'Patch Set 2: Code-Review+1',
3459 },
3460 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003461 }),
3462 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3463 '/COMMIT_MSG': [
3464 {
3465 'author': {'email': u'reviewer@example.com'},
3466 'updated': u'2017-03-17 05:19:37.500000000',
3467 'patch_set': 2,
3468 'side': 'REVISION',
3469 'message': 'Please include a bug link',
3470 },
3471 ],
3472 'codereview.settings': [
3473 {
3474 'author': {'email': u'owner@example.com'},
3475 'updated': u'2017-03-16 20:00:41.000000000',
3476 'patch_set': 2,
3477 'side': 'PARENT',
3478 'line': 42,
3479 'message': 'I removed this because it is bad',
3480 },
3481 ]
3482 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003483 ] * 2
3484 expected_comments_summary = [
3485 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003486 message=(
3487 u'PTAL\n' +
3488 u'\n' +
3489 u'codereview.settings\n' +
3490 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3491 u'c/1/2/codereview.settings#b42\n' +
3492 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003493 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3494 disapproval=False, approval=False, sender=u'owner@example.com'),
3495 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003496 message=(
3497 u'Patch Set 2: Code-Review+1\n' +
3498 u'\n' +
3499 u'/COMMIT_MSG\n' +
3500 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3501 u'c/1/2//COMMIT_MSG#\n' +
3502 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003503 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3504 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3505 ]
3506 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3507 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3508
3509 with git_cl.gclient_utils.temporary_directory() as tempdir:
3510 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3511 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3512 '-j', out_file]))
3513 with open(out_file) as f:
3514 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003515 self.assertEqual(len(read), 2)
3516 self.assertEqual(read[0], {
3517 u'date': u'2017-03-16 20:00:41.000000',
3518 u'message': (
3519 u'PTAL\n' +
3520 u'\n' +
3521 u'codereview.settings\n' +
3522 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3523 u'c/1/2/codereview.settings#b42\n' +
3524 u' I removed this because it is bad\n'),
3525 u'approval': False,
3526 u'disapproval': False,
3527 u'sender': u'owner@example.com'})
3528 self.assertEqual(read[1], {
3529 u'date': u'2017-03-17 05:19:37.500000',
3530 u'message': (
3531 u'Patch Set 2: Code-Review+1\n' +
3532 u'\n' +
3533 u'/COMMIT_MSG\n' +
3534 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3535 u'c/1/2//COMMIT_MSG#\n' +
3536 u' Please include a bug link\n'),
3537 u'approval': False,
3538 u'disapproval': False,
3539 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003540
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003541
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003542if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003543 logging.basicConfig(
3544 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003545 unittest.main()