blob: b1c5f7c6f5ba125dd754217688b70ae107d8df0a [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))
Aaron Gablefd238082017-06-07 13:42:34 -0700602 self.mock(git_cl.gerrit_util, 'SetReview',
603 lambda h, i, labels, notify: self._mocked_call(
604 'SetReview', h, i, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000605 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
606 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700607 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100608 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000609 # It's important to reset settings to not have inter-tests interference.
610 git_cl.settings = None
611
612 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000613 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100614 self.assertEquals([], self.calls)
615 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000616 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100617 raise
618 # Sadly, has_failed() returns True if this OR any other tests before this
619 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200620 git_cl.logging.error(
621 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100622 'There are un-consumed self.calls after this test has finished.\n'
623 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700624 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200625 'If you are already running only this test, then **first** fix the '
626 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100627 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700628 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100629 'and follow instructions above.\n' +
630 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000631 finally:
632 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000633
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000634 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000635 self.assertTrue(
636 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700637 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000638 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000639 expected_args, result = top
640
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000641 # Also logs otherwise it could get caught in a try/finally and be hard to
642 # diagnose.
643 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700644 N = 5
645 prior_calls = '\n '.join(
646 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
647 for i, c in enumerate(self._calls_done[-N:]))
648 following_calls = '\n '.join(
649 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
650 for i, c in enumerate(self.calls[:N]))
651 extended_msg = (
652 'A few prior calls:\n %s\n\n'
653 'This (expected):\n @%d: %r\n'
654 'This (actual):\n @%d: %r\n\n'
655 'A few following expected calls:\n %s' %
656 (prior_calls, len(self._calls_done), expected_args,
657 len(self._calls_done), args, following_calls))
658 git_cl.logging.error(extended_msg)
659
tandrii99a72f22016-08-17 14:33:24 -0700660 self.fail('@%d\n'
661 ' Expected: %r\n'
662 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700663 len(self._calls_done), expected_args, args))
664
665 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700666 if isinstance(result, Exception):
667 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000668 return result
669
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100670 def test_ask_for_explicit_yes_true(self):
671 self.calls = [
672 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
673 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
674 ]
675 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
676
677 def test_ask_for_explicit_yes_true(self):
678 self.calls = [
679 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
680 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
681 ]
682 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
683
tandrii48df5812016-10-17 03:55:37 -0700684 def test_LoadCodereviewSettingsFromFile_gerrit(self):
685 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
686 self.calls = [
687 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
688 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
689 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
690 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
691 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
692 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700693 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
694 CERR1),
695 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700696 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
697 CERR1),
698 ((['git', 'config', 'gerrit.host', 'true'],), ''),
699 ]
700 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
701
maruel@chromium.orga3353652011-11-30 14:26:57 +0000702 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000703 def _is_gerrit_calls(cls, gerrit=False):
704 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
705 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
706
707 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000708 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200709 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000710 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000711
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000712 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200713 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
714 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
715 ((['git', 'config', 'core.editor'],), ''),
716 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000717
718 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200719 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000720 if similarity is None:
721 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700722 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700723 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000724 else:
tandrii33a46ff2016-08-23 05:53:40 -0700725 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700726 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000727
728 if find_copies is None:
729 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700730 find_copies_call = ((['git', 'config', '--bool',
731 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000732 else:
tandrii5d48c322016-08-18 16:19:37 -0700733 val = str(find_copies).lower()
734 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735 'branch.master.git-find-copies', val],), '')
736
737 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000738 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800739 '-l100000', '-C'+similarity,
740 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000741 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000742 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000743 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000744
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000745 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000746 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000747 similarity_call,
748 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
749 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000750 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000751 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700752 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
753 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000754 ((['git', 'config', 'rietveld.server'],),
755 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000756 ((['git', 'config', 'branch.master.merge'],), 'master'),
757 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000758 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000759 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000760 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000761 ((['git', 'rev-parse', '--show-cdup'],), ''),
762 ((['git', 'rev-parse', 'HEAD'],), '12345'),
763 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000764 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000765 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700766 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000767 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000768 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000769 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000770 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000771 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000772 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000773 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000774 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700775 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000776 ]
777
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000778 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000779 def _git_upload_calls(cls, private):
780 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000781 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000782 private_call = []
783 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000784 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000785 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000786 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000787
maruel@chromium.orga3353652011-11-30 14:26:57 +0000788 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000789 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000790 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000791 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800792 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000793 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700794 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000795 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000796 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000797 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700798 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000799 ] + cls._git_post_upload_calls()
800
801 @classmethod
802 def _git_post_upload_calls(cls):
803 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000804 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
805 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
806 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000807 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000808 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000809 ]
810
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000811 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000812 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000813 fake_ancestor = 'fake_ancestor'
814 fake_cl = 'fake_cl_for_patch'
815 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000816 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000817 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000819 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000820 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000821 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000822 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000823 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700824 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000825 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000826 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000828 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000829 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000830 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000831 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000832 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000833 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000834 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000835 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000836
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000837 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700838 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000839 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000840 return [
841 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000842 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000843 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000844 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700845 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000846 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000847 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100848 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000849 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000850 ]
851
852 def _run_reviewer_test(
853 self,
854 upload_args,
855 expected_description,
856 returned_description,
857 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000858 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700859 private=False,
860 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000861 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000862 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000863 try:
864 similarity = upload_args[upload_args.index('--similarity')+1]
865 except ValueError:
866 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000867
868 if '--find-copies' in upload_args:
869 find_copies = True
870 elif '--no-find-copies' in upload_args:
871 find_copies = False
872 else:
873 find_copies = None
874
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000875 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700876 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000877
878 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000879
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000880 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000881 self.assertEquals(
882 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000883 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000884 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000885 '#--------------------This line is 72 characters long'
886 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000887 expected_description,
888 desc)
889 return returned_description
890 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000891
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000892 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000893 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700894 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000895 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000896 return 1, 2
897 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000898
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000899 git_cl.main(['upload'] + upload_args)
900
901 def test_no_reviewer(self):
902 self._run_reviewer_test(
903 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000904 'desc\n\nBUG=',
905 '# Blah blah comment.\ndesc\n\nBUG=',
906 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000907 [])
908
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000909 def test_keep_similarity(self):
910 self._run_reviewer_test(
911 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000912 'desc\n\nBUG=',
913 '# Blah blah comment.\ndesc\n\nBUG=',
914 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000915 [])
916
iannucci@chromium.org79540052012-10-19 23:15:26 +0000917 def test_keep_find_copies(self):
918 self._run_reviewer_test(
919 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000920 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000921 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000922 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000923 [])
924
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000925 def test_private(self):
926 self._run_reviewer_test(
927 ['--private'],
928 'desc\n\nBUG=',
929 '# Blah blah comment.\ndesc\n\nBUG=\n',
930 'desc\n\nBUG=',
931 [])
932
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000933 def test_reviewers_cmd_line(self):
934 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000935 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000936 self._run_reviewer_test(
937 ['-r' 'foo@example.com'],
938 description,
939 '\n%s\n' % description,
940 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000941 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000942
943 def test_reviewer_tbr_overriden(self):
944 # Reviewer is overriden with TBR
945 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000946 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 self._run_reviewer_test(
948 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000949 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950 description.strip('\n'),
951 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000952 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000953
954 def test_reviewer_multiple(self):
955 # Handles multiple R= or TBR= lines.
956 description = (
bradnelsond975b302016-10-23 12:20:23 -0700957 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
958 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000959 self._run_reviewer_test(
960 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000961 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000962 description,
963 description,
bradnelsond975b302016-10-23 12:20:23 -0700964 ['--reviewers=another@example.com,reviewer@example.com'],
965 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000966
maruel@chromium.orga3353652011-11-30 14:26:57 +0000967 def test_reviewer_send_mail(self):
968 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000970 self._run_reviewer_test(
971 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000972 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000973 description.strip('\n'),
974 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000975 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000976
977 def test_reviewer_send_mail_no_rev(self):
978 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000979 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200980 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -0700981 ((['DieWithError', 'Must specify reviewers to send email.'],),
982 SystemExitMock())
983 ]
984
985 def RunEditor(desc, _, **kwargs):
986 return desc
987 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
988 self.mock(sys, 'stdout', stdout)
989 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000990 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -0700991 self.assertEqual(
992 '=====================================\n'
993 'NOTICE: Rietveld is being deprecated. '
994 'You can upload changes to Gerrit with\n'
995 ' git cl upload --gerrit\n'
996 'or set Gerrit to be your default code review tool with\n'
997 ' git config gerrit.host true\n'
998 '=====================================\n',
999 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001000
tandriif9aefb72016-07-01 09:06:51 -07001001 def test_bug_on_cmd(self):
1002 self._run_reviewer_test(
1003 ['--bug=500658,proj:123'],
1004 'desc\n\nBUG=500658\nBUG=proj:123',
1005 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1006 'desc\n\nBUG=500658\nBUG=proj:1234',
1007 [])
1008
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001009 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1010 parent_msg=None,
1011 new_msg=None,
1012 fail_after_parent_msg=False,
1013 fail_cherry_pick=False,
1014 fail_push_count=0,
1015 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001016 if debug:
1017 # Very useful due to finally clause in git cl land raising exceptions and
1018 # shadowing real cause of failure.
1019 self.mock(git_cl, '_IS_BEING_TESTED', True)
1020 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001021 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001022
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001023 if git_numberer_enabled:
1024 # Special mocks to check validity of timestamp.
1025 original_git_amend_head = git_cl._git_amend_head
1026 def _git_amend_head_mock(msg, tstamp):
1027 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1028 return original_git_amend_head(msg, tstamp)
1029 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1030
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001031 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1032 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001033 self.mock(RietveldMock, 'update_description', staticmethod(
1034 lambda i, d: self._mocked_call(['update_description', i, d])))
1035 self.mock(RietveldMock, 'add_comment', staticmethod(
1036 lambda i, c: self._mocked_call(['add_comment', i, c])))
1037 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001038 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1039 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1040 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1041 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1042 CERR1),
1043 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1044 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001045 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001046 ((['git', 'config', 'rietveld.server'],),
1047 'https://codereview.chromium.org'),
1048 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1049 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1050 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1051 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001052 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1053 ''), # No commits to rebase, according to local view of origin.
1054 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1055 'fake_ancestor_sha'),
1056 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1057 ((['git', 'rev-parse', '--show-cdup'],), ''),
1058 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1059 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1060 'fake_ancestor_sha...', '.'],),
1061 'M\tfile1.cpp'),
1062 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1063 ((['git', 'config', 'branch.feature.rietveldserver'],),
1064 'https://codereview.chromium.org'),
1065 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1066 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1067 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1068 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001069 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001070 # file1.cpp | 53 ++++++--
1071 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1072 ''),
1073 ((['git', 'show-ref', '--quiet', '--verify',
1074 'refs/heads/git-cl-commit'],),
1075 ''), # 0 return code means branch exists.
1076 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1077 ((['git', 'show-ref', '--quiet', '--verify',
1078 'refs/heads/git-cl-cherry-pick'],),
1079 CERR1), # This means git-cl-cherry-pick branch does not exist.
1080 ((['git', 'rev-parse', '--show-cdup'],), ''),
1081 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1082 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1083 ((['git', 'commit', '-m',
1084 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001085 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001086 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1087 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1088 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001089 repo_url),
1090
1091 ((['git', 'config', 'remote.origin.url'],), repo_url),
1092 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1093 git_numberer_enabled),
1094
1095 # Auto-rebase init.
1096 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1097 ]
1098 # Auto-rebase loops.
1099 for attempt in xrange(fail_push_count + 1):
1100 self.calls += [
1101 # Auto-rebase loop start.
1102 ((['git', 'retry', 'fetch', 'origin',
1103 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1104 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1105 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1106 # different in each loop iteration for truly realistic test.
1107 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1108 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1109 callError(1, 'failed to cherry pick') if fail_cherry_pick
1110 else ''),
1111 ]
1112 if fail_cherry_pick:
1113 return
1114
1115 if git_numberer_enabled:
1116 assert parent_msg
1117 self.calls += [
1118 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1119 parent_msg),
1120 ]
1121 if fail_after_parent_msg:
1122 return
1123 assert new_msg
1124 self.calls += [
1125 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1126 '1480022355'), # Committer's unix timestamp.
1127 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1128 '1480024000'),
1129 ((['git_amend_head committer timestamp', 1480024000],), ''),
1130 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1131 ]
1132 self.calls += [
1133 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1134 CERR1 if attempt < fail_push_count else ''),
1135 ]
1136 # End of autorebase + push.
1137
1138 self.calls += [
1139 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1140 ]
1141 if git_numberer_enabled:
1142 self.calls += [
1143 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1144 ]
1145
1146 # Cleanup calls.
1147 self.calls += [
1148 ((['git', 'checkout', '-q', 'feature'],), ''),
1149 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1150 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001151 ]
1152
1153 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001154 self._land_rietveld_calls(
1155 repo_url='https://chromium.googlesource.com/infra/infra',
1156 git_numberer_enabled=False,
1157 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001158 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001159 ((['git', 'config', 'rietveld.viewvc-url'],),
1160 'https://chromium.googlesource.com/infra/infra/+/'),
1161 ((['update_description', 123,
1162 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001163 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001164 ''),
1165 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001166 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001167 ]
1168 git_cl.main(['land'])
1169
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001170 def test_land_rietveld_fail_cherry_pick(self):
1171 self._land_rietveld_calls(
1172 repo_url='https://chromium.googlesource.com/infra/infra',
1173 git_numberer_enabled=False,
1174 fail_cherry_pick=True,
1175 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001176 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001177 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1178 'U path/file1\n'
1179 'U file2.cpp\n'),
1180 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001181 ((['git', 'checkout', '-q', 'feature'],), ''),
1182 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001183 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1184 ]
1185 git_cl.main(['land'])
1186
1187 def test_land_rietveld_git_numberer_fail_1_push(self):
1188 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1189
1190 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1191 self._land_rietveld_calls(
1192 repo_url='https://chromium.googlesource.com/chromium/src',
1193 git_numberer_enabled=True,
1194 parent_msg=('This is parent commit.\n'
1195 '\n'
1196 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1197 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1198 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1199 '\n'
1200 'Review-Url: https://codereview.chromium.org/123 .\n'
1201 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1202 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1203 fail_push_count=fail_push_count,
1204 debug=False)
1205
1206 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001207 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001208 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001209 ((['update_description', 123,
1210 'Issue: 123\n\nR=john@chromium.org\n'
1211 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001212 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001213 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1214 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1215 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001216 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001217 ''),
1218 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001219 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001220 ]
1221 git_cl.main(['land'])
1222
1223 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001224 self._land_rietveld_calls(
1225 repo_url='https://chromium.googlesource.com/v8/v8',
1226 git_numberer_enabled=True,
1227 parent_msg='This is parent commit with no footer.',
1228 fail_after_parent_msg=True,
1229 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001230 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001231 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001232 ((['git', 'checkout', '-q', 'feature'],), ''),
1233 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001234 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001235 ]
1236 with self.assertRaises(ValueError) as cm:
1237 git_cl.main(['land'])
1238 self.assertEqual(cm.exception.message,
1239 'Unable to infer commit position from footers')
1240
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001241 def test_git_numberer_not_whitelisted_repo(self):
1242 self.calls = []
1243 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001244 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1245 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001246 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001247
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001248 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001249 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1250 self.calls = [
1251 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001252 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001253 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001254 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001255 remote_url='https://chromium.googlesource.com/chromium/src',
1256 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001257 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001258
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001259 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001260 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001261 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001262 def fake_temporary_directory(**kwargs):
1263 yield tempdir
1264 self.mock(git_cl.gclient_utils, 'temporary_directory',
1265 fake_temporary_directory)
1266 self._test_GitNumbererState_valid_configs_inner(tempdir)
1267
1268 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001269 self.calls = [
1270 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001271 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001272 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1273 '''
1274 [plugin "git-numberer"]
1275 validate-enabled-refglob = refs/else/*
1276 validate-enabled-refglob = refs/heads/*
1277 validate-disabled-refglob = refs/heads/disabled
1278 validate-disabled-refglob = refs/branch-heads/*
1279 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001280 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1281 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001282 'refs/else/*\n'
1283 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001284 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1285 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001286 'refs/heads/disabled\n'
1287 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001288 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001289
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001290 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001291 remote_url='https://chromium.googlesource.com/chromium/src',
1292 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001293 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001294
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001295 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001296 remote_url='https://chromium.googlesource.com/chromium/src',
1297 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001298 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001299
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001300 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001301 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001302 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001303 remote_url='https://chromium.googlesource.com/chromium/src',
1304 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001305 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001306
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001307 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001308 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001309 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001310 if skip_auth_check:
1311 return [((cmd, ), 'true')]
1312
tandrii5d48c322016-08-18 16:19:37 -07001313 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001314 if issue:
1315 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001316 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001317 ])
1318 calls.extend([
1319 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1320 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1321 ((['git', 'config', 'remote.origin.url'],),
1322 'https://chromium.googlesource.com/my/repo'),
1323 ((['git', 'config', 'remote.origin.url'],),
1324 'https://chromium.googlesource.com/my/repo'),
1325 ])
1326 return calls
1327
1328 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001329 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001330 fetched_status=None, other_cl_owner=None,
1331 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001332 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001333 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1334 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1335 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1336 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001337 ]
1338 calls += cls._is_gerrit_calls(True)
1339 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001340 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1341 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1342 ((['git', 'config', 'branch.master.gerritissue'],),
1343 CERR1 if issue is None else str(issue)),
1344 ]
1345
1346 if custom_cl_base:
1347 ancestor_revision = custom_cl_base
1348 else:
1349 # Determine ancestor_revision to be merge base.
1350 ancestor_revision = 'fake_ancestor_sha'
1351 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001352 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001353 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001354 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001355 'refs/remotes/origin/master'],), ancestor_revision),
1356 ]
1357
1358 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001359 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1360
1361 if issue:
1362 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001363 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001364 '123456',
1365 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001366 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001367 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001368 'change_id': '123456789',
1369 'current_revision': 'sha1_of_current_revision',
1370 'revisions': { 'sha1_of_current_revision': {
1371 'commit': {'message': fetched_description},
1372 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001373 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001374 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001375 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001376 if fetched_status == 'ABANDONED':
1377 calls += [
1378 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1379 '123456 has been abandoned, new uploads are not '
1380 'allowed'), SystemExitMock()),
1381 ]
1382 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001383 if other_cl_owner:
1384 calls += [
1385 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1386 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001387
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1389 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001390 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001391 ((['git', 'rev-parse', '--show-cdup'],), ''),
1392 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001393
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001394 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1395 ancestor_revision + '...', '.'],),
1396 'M\t.gitignore\n'),
1397 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001398 ]
1399
1400 if not issue:
1401 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001402 ((['git', 'log', '--pretty=format:%s%n%n%b',
1403 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001404 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001405 ]
1406
1407 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001408 ((['git', 'config', 'user.email'],), 'me@example.com'),
1409 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1410 ([custom_cl_base] if custom_cl_base else
1411 [ancestor_revision, 'HEAD']),),
1412 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001413 ]
1414 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001415
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001416 @classmethod
1417 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001418 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001419 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001420 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001421 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001422 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001423 if post_amend_description is None:
1424 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001425 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001426 # Determined in `_gerrit_base_calls`.
1427 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1428
1429 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001430
tandriia60502f2016-06-20 02:01:53 -07001431 if squash_mode == 'default':
1432 calls.extend([
1433 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1434 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1435 ])
1436 elif squash_mode in ('override_squash', 'override_nosquash'):
1437 calls.extend([
1438 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1439 'true' if squash_mode == 'override_squash' else 'false'),
1440 ])
1441 else:
1442 assert squash_mode in ('squash', 'nosquash')
1443
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001444 # If issue is given, then description is fetched from Gerrit instead.
1445 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001446 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001447 ((['git', 'log', '--pretty=format:%s\n\n%b',
1448 ((custom_cl_base + '..') if custom_cl_base else
1449 'fake_ancestor_sha..HEAD')],),
1450 description),
1451 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001452 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001453 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001454 else:
1455 if not title:
1456 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001457 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1458 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001459 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001460 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001461 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001462 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001463 (('DownloadGerritHook', False), ''),
1464 # Amending of commit message to get the Change-Id.
1465 ((['git', 'log', '--pretty=format:%s\n\n%b',
1466 determined_ancestor_revision + '..HEAD'],),
1467 description),
1468 ((['git', 'commit', '--amend', '-m', description],), ''),
1469 ((['git', 'log', '--pretty=format:%s\n\n%b',
1470 determined_ancestor_revision + '..HEAD'],),
1471 post_amend_description)
1472 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001473 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001474 if not issue:
1475 # Prompting to edit description on first upload.
1476 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001477 ((['git', 'config', 'core.editor'],), ''),
1478 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001479 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001480 ref_to_push = 'abcdef0123456789'
1481 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001482 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1483 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1484 ]
1485
1486 if custom_cl_base is None:
1487 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001488 ((['get_or_create_merge_base', 'master',
1489 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001490 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001491 ]
1492 parent = 'origin/master'
1493 else:
1494 calls += [
1495 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1496 'refs/remotes/origin/master'],),
1497 callError(1)), # Means not ancenstor.
1498 (('ask_for_data',
1499 'Do you take responsibility for cleaning up potential mess '
1500 'resulting from proceeding with upload? Press Enter to upload, '
1501 'or Ctrl+C to abort'), ''),
1502 ]
1503 parent = custom_cl_base
1504
1505 calls += [
1506 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1507 '0123456789abcdef'),
1508 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1509 '-m', description],),
1510 ref_to_push),
1511 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001512 else:
1513 ref_to_push = 'HEAD'
1514
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001515 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001516 ((['git', 'rev-list',
1517 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1518 ref_to_push],),
1519 '1hashPerLine\n'),
1520 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001521
Aaron Gableafd52772017-06-27 16:40:10 -07001522 ref_suffix = '%wip'
1523 if notify:
1524 ref_suffix = '%ready'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001525
Aaron Gable70f4e242017-06-26 10:45:59 -07001526 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001527 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001528
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001529 if git_mirror is None:
1530 calls += [
1531 ((['git', 'config', 'remote.origin.url'],),
1532 'https://chromium.googlesource.com/yyy/zzz'),
1533 ]
1534 else:
1535 calls += [
1536 ((['git', 'config', 'remote.origin.url'],),
1537 '/cache/this-dir-exists'),
1538 (('os.path.isdir', '/cache/this-dir-exists'),
1539 True),
1540 # Runs in /cache/this-dir-exists.
1541 ((['git', 'config', 'remote.origin.url'],),
1542 'https://chromium.googlesource.com/yyy/zzz'),
1543 ]
1544
ukai@chromium.orge8077812012-02-03 03:41:46 +00001545 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001546 ((['git', 'push',
1547 'https://chromium.googlesource.com/yyy/zzz',
1548 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001549 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001550 'remote: Processing changes: (\)\n'
1551 'remote: Processing changes: (|)\n'
1552 'remote: Processing changes: (/)\n'
1553 'remote: Processing changes: (-)\n'
1554 'remote: Processing changes: new: 1 (/)\n'
1555 'remote: Processing changes: new: 1, done\n'
1556 'remote:\n'
1557 'remote: New Changes:\n'
1558 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1559 'remote:\n'
1560 'To https://chromium.googlesource.com/yyy/zzz\n'
1561 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001562 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001563 if squash:
1564 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001565 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001566 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001567 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001568 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001569 ((['git', 'config', 'branch.master.gerritsquashhash',
1570 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001571 ]
tandrii88189772016-09-29 04:29:57 -07001572 calls += [
1573 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001574 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001575 123456 if squash else None, sorted(reviewers),
1576 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001577 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001578 if tbr:
1579 calls += [
1580 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gable75e78722017-06-09 10:40:16 -07001581 123456 if squash else None, {'Code-Review': 1}, notify), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001582 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001583 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001584 return calls
1585
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001586 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001587 self,
1588 upload_args,
1589 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001590 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001591 squash=True,
1592 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001593 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001594 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001595 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001596 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001597 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001598 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001599 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001600 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001601 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001602 custom_cl_base=None,
1603 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001604 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001605 if squash_mode is None:
1606 if '--no-squash' in upload_args:
1607 squash_mode = 'nosquash'
1608 elif '--squash' in upload_args:
1609 squash_mode = 'squash'
1610 else:
1611 squash_mode = 'default'
1612
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001613 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001614 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001615 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001616 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001617 CookiesAuthenticatorMockFactory(
1618 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001619 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1620 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001621 self.mock(git_cl.gclient_utils, 'RunEditor',
1622 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001623 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1624 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001625
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001626 original_os_path_isdir = os.path.isdir
1627 def selective_os_path_isdir_mock(path):
1628 if path == '/cache/this-dir-exists':
1629 return self._mocked_call('os.path.isdir', path)
1630 return original_os_path_isdir(path)
1631 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1632
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001633 self.calls = self._gerrit_base_calls(
1634 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001635 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001636 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001637 other_cl_owner=other_cl_owner,
1638 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001639 if fetched_status != 'ABANDONED':
1640 self.calls += self._gerrit_upload_calls(
1641 description, reviewers, squash,
1642 squash_mode=squash_mode,
1643 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001644 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001645 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001646 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001647 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001648 # Uncomment when debugging.
1649 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001650 git_cl.main(['upload'] + upload_args)
1651
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001652 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001653 self._run_gerrit_upload_test(
1654 ['--no-squash'],
1655 'desc\n\nBUG=\n',
1656 [],
1657 squash=False,
1658 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1659
1660 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001661 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001662 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001663 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001664 [],
tandriia60502f2016-06-20 02:01:53 -07001665 squash=False,
1666 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001667 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001668
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001669 def test_gerrit_no_reviewer(self):
1670 self._run_gerrit_upload_test(
1671 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001672 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001673 [],
1674 squash=False,
1675 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001676
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001677 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001678 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1679 self._run_gerrit_upload_test(
1680 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1681 'desc\n\nBUG=\n\nChange-Id: I123456789',
1682 squash=False,
1683 squash_mode='override_nosquash',
1684 title='Dont_put_bad_chars')
1685 self.assertIn(
1686 'WARNING: Patchset title may only contain alphanumeric chars '
1687 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1688 'Cleaned up title: Dont put bad chars\n',
1689 git_cl.sys.stdout.getvalue())
1690
ukai@chromium.orge8077812012-02-03 03:41:46 +00001691 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001692 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001693 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001694 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001695 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001696 squash=False,
1697 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001698 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001699
1700 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001701 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001702 [],
bradnelsond975b302016-10-23 12:20:23 -07001703 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1704 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001705 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001706 ['reviewer@example.com', 'another@example.com'],
1707 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001708 squash_mode='override_nosquash',
Aaron Gablefd238082017-06-07 13:42:34 -07001709 cc=['more@example.com', 'people@example.com'],
1710 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001711
1712 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001713 self._run_gerrit_upload_test(
1714 [],
1715 'desc\nBUG=\n\nChange-Id: 123456789',
1716 [],
1717 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001718
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001719 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001720 self._run_gerrit_upload_test(
1721 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001722 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001723 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001724 squash=True,
1725 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001726
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001727 def test_gerrit_upload_squash_first_against_rev(self):
1728 custom_cl_base = 'custom_cl_base_rev_or_branch'
1729 self._run_gerrit_upload_test(
1730 ['--squash', custom_cl_base],
1731 'desc\nBUG=\n\nChange-Id: 123456789',
1732 [],
1733 squash=True,
1734 expected_upstream_ref='origin/master',
1735 custom_cl_base=custom_cl_base)
1736 self.assertIn(
1737 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1738 sys.stdout.getvalue())
1739
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001740 def test_gerrit_upload_squash_first_with_mirror(self):
1741 self._run_gerrit_upload_test(
1742 ['--squash'],
1743 'desc\nBUG=\n\nChange-Id: 123456789',
1744 [],
1745 squash=True,
1746 expected_upstream_ref='origin/master',
1747 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1748
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001749 def test_gerrit_upload_squash_reupload(self):
1750 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001751 self._run_gerrit_upload_test(
1752 ['--squash'],
1753 description,
1754 [],
1755 squash=True,
1756 expected_upstream_ref='origin/master',
1757 issue=123456)
1758
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001759 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1760 self.mock(git_cl, 'DieWithError',
1761 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1762 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1763 with self.assertRaises(SystemExitMock):
1764 self._run_gerrit_upload_test(
1765 ['--squash'],
1766 description,
1767 [],
1768 squash=True,
1769 expected_upstream_ref='origin/master',
1770 issue=123456,
1771 fetched_status='ABANDONED')
1772
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001773 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1774 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1775 lambda *_, **__: {'email': 'yet-another@example.com'})
1776 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1777 self._run_gerrit_upload_test(
1778 ['--squash'],
1779 description,
1780 [],
1781 squash=True,
1782 expected_upstream_ref='origin/master',
1783 issue=123456,
1784 other_cl_owner='other@example.com')
1785 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001786 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001787 'authenticate to Gerrit as yet-another@example.com.\n'
1788 'Uploading may fail due to lack of permissions',
1789 git_cl.sys.stdout.getvalue())
1790
rmistry@google.com2dd99862015-06-22 12:22:18 +00001791 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001792 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001793 def mock_run_git(*args, **_kwargs):
1794 if args[0] == ['for-each-ref',
1795 '--format=%(refname:short) %(upstream:short)',
1796 'refs/heads']:
1797 # Create a local branch dependency tree that looks like this:
1798 # test1 -> test2 -> test3 -> test4 -> test5
1799 # -> test3.1
1800 # test6 -> test0
1801 branch_deps = [
1802 'test2 test1', # test1 -> test2
1803 'test3 test2', # test2 -> test3
1804 'test3.1 test2', # test2 -> test3.1
1805 'test4 test3', # test3 -> test4
1806 'test5 test4', # test4 -> test5
1807 'test6 test0', # test0 -> test6
1808 'test7', # test7
1809 ]
1810 return '\n'.join(branch_deps)
1811 self.mock(git_cl, 'RunGit', mock_run_git)
1812
1813 class RecordCalls:
1814 times_called = 0
1815 record_calls = RecordCalls()
1816 def mock_CMDupload(*args, **_kwargs):
1817 record_calls.times_called += 1
1818 return 0
1819 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1820
1821 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001822 (('ask_for_data', 'This command will checkout all dependent branches '
1823 'and run "git cl upload". Press Enter to continue, '
1824 'or Ctrl+C to abort'), ''),
1825 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001826
1827 class MockChangelist():
1828 def __init__(self):
1829 pass
1830 def GetBranch(self):
1831 return 'test1'
1832 def GetIssue(self):
1833 return '123'
1834 def GetPatchset(self):
1835 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001836 def IsGerrit(self):
1837 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001838
1839 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1840 # CMDupload should have been called 5 times because of 5 dependent branches.
1841 self.assertEquals(5, record_calls.times_called)
1842 self.assertEquals(0, ret)
1843
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001844 def test_gerrit_change_id(self):
1845 self.calls = [
1846 ((['git', 'write-tree'], ),
1847 'hashtree'),
1848 ((['git', 'rev-parse', 'HEAD~0'], ),
1849 'branch-parent'),
1850 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1851 'A B <a@b.org> 1456848326 +0100'),
1852 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1853 'C D <c@d.org> 1456858326 +0100'),
1854 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1855 'hashchange'),
1856 ]
1857 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1858 self.assertEqual(change_id, 'Ihashchange')
1859
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001860 def test_desecription_append_footer(self):
1861 for init_desc, footer_line, expected_desc in [
1862 # Use unique desc first lines for easy test failure identification.
1863 ('foo', 'R=one', 'foo\n\nR=one'),
1864 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1865 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1866 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1867 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1868 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1869 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1870 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1871 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1872 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1873 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1874 ]:
1875 desc = git_cl.ChangeDescription(init_desc)
1876 desc.append_footer(footer_line)
1877 self.assertEqual(desc.description, expected_desc)
1878
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001879 def test_update_reviewers(self):
1880 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001881 ('foo', [], [],
1882 'foo'),
1883 ('foo\nR=xx', [], [],
1884 'foo\nR=xx'),
1885 ('foo\nTBR=xx', [], [],
1886 'foo\nTBR=xx'),
1887 ('foo', ['a@c'], [],
1888 'foo\n\nR=a@c'),
1889 ('foo\nR=xx', ['a@c'], [],
1890 'foo\n\nR=a@c, xx'),
1891 ('foo\nTBR=xx', ['a@c'], [],
1892 'foo\n\nR=a@c\nTBR=xx'),
1893 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1894 'foo\n\nR=a@c, yy\nTBR=xx'),
1895 ('foo\nBUG=', ['a@c'], [],
1896 'foo\nBUG=\nR=a@c'),
1897 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1898 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1899 ('foo', ['a@c', 'b@c'], [],
1900 'foo\n\nR=a@c, b@c'),
1901 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1902 'foo\nBar\n\nR=c@c\nBUG='),
1903 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1904 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001905 # Same as the line before, but full of whitespaces.
1906 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001907 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001908 'foo\nBar\n\nR=c@c\n BUG =',
1909 ),
1910 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001911 ('foo BUG=allo R=joe ', ['c@c'], [],
1912 'foo BUG=allo R=joe\n\nR=c@c'),
1913 # Redundant TBRs get promoted to Rs
1914 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1915 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001916 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001917 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001918 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001919 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001920 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001921 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001922 actual.append(obj.description)
1923 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001924
wittman@chromium.org455dc922015-01-26 20:15:50 +00001925 def test_get_target_ref(self):
1926 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001927 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001928 self.assertEqual(None, git_cl.GetTargetRef(None,
1929 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001930 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001931
wittman@chromium.org455dc922015-01-26 20:15:50 +00001932 # Check default target refs for branches.
1933 self.assertEqual('refs/heads/master',
1934 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001935 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001936 self.assertEqual('refs/heads/master',
1937 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001938 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001939 self.assertEqual('refs/heads/master',
1940 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001941 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001942 self.assertEqual('refs/branch-heads/123',
1943 git_cl.GetTargetRef('origin',
1944 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001945 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001946 self.assertEqual('refs/diff/test',
1947 git_cl.GetTargetRef('origin',
1948 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001949 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001950 self.assertEqual('refs/heads/chrome/m42',
1951 git_cl.GetTargetRef('origin',
1952 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001953 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001954
1955 # Check target refs for user-specified target branch.
1956 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1957 'refs/remotes/branch-heads/123'):
1958 self.assertEqual('refs/branch-heads/123',
1959 git_cl.GetTargetRef('origin',
1960 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001961 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001962 for branch in ('origin/master', 'remotes/origin/master',
1963 'refs/remotes/origin/master'):
1964 self.assertEqual('refs/heads/master',
1965 git_cl.GetTargetRef('origin',
1966 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001967 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001968 for branch in ('master', 'heads/master', 'refs/heads/master'):
1969 self.assertEqual('refs/heads/master',
1970 git_cl.GetTargetRef('origin',
1971 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001972 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001973
wychen@chromium.orga872e752015-04-28 23:42:18 +00001974 def test_patch_when_dirty(self):
1975 # Patch when local tree is dirty
1976 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1977 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1978
1979 def test_diff_when_dirty(self):
1980 # Do 'git cl diff' when local tree is dirty
1981 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1982 self.assertNotEqual(git_cl.main(['diff']), 0)
1983
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001984 @staticmethod
1985 def _get_gerrit_codereview_server_calls(branch, value=None,
1986 git_short_host='host',
1987 detect_branch=True):
1988 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1989
1990 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1991 """
1992 calls = []
1993 if detect_branch:
1994 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1995 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1996 CERR1 if value is None else value))
1997 if value is None:
1998 calls += [
1999 ((['git', 'config', 'branch.' + branch + '.merge'],),
2000 'refs/heads' + branch),
2001 ((['git', 'config', 'branch.' + branch + '.remote'],),
2002 'origin'),
2003 ((['git', 'config', 'remote.origin.url'],),
2004 'https://%s.googlesource.com/my/repo' % git_short_host),
2005 ]
2006 return calls
2007
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002008 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002009 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002010 detect_gerrit_server=True,
2011 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002012 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002013 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2014 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002015 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002016 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002017 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2018
tandriidf09a462016-08-18 16:23:55 -07002019 if new_branch:
2020 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2021 else:
2022 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002023
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002024 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002025 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002026 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002027 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002028 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2029 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2030 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2031 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002032 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002033 if default_codereview == 'gerrit':
2034 if not force_codereview:
2035 self.calls += [
2036 ((['git', 'config', 'gerrit.host'],), 'true'),
2037 ]
2038 if detect_gerrit_server:
2039 self.calls += self._get_gerrit_codereview_server_calls(
2040 'master', git_short_host=git_short_host,
2041 detect_branch=not new_branch and force_codereview)
2042 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002043
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002044 elif default_codereview == 'rietveld':
2045 self.calls += [
2046 ((['git', 'config', 'gerrit.host'],), CERR1),
2047 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2048 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2049 ]
2050 actual_codereview = 'rietveld'
2051
2052 if actual_codereview == 'rietveld':
2053 self.calls += [
2054 ((['git', 'rev-parse', '--show-cdup'],), ''),
2055 ]
2056 if not default_codereview:
2057 self.calls += [
2058 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2059 ]
2060 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002061 self.calls += [
2062 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002063 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002064 {
2065 'current_revision': '7777777777',
2066 'revisions': {
2067 '1111111111': {
2068 '_number': 1,
2069 'fetch': {'http': {
2070 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2071 'ref': 'refs/changes/56/123456/1',
2072 }},
2073 },
2074 '7777777777': {
2075 '_number': 7,
2076 'fetch': {'http': {
2077 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2078 'ref': 'refs/changes/56/123456/7',
2079 }},
2080 },
2081 },
2082 }),
2083 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002084
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002085 def _common_patch_rietveld_successful(self, **kwargs):
2086 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002087 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002088 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002089 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002090 ((['git', 'config', 'branch.master.rietveldserver',
2091 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002092 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002093 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002094 ((['git', 'commit', '-m',
2095 'Description\n\n' +
2096 'patch from issue 123456 at patchset 60001 ' +
2097 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002098 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002099
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002100 def test_patch_rietveld_default(self):
2101 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002102 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2103
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002104 def test_patch_rietveld_successful_new_branch(self):
2105 self._common_patch_rietveld_successful(default_codereview='rietveld',
2106 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002107 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2108
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002109 def test_patch_rietveld_guess_by_url(self):
2110 self._common_patch_rietveld_successful(
2111 default_codereview=None, # It doesn't matter.
2112 actual_codereview='rietveld')
2113 self.assertEqual(git_cl.main(
2114 ['patch', 'https://codereview.example.com/123456']), 0)
2115
2116 def test_patch_rietveld_conflict(self):
2117 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002118 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002119 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002120
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002121 def test_patch_gerrit_default(self):
2122 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002123 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002124 self.calls += [
2125 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2126 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002127 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002128 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002129 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002130 ((['git', 'config', 'branch.master.gerritserver',
2131 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002132 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002133 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2134 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2135 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002136 ]
2137 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2138
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002139 def test_patch_gerrit_force(self):
2140 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002141 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002142 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002143 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002144 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002145 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002146 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002147 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002148 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002149 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002150 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002151 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2152 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2153 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002154 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002155 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002156
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002157 def test_patch_gerrit_guess_by_url(self):
2158 self._patch_common(
2159 default_codereview=None, # It doesn't matter what's default.
2160 actual_codereview='gerrit',
2161 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002162 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002163 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002165 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002166 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002167 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002168 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002169 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002170 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002171 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002172 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2173 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2174 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002175 ]
2176 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002177 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002179 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2180 self._patch_common(
2181 default_codereview=None, # It doesn't matter what's default.
2182 actual_codereview='gerrit',
2183 git_short_host='else', detect_gerrit_server=False)
2184 self.calls += [
2185 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2186 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002187 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002188 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2189 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2190 ''),
2191 ((['git', 'config', 'branch.master.gerritserver',
2192 'https://else-review.googlesource.com'],), ''),
2193 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002194 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2195 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2196 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002197 ]
2198 self.assertEqual(git_cl.main(
2199 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2200
2201 def test_patch_gerrit_conflict(self):
2202 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002203 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002204 self.calls += [
2205 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002206 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002207 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2208 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2209 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002210 ]
2211 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002212 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002213
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002214 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002215 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002216 raise git_cl.gerrit_util.GerritError(404, '')
2217 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2218
tandriic2405f52016-10-10 08:13:15 -07002219 self.calls = [
2220 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2221 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2222 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2223 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2224 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2225 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002226 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2227 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2228 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2229 ((['git', 'config', 'remote.origin.url'],),
2230 'https://chromium.googlesource.com/my/repo'),
2231 ((['DieWithError',
2232 'change 123456 at https://chromium-review.googlesource.com does not '
2233 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002234 ]
2235 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002236 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002237
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002238 def _checkout_calls(self):
2239 return [
2240 ((['git', 'config', '--local', '--get-regexp',
2241 'branch\\..*\\.rietveldissue'], ),
2242 ('branch.retrying.rietveldissue 1111111111\n'
2243 'branch.some-fix.rietveldissue 2222222222\n')),
2244 ((['git', 'config', '--local', '--get-regexp',
2245 'branch\\..*\\.gerritissue'], ),
2246 ('branch.ger-branch.gerritissue 123456\n'
2247 'branch.gbranch654.gerritissue 654321\n')),
2248 ]
2249
2250 def test_checkout_gerrit(self):
2251 """Tests git cl checkout <issue>."""
2252 self.calls = self._checkout_calls()
2253 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2254 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2255
2256 def test_checkout_rietveld(self):
2257 """Tests git cl checkout <issue>."""
2258 self.calls = self._checkout_calls()
2259 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2260 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2261
2262 def test_checkout_not_found(self):
2263 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002264 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002265 self.calls = self._checkout_calls()
2266 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2267
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002268 def test_checkout_no_branch_issues(self):
2269 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002270 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002271 self.calls = [
2272 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002273 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002274 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002275 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002276 ]
2277 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2278
tandrii@chromium.org28253532016-04-14 13:46:56 +00002279 def _test_gerrit_ensure_authenticated_common(self, auth,
2280 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002281 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2282 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2283 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002284 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002285 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002286 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002287 cl.branch = 'master'
2288 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002289 cl.lookedup_issue = True
2290 return cl
2291
2292 def test_gerrit_ensure_authenticated_missing(self):
2293 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002294 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002295 })
2296 self.calls.append(
2297 ((['DieWithError',
2298 'Credentials for the following hosts are required:\n'
2299 ' chromium-review.googlesource.com\n'
2300 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002301 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002302 'https://chromium-review.googlesource.com/new-password'],), ''),)
2303 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2304
2305 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002306 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002307 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002308 'chromium.googlesource.com':
2309 ('git-one.example.com', None, 'secret1'),
2310 'chromium-review.googlesource.com':
2311 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002312 })
2313 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002314 (('ask_for_data', 'If you know what you are doing '
2315 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002316 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2317
2318 def test_gerrit_ensure_authenticated_ok(self):
2319 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002320 'chromium.googlesource.com':
2321 ('git-same.example.com', None, 'secret'),
2322 'chromium-review.googlesource.com':
2323 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002324 })
2325 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2326
tandrii@chromium.org28253532016-04-14 13:46:56 +00002327 def test_gerrit_ensure_authenticated_skipped(self):
2328 cl = self._test_gerrit_ensure_authenticated_common(
2329 auth={}, skip_auth_check=True)
2330 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2331
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002332 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002333 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2334 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002335 self.calls = [
2336 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002337 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002338 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2339 ((['git', 'config', 'rietveld.server'],), ''),
2340 ((['git', 'config', 'rietveld.server'],), ''),
2341 ((['git', 'config', 'branch.feature.rietveldserver'],),
2342 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002343 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002344 ]
2345 self.assertEqual(0, git_cl.main(['set-commit']))
2346
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002347 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002348 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002349 lambda h, i, labels, notify=None:
2350 self._mocked_call(['SetReview', h, i, labels, notify]))
2351
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002352 self.calls = [
2353 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002354 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2355 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002356 ((['git', 'config', 'branch.feature.gerritserver'],),
2357 'https://chromium-review.googlesource.com'),
2358 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002359 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002360 ]
tandriid9e5ce52016-07-13 02:32:59 -07002361
2362 def test_cmd_set_commit_gerrit_clear(self):
2363 self._cmd_set_commit_gerrit_common(0)
2364 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2365
2366 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002367 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002368 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2369
tandriid9e5ce52016-07-13 02:32:59 -07002370 def test_cmd_set_commit_gerrit(self):
2371 self._cmd_set_commit_gerrit_common(2)
2372 self.assertEqual(0, git_cl.main(['set-commit']))
2373
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002374 def test_description_display(self):
2375 out = StringIO.StringIO()
2376 self.mock(git_cl.sys, 'stdout', out)
2377
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002378 self.mock(git_cl, 'Changelist', ChangelistMock)
2379 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002380
2381 self.assertEqual(0, git_cl.main(['description', '-d']))
2382 self.assertEqual('foo\n', out.getvalue())
2383
2384 def test_description_rietveld(self):
2385 out = StringIO.StringIO()
2386 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002387 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002388
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002389 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002390 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002391 self.assertEqual('foobar\n', out.getvalue())
2392
iannucci3c972b92016-08-17 13:24:10 -07002393 def test_StatusFieldOverrideIssueMissingArgs(self):
2394 out = StringIO.StringIO()
2395 self.mock(git_cl.sys, 'stderr', out)
2396
2397 try:
2398 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2399 except SystemExit as ex:
2400 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002401 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002402
2403 out = StringIO.StringIO()
2404 self.mock(git_cl.sys, 'stderr', out)
2405
2406 try:
2407 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2408 except SystemExit as ex:
2409 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002410 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002411
2412 def test_StatusFieldOverrideIssue(self):
2413 out = StringIO.StringIO()
2414 self.mock(git_cl.sys, 'stdout', out)
2415
2416 def assertIssue(cl_self, *_args):
2417 self.assertEquals(cl_self.issue, 1)
2418 return 'foobar'
2419
2420 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2421 self.calls = [
2422 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2423 ((['git', 'config', 'rietveld.server'],), ''),
2424 ((['git', 'config', 'rietveld.server'],), ''),
2425 ]
iannuccie53c9352016-08-17 14:40:40 -07002426 self.assertEqual(
2427 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2428 0)
iannucci3c972b92016-08-17 13:24:10 -07002429 self.assertEqual(out.getvalue(), 'foobar\n')
2430
iannuccie53c9352016-08-17 14:40:40 -07002431 def test_SetCloseOverrideIssue(self):
2432 def assertIssue(cl_self, *_args):
2433 self.assertEquals(cl_self.issue, 1)
2434 return 'foobar'
2435
2436 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2437 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2438 self.calls = [
2439 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2440 ((['git', 'config', 'rietveld.server'],), ''),
2441 ((['git', 'config', 'rietveld.server'],), ''),
2442 ]
2443 self.assertEqual(
2444 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2445
2446 def test_SetCommitOverrideIssue(self):
2447 def assertIssue(cl_self, *_args):
2448 self.assertEquals(cl_self.issue, 1)
2449 return 'foobar'
2450
2451 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2452 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2453 self.calls = [
2454 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2455 ((['git', 'config', 'rietveld.server'],), ''),
2456 ((['git', 'config', 'rietveld.server'],), ''),
2457 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2458 ((['git', 'config', 'rietveld.server'],), ''),
2459 ((['git', 'config', 'rietveld.server'],), ''),
2460 ]
2461 self.assertEqual(
2462 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2463
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002464 def test_description_gerrit(self):
2465 out = StringIO.StringIO()
2466 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002467 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002468 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002469 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2470 {
2471 'current_revision': 'sha1',
2472 'revisions': {'sha1': {
2473 'commit': {'message': 'foobar'},
2474 }},
2475 }),
2476 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002477 self.assertEqual(0, git_cl.main([
2478 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2479 self.assertEqual('foobar\n', out.getvalue())
2480
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002481 def test_description_set_raw(self):
2482 out = StringIO.StringIO()
2483 self.mock(git_cl.sys, 'stdout', out)
2484
2485 self.mock(git_cl, 'Changelist', ChangelistMock)
2486 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2487
2488 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2489 self.assertEqual('hihi', ChangelistMock.desc)
2490
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002491 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002492 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002493
2494 def RunEditor(desc, _, **kwargs):
2495 self.assertEquals(
2496 '# Enter a description of the change.\n'
2497 '# This will be displayed on the codereview site.\n'
2498 '# The first line will also be used as the subject of the review.\n'
2499 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002500 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002501 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002502 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002503 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002504 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002505
dsansomee2d6fd92016-09-08 00:10:47 -07002506 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002507 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002508
2509 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2510 self.mock(git_cl.Changelist, 'GetDescription',
2511 lambda *args: current_desc)
2512 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2513 UpdateDescriptionRemote)
2514 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2515
2516 self.calls = [
2517 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002518 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002519 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2520 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002521 ((['git', 'config', 'core.editor'],), 'vi'),
2522 ]
2523 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2524
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002525 def test_description_set_stdin(self):
2526 out = StringIO.StringIO()
2527 self.mock(git_cl.sys, 'stdout', out)
2528
2529 self.mock(git_cl, 'Changelist', ChangelistMock)
2530 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2531
2532 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2533 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2534
kmarshall3bff56b2016-06-06 18:31:47 -07002535 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002536 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2537
kmarshall3bff56b2016-06-06 18:31:47 -07002538 self.calls = \
2539 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2540 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002541 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002542 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2543 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002544 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2545 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2546 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002547 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2548 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2549 ((['git', 'branch', '-D', 'foo'],), '')]
2550
kmarshall3bff56b2016-06-06 18:31:47 -07002551 self.mock(git_cl, 'get_cl_statuses',
2552 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002553 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2554 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2555 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002556
2557 self.assertEqual(0, git_cl.main(['archive', '-f']))
2558
2559 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002560 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002561 self.calls = \
2562 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2563 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002564 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002565 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2566 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002567 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2568
kmarshall9249e012016-08-23 12:02:16 -07002569 self.mock(git_cl, 'get_cl_statuses',
2570 lambda branches, fine_grained, max_processes:
2571 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2572
2573 self.assertEqual(1, git_cl.main(['archive', '-f']))
2574
2575 def test_archive_dry_run(self):
2576 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2577
2578 self.calls = \
2579 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2580 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2581 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2582 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2583 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2584 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2585 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2586 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2587 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002588
2589 self.mock(git_cl, 'get_cl_statuses',
2590 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002591 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2592 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2593 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002594
kmarshall9249e012016-08-23 12:02:16 -07002595 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2596
2597 def test_archive_no_tags(self):
2598 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2599
2600 self.calls = \
2601 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2602 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2603 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2604 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2605 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2606 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2607 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2608 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2609 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2610 ((['git', 'branch', '-D', 'foo'],), '')]
2611
2612 self.mock(git_cl, 'get_cl_statuses',
2613 lambda branches, fine_grained, max_processes:
2614 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2615 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2616 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2617
2618 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002619
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002620 def test_cmd_issue_erase_existing(self):
2621 out = StringIO.StringIO()
2622 self.mock(git_cl.sys, 'stdout', out)
2623 self.calls = [
2624 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002625 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2626 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002627 # Let this command raise exception (retcode=1) - it should be ignored.
2628 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002629 CERR1),
2630 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2631 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002632 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2633 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2634 ''),
2635 ]
2636 self.assertEqual(0, git_cl.main(['issue', '0']))
2637
phajdan.jre328cf92016-08-22 04:12:17 -07002638 def test_cmd_issue_json(self):
2639 out = StringIO.StringIO()
2640 self.mock(git_cl.sys, 'stdout', out)
2641 self.calls = [
2642 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002643 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002644 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2645 ((['git', 'config', 'rietveld.server'],),
2646 'https://codereview.chromium.org'),
2647 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2648 (('write_json', 'output.json',
2649 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2650 ''),
2651 ]
2652 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2653
tandriide281ae2016-10-12 06:02:30 -07002654 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002655 self.mock(git_cl.Changelist, 'GetChange',
2656 lambda _, *a: (
2657 self._mocked_call(['GetChange']+list(a))))
2658 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2659 lambda *_, **__: (
2660 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002661 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2662 lambda _, s: self._mocked_call(['SetCQState', s]))
2663 self.calls = [
2664 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002665 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002666 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2667 ((['git', 'config', 'rietveld.server'],),
2668 'https://codereview.chromium.org'),
2669 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2670 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2671 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2672 ((['get_or_create_merge_base', 'feature', 'feature'],),
2673 'fake_ancestor_sha'),
2674 ((['GetChange', 'fake_ancestor_sha', None], ),
2675 git_cl.presubmit_support.GitChange(
2676 '', '', '', '', '', '', '', '')),
2677 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2678 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002679 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2680 ]
2681 out = StringIO.StringIO()
2682 self.mock(git_cl.sys, 'stdout', out)
2683 self.assertEqual(0, git_cl.main(['try']))
2684 self.assertEqual(
2685 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002686 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002687
tandrii8c5a3532016-11-04 07:52:02 -07002688 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2689 self.mock(git_cl.Changelist, 'GetChange',
2690 lambda _, *a: (
2691 self._mocked_call(['GetChange']+list(a))))
2692 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2693 lambda *_, **__: (
2694 self._mocked_call(['DoGetTryMasters'])))
2695 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2696 lambda _, s: self._mocked_call(['SetCQState', s]))
2697
tandrii8c5a3532016-11-04 07:52:02 -07002698 self.calls = [
2699 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2700 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2701 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2702 ((['git', 'config', 'branch.feature.gerritserver'],),
2703 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002704 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2705 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2706 'project': 'depot_tools',
2707 'status': 'OPEN',
2708 'owner': {'email': 'owner@e.mail'},
2709 'revisions': {
2710 'deadbeaf': {
2711 '_number': 6,
2712 },
2713 'beeeeeef': {
2714 '_number': 7,
2715 'fetch': {'http': {
2716 'url': 'https://chromium.googlesource.com/depot_tools',
2717 'ref': 'refs/changes/56/123456/7'
2718 }},
2719 },
2720 },
2721 }),
tandrii8c5a3532016-11-04 07:52:02 -07002722 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2723 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2724 ((['get_or_create_merge_base', 'feature', 'feature'],),
2725 'fake_ancestor_sha'),
2726 ((['GetChange', 'fake_ancestor_sha', None], ),
2727 git_cl.presubmit_support.GitChange(
2728 '', '', '', '', '', '', '', '')),
2729 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2730 ((['DoGetTryMasters'], ), None),
2731 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2732 ]
2733 out = StringIO.StringIO()
2734 self.mock(git_cl.sys, 'stdout', out)
2735 self.assertEqual(0, git_cl.main(['try']))
2736 self.assertEqual(
2737 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002738 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002739 'https://chromium-review.googlesource.com/123456\n')
2740
2741 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2742 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2743 lambda _: {
2744 'owner_email': 'owner@e.mail',
2745 'private': False,
2746 'closed': False,
2747 'project': 'depot_tools',
2748 'patchsets': [20001],
2749 })
tandriide281ae2016-10-12 06:02:30 -07002750 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2751 self.calls = [
2752 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2753 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2754 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2755 ((['git', 'config', 'rietveld.server'],),
2756 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002757 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002758 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002759 ]
2760
2761 def _buildbucket_retry(*_, **kw):
2762 # self.maxDiff = 10000
2763 body = json.loads(kw['body'])
2764 self.assertEqual(len(body['builds']), 1)
2765 build = body['builds'][0]
2766 params = json.loads(build.pop('parameters_json'))
2767 self.assertEqual(params, {
2768 u'builder_name': u'win',
2769 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2770 u'revision': None}],
2771 u'properties': {
2772 u'category': u'git_cl_try',
2773 u'issue': 123,
2774 u'key': u'val',
2775 u'json': [{u'a': 1}, None],
2776 u'master': u'tryserver.chromium',
2777 u'patch_project': u'depot_tools',
2778 u'patch_storage': u'rietveld',
2779 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002780 u'rietveld': u'https://codereview.chromium.org',
2781 }
2782 })
2783 self.assertEqual(build, {
2784 u'bucket': u'master.tryserver.chromium',
2785 u'client_operation_id': u'uuid4',
2786 u'tags': [u'builder:win',
2787 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002788 u'user_agent:git_cl_try',
2789 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002790 })
2791
2792 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2793
2794 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2795 self.assertEqual(0, git_cl.main([
2796 'try', '-m', 'tryserver.chromium', '-b', 'win',
2797 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2798 self.assertRegexpMatches(
2799 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002800 'Tried jobs on:\nBucket: master.tryserver.chromium')
2801
tandrii8c5a3532016-11-04 07:52:02 -07002802 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2803 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2804 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2805
tandrii8c5a3532016-11-04 07:52:02 -07002806 self.calls = [
2807 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2808 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2809 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2810 ((['git', 'config', 'branch.feature.gerritserver'],),
2811 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002812 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002813 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002814 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002815 'status': 'OPEN',
2816 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002817 'revisions': {
2818 'deadbeaf': {
2819 '_number': 6,
2820 },
2821 'beeeeeef': {
2822 '_number': 7,
2823 'fetch': {'http': {
2824 'url': 'https://chromium.googlesource.com/depot_tools',
2825 'ref': 'refs/changes/56/123456/7'
2826 }},
2827 },
2828 },
2829 }),
2830 ]
2831
2832 def _buildbucket_retry(*_, **kw):
2833 # self.maxDiff = 10000
2834 body = json.loads(kw['body'])
2835 self.assertEqual(len(body['builds']), 1)
2836 build = body['builds'][0]
2837 params = json.loads(build.pop('parameters_json'))
2838 self.assertEqual(params, {
2839 u'builder_name': u'win',
2840 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2841 u'revision': None}],
2842 u'properties': {
2843 u'category': u'git_cl_try',
2844 u'key': u'val',
2845 u'json': [{u'a': 1}, None],
2846 u'master': u'tryserver.chromium',
2847
2848 u'patch_gerrit_url':
2849 u'https://chromium-review.googlesource.com',
2850 u'patch_issue': 123456,
2851 u'patch_project': u'depot_tools',
2852 u'patch_ref': u'refs/changes/56/123456/7',
2853 u'patch_repository_url':
2854 u'https://chromium.googlesource.com/depot_tools',
2855 u'patch_set': 7,
2856 u'patch_storage': u'gerrit',
2857 }
2858 })
2859 self.assertEqual(build, {
2860 u'bucket': u'master.tryserver.chromium',
2861 u'client_operation_id': u'uuid4',
2862 u'tags': [
2863 u'builder:win',
2864 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2865 u'user_agent:git_cl_try',
2866 u'master:tryserver.chromium'],
2867 })
2868
2869 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2870
2871 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2872 self.assertEqual(0, git_cl.main([
2873 'try', '-m', 'tryserver.chromium', '-b', 'win',
2874 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2875 self.assertRegexpMatches(
2876 git_cl.sys.stdout.getvalue(),
2877 'Tried jobs on:\nBucket: master.tryserver.chromium')
2878
borenet6c0efe62016-10-19 08:13:29 -07002879 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002880 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2881 lambda _: {
2882 'owner_email': 'owner@e.mail',
2883 'private': False,
2884 'closed': False,
2885 'project': 'depot_tools',
2886 'patchsets': [20001],
2887 })
borenet6c0efe62016-10-19 08:13:29 -07002888 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2889 self.calls = [
2890 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2891 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2892 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2893 ((['git', 'config', 'rietveld.server'],),
2894 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002895 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002896 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002897 ]
2898
2899 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002900 body = json.loads(kw['body'])
2901 self.assertEqual(len(body['builds']), 1)
2902 build = body['builds'][0]
2903 params = json.loads(build.pop('parameters_json'))
2904 self.assertEqual(params, {
2905 u'builder_name': u'win',
2906 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2907 u'revision': None}],
2908 u'properties': {
2909 u'category': u'git_cl_try',
2910 u'issue': 123,
2911 u'patch_project': u'depot_tools',
2912 u'patch_storage': u'rietveld',
2913 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002914 u'rietveld': u'https://codereview.chromium.org',
2915 }
2916 })
2917 self.assertEqual(build, {
2918 u'bucket': u'test.bucket',
2919 u'client_operation_id': u'uuid4',
2920 u'tags': [u'builder:win',
2921 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2922 u'user_agent:git_cl_try'],
2923 })
2924
2925 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2926
2927 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2928 self.assertEqual(0, git_cl.main([
2929 'try', '-B', 'test.bucket', '-b', 'win']))
2930 self.assertRegexpMatches(
2931 git_cl.sys.stdout.getvalue(),
2932 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002933
qyearsley123a4682016-10-26 09:12:17 -07002934 def test_git_cl_try_bots_on_multiple_masters(self):
2935 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2936 self.calls = [
2937 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2938 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2939 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2940 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002941 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002942 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2943 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2944 ]
2945
2946 def _buildbucket_retry(*_, **kw):
2947 body = json.loads(kw['body'])
2948 self.assertEqual(len(body['builds']), 2)
2949
2950 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2951 self.assertEqual(first_build_params['builder_name'], 'builder1')
2952 self.assertEqual(first_build_params['properties']['master'], 'master1')
2953
2954 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2955 self.assertEqual(first_build_params['builder_name'], 'builder2')
2956 self.assertEqual(first_build_params['properties']['master'], 'master2')
2957
2958 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2959
2960 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2961 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2962
2963 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2964 self.assertEqual(
2965 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2966 self.assertEqual(
2967 git_cl.sys.stdout.getvalue(),
2968 'Tried jobs on:\n'
2969 'Bucket: master.master1\n'
2970 ' builder1: []\n'
2971 'Bucket: master.master2\n'
2972 ' builder2: []\n'
2973 'To see results here, run: git cl try-results\n'
2974 'To see results in browser, run: git cl web\n')
2975
tandrii16e0b4e2016-06-07 10:34:28 -07002976 def _common_GerritCommitMsgHookCheck(self):
2977 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2978 self.mock(git_cl.os.path, 'abspath',
2979 lambda path: self._mocked_call(['abspath', path]))
2980 self.mock(git_cl.os.path, 'exists',
2981 lambda path: self._mocked_call(['exists', path]))
2982 self.mock(git_cl.gclient_utils, 'FileRead',
2983 lambda path: self._mocked_call(['FileRead', path]))
2984 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2985 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2986 self.calls = [
2987 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2988 ((['abspath', '../'],), '/abs/git_repo_root'),
2989 ]
2990 return git_cl.Changelist(codereview='gerrit', issue=123)
2991
2992 def test_GerritCommitMsgHookCheck_custom_hook(self):
2993 cl = self._common_GerritCommitMsgHookCheck()
2994 self.calls += [
2995 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2996 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2997 '#!/bin/sh\necho "custom hook"')
2998 ]
2999 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3000
3001 def test_GerritCommitMsgHookCheck_not_exists(self):
3002 cl = self._common_GerritCommitMsgHookCheck()
3003 self.calls += [
3004 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3005 ]
3006 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3007
3008 def test_GerritCommitMsgHookCheck(self):
3009 cl = self._common_GerritCommitMsgHookCheck()
3010 self.calls += [
3011 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3012 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3013 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003014 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003015 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3016 ''),
3017 ]
3018 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3019
tandriic4344b52016-08-29 06:04:54 -07003020 def test_GerritCmdLand(self):
3021 self.calls += [
3022 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3023 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3024 'deadbeaf'),
3025 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3026 ((['git', 'config', 'branch.feature.gerritserver'],),
3027 'chromium-review.googlesource.com'),
3028 ]
3029 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3030 cl._codereview_impl._GetChangeDetail = lambda _: {
3031 'labels': {},
3032 'current_revision': 'deadbeaf',
3033 }
agable32978d92016-11-01 12:55:02 -07003034 cl._codereview_impl._GetChangeCommit = lambda: {
3035 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003036 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003037 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3038 }
tandriic4344b52016-08-29 06:04:54 -07003039 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003040 out = StringIO.StringIO()
3041 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003042 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003043 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003044 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003045
tandrii221ab252016-10-06 08:12:04 -07003046 BUILDBUCKET_BUILDS_MAP = {
3047 '9000': {
3048 'id': '9000',
3049 'status': 'STARTED',
3050 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3051 'result_details_json': '{"properties": {}}',
3052 'bucket': 'master.x.y',
3053 'created_by': 'user:someone@chromium.org',
3054 'created_ts': '147200002222000',
3055 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3056 },
3057 '8000': {
3058 'id': '8000',
3059 'status': 'COMPLETED',
3060 'result': 'FAILURE',
3061 'failure_reason': 'BUILD_FAILURE',
3062 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3063 'result_details_json': '{"properties": {}}',
3064 'bucket': 'master.x.y',
3065 'created_by': 'user:someone@chromium.org',
3066 'created_ts': '147200001111000',
3067 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3068 },
3069 }
3070
3071 def test_write_try_results_json(self):
3072 expected_output = [
3073 {
3074 'buildbucket_id': '8000',
3075 'bucket': 'master.x.y',
3076 'builder_name': 'my-builder',
3077 'status': 'COMPLETED',
3078 'result': 'FAILURE',
3079 'failure_reason': 'BUILD_FAILURE',
3080 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3081 },
3082 {
3083 'buildbucket_id': '9000',
3084 'bucket': 'master.x.y',
3085 'builder_name': 'my-builder',
3086 'status': 'STARTED',
3087 'result': None,
3088 'failure_reason': None,
3089 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3090 }
3091 ]
3092 self.calls = [(('write_json', 'output.json', expected_output), '')]
3093 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3094
tandrii45b2a582016-10-11 03:14:16 -07003095 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003096 out = StringIO.StringIO()
3097 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003098 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3099 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003100 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3101 self._mocked_call(['get_authenticator_for_host', host]))
3102 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3103 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003104
3105 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3106 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003107 self.calls += [
3108 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3109 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3110 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3111 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3112 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3113 ((['git', 'config', 'branch.feature.rietveldserver'],),
3114 'codereview.example.com'),
3115 ((['get_authenticator_for_host', 'codereview.example.com'],),
3116 AuthenticatorMock()),
3117 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3118
3119 def test_fetch_try_jobs_none_rietveld(self):
3120 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003121 # Simulate that user isn't logged in.
3122 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003123 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003124 self.assertRegexpMatches(sys.stdout.getvalue(),
3125 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003126 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3127
3128 def test_fetch_try_jobs_some_rietveld(self):
3129 self._setup_fetch_try_jobs_rietveld({
3130 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3131 })
3132 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003133 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3134 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3135 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3136
3137 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3138 self._setup_fetch_try_jobs(most_recent_patchset=13)
3139 self.calls += [
3140 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3141 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3142 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003143 # TODO(tandrii): Uncomment the below if we decide to support checking
3144 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003145 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003146 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003147 ((['git', 'config', 'branch.feature.gerritserver'],),
3148 'https://x-review.googlesource.com'),
3149 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3150 AuthenticatorMock()),
3151 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3152
3153 def test_fetch_try_jobs_none_gerrit(self):
3154 self._setup_fetch_try_jobs_gerrit({})
3155 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003156 # TODO(tandrii): Uncomment the below if we decide to support checking
3157 # patchsets for Gerrit.
3158 # self.assertRegexpMatches(
3159 # sys.stdout.getvalue(),
3160 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003161 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3162
3163 def test_fetch_try_jobs_some_gerrit(self):
3164 self._setup_fetch_try_jobs_gerrit({
3165 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3166 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003167 # TODO(tandrii): Uncomment the below if we decide to support checking
3168 # patchsets for Gerrit.
3169 # self.calls.remove(
3170 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003171 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3172
3173 # ... and doesn't result in warning.
3174 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3175 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003176 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3177 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3178
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003179 def _mock_gerrit_changes_for_detail_cache(self):
3180 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003181
3182 def test_gerrit_change_detail_cache_normalize(self):
3183 self._mock_gerrit_changes_for_detail_cache()
3184 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003185 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003186 ]
3187 cl = git_cl.Changelist(codereview='gerrit')
3188 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3189 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3190 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3191 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3192
3193 def test_gerrit_change_detail_cache_simple(self):
3194 self._mock_gerrit_changes_for_detail_cache()
3195 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003196 (('GetChangeDetail', 'host', '1', []), 'a'),
3197 (('GetChangeDetail', 'host', '2', []), 'b'),
3198 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003199 ]
3200 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3201 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3202 self.assertEqual(cl._GetChangeDetail(), 'a')
3203 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003204 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003205 self.assertEqual(cl._GetChangeDetail(), 'a')
3206 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3207
3208 def test_gerrit_change_detail_cache_options(self):
3209 self._mock_gerrit_changes_for_detail_cache()
3210 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003211 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3212 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3213 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3214 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003215 ]
3216 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3217 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3218 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3219 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3220 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3221 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3222 self.assertEqual(cl._GetChangeDetail(), 'cab')
3223
3224 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3225 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3226 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3227 self.assertEqual(cl._GetChangeDetail(), 'cab')
3228
3229 # Finally, no_cache should invalidate all caches for given change.
3230 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3231 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3232
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003233 def test_gerrit_description_caching(self):
3234 def gen_detail(rev, desc):
3235 return {
3236 'current_revision': rev,
3237 'revisions': {rev: {'commit': {'message': desc}}}
3238 }
3239 self.calls = [
3240 (('GetChangeDetail', 'host', '1',
3241 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3242 gen_detail('rev1', 'desc1')),
3243 (('GetChangeDetail', 'host', '1',
3244 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3245 gen_detail('rev2', 'desc2')),
3246 ]
3247
3248 self._mock_gerrit_changes_for_detail_cache()
3249 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3250 self.assertEqual(cl.GetDescription(), 'desc1')
3251 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3252 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003253
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003254 def test_print_current_creds(self):
3255 class CookiesAuthenticatorMock(object):
3256 def __init__(self):
3257 self.gitcookies = {
3258 'host.googlesource.com': ('user', 'pass'),
3259 'host-review.googlesource.com': ('user', 'pass'),
3260 }
3261 self.netrc = self
3262 self.netrc.hosts = {
3263 'github.com': ('user2', None, 'pass2'),
3264 'host2.googlesource.com': ('user3', None, 'pass'),
3265 }
3266 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3267 CookiesAuthenticatorMock)
3268 self.mock(sys, 'stdout', StringIO.StringIO())
3269 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3270 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3271 ' Host\t User\t Which file',
3272 '============================\t=====\t===========',
3273 'host-review.googlesource.com\t user\t.gitcookies',
3274 ' host.googlesource.com\t user\t.gitcookies',
3275 ' host2.googlesource.com\tuser3\t .netrc',
3276 ])
3277 sys.stdout.buf = ''
3278 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3279 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3280 ' Host\tUser\t Which file',
3281 '============================\t====\t===========',
3282 'host-review.googlesource.com\tuser\t.gitcookies',
3283 ' host.googlesource.com\tuser\t.gitcookies',
3284 ])
3285
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003286 def _common_creds_check_mocks(self):
3287 def exists_mock(path):
3288 dirname = os.path.dirname(path)
3289 if dirname == os.path.expanduser('~'):
3290 dirname = '~'
3291 base = os.path.basename(path)
3292 if base in ('.netrc', '.gitcookies'):
3293 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3294 # git cl also checks for existence other files not relevant to this test.
3295 return None
3296 self.mock(os.path, 'exists', exists_mock)
3297 self.mock(sys, 'stdout', StringIO.StringIO())
3298
3299 def test_creds_check_gitcookies_not_configured(self):
3300 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003301 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003302 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003303 self.calls = [
3304 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3305 (('os.path.exists', '~/.netrc'), True),
3306 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3307 'or Ctrl+C to abort'), ''),
3308 ((['git', 'config', '--global', 'http.cookiefile',
3309 os.path.expanduser('~/.gitcookies')], ), ''),
3310 ]
3311 self.assertEqual(0, git_cl.main(['creds-check']))
3312 self.assertRegexpMatches(
3313 sys.stdout.getvalue(),
3314 '^You seem to be using outdated .netrc for git credentials:')
3315 self.assertRegexpMatches(
3316 sys.stdout.getvalue(),
3317 '\nConfigured git to use .gitcookies from')
3318
3319 def test_creds_check_gitcookies_configured_custom_broken(self):
3320 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003321 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003322 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003323 self.calls = [
3324 ((['git', 'config', '--global', 'http.cookiefile'],),
3325 '/custom/.gitcookies'),
3326 (('os.path.exists', '/custom/.gitcookies'), False),
3327 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3328 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3329 ((['git', 'config', '--global', 'http.cookiefile',
3330 os.path.expanduser('~/.gitcookies')], ), ''),
3331 ]
3332 self.assertEqual(0, git_cl.main(['creds-check']))
3333 self.assertRegexpMatches(
3334 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003335 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003336 self.assertRegexpMatches(
3337 sys.stdout.getvalue(),
3338 'However, your configured .gitcookies file is missing.')
3339
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003340 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003341 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3342 lambda _, message: self._mocked_call('AddComment', message))
3343 self.calls = [
3344 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3345 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3346 (('AddComment', 'msg'), ''),
3347 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003348 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3349 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003350
3351 def test_git_cl_comment_add_gerrit(self):
3352 self.mock(git_cl.gerrit_util, 'SetReview',
3353 lambda host, change, msg:
3354 self._mocked_call('SetReview', host, change, msg))
3355 self.calls = [
3356 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3357 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3358 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3359 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3360 'origin/master'),
3361 ((['git', 'config', 'remote.origin.url'],),
3362 'https://chromium.googlesource.com/infra/infra'),
3363 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3364 ]
3365 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3366 '-a', 'msg']))
3367
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003368 def test_git_cl_comments_fetch_rietveld(self):
3369 self.mock(sys, 'stdout', StringIO.StringIO())
3370 self.calls = [
3371 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3372 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3373 ] * 2
3374 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3375 'messages': [
3376 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3377 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3378 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3379 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3380 # Intentionally wrong order here.
3381 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3382 'disapproval': False, 'approval': False,
3383 'sender': 'owner@example.com'},
3384 ],
3385 'owner_email': 'owner@example.com',
3386 })
3387 expected_comments_summary = [
3388 git_cl._CommentSummary(
3389 message='lgtm',
3390 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3391 disapproval=False, approval=True, sender='r@example.com'),
3392 git_cl._CommentSummary(
3393 message='not lgtm',
3394 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3395 disapproval=True, approval=False, sender='r2@example.com'),
3396 # Note: same order as in whatever Rietveld returns.
3397 git_cl._CommentSummary(
3398 message='PTAL',
3399 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3400 disapproval=False, approval=False, sender='owner@example.com'),
3401 ]
3402 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3403 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3404
3405 with git_cl.gclient_utils.temporary_directory() as tempdir:
3406 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3407 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3408 '-j', out_file]))
3409 with open(out_file) as f:
3410 read = json.load(f)
3411 self.assertEqual(len(read), 3)
3412 self.assertEqual(read[0], {
3413 'date': '2000-03-13 20:49:34.515270',
3414 'message': 'PTAL',
3415 'approval': False,
3416 'disapproval': False,
3417 'sender': 'owner@example.com'})
3418 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3419 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3420
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003421 def test_git_cl_comments_fetch_gerrit(self):
3422 self.mock(sys, 'stdout', StringIO.StringIO())
3423 self.calls = [
3424 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3425 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3426 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3427 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3428 'origin/master'),
3429 ((['git', 'config', 'remote.origin.url'],),
3430 'https://chromium.googlesource.com/infra/infra'),
3431 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3432 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003433 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003434 'messages': [
3435 {
3436 u'_revision_number': 1,
3437 u'author': {
3438 u'_account_id': 1111084,
3439 u'email': u'commit-bot@chromium.org',
3440 u'name': u'Commit Bot'
3441 },
3442 u'date': u'2017-03-15 20:08:45.000000000',
3443 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3444 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3445 u'tag': u'autogenerated:cq:dry-run'
3446 },
3447 {
3448 u'_revision_number': 2,
3449 u'author': {
3450 u'_account_id': 11151243,
3451 u'email': u'owner@example.com',
3452 u'name': u'owner'
3453 },
3454 u'date': u'2017-03-16 20:00:41.000000000',
3455 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3456 u'message': u'PTAL',
3457 },
3458 {
3459 u'_revision_number': 2,
3460 u'author': {
3461 u'_account_id': 148512 ,
3462 u'email': u'reviewer@example.com',
3463 u'name': u'reviewer'
3464 },
3465 u'date': u'2017-03-17 05:19:37.500000000',
3466 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3467 u'message': u'Patch Set 2: Code-Review+1',
3468 },
3469 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003470 }),
3471 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3472 '/COMMIT_MSG': [
3473 {
3474 'author': {'email': u'reviewer@example.com'},
3475 'updated': u'2017-03-17 05:19:37.500000000',
3476 'patch_set': 2,
3477 'side': 'REVISION',
3478 'message': 'Please include a bug link',
3479 },
3480 ],
3481 'codereview.settings': [
3482 {
3483 'author': {'email': u'owner@example.com'},
3484 'updated': u'2017-03-16 20:00:41.000000000',
3485 'patch_set': 2,
3486 'side': 'PARENT',
3487 'line': 42,
3488 'message': 'I removed this because it is bad',
3489 },
3490 ]
3491 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003492 ] * 2
3493 expected_comments_summary = [
3494 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003495 message=(
3496 u'PTAL\n' +
3497 u'\n' +
3498 u'codereview.settings\n' +
3499 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3500 u'c/1/2/codereview.settings#b42\n' +
3501 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003502 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3503 disapproval=False, approval=False, sender=u'owner@example.com'),
3504 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003505 message=(
3506 u'Patch Set 2: Code-Review+1\n' +
3507 u'\n' +
3508 u'/COMMIT_MSG\n' +
3509 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3510 u'c/1/2//COMMIT_MSG#\n' +
3511 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003512 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3513 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3514 ]
3515 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3516 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3517
3518 with git_cl.gclient_utils.temporary_directory() as tempdir:
3519 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3520 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3521 '-j', out_file]))
3522 with open(out_file) as f:
3523 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003524 self.assertEqual(len(read), 2)
3525 self.assertEqual(read[0], {
3526 u'date': u'2017-03-16 20:00:41.000000',
3527 u'message': (
3528 u'PTAL\n' +
3529 u'\n' +
3530 u'codereview.settings\n' +
3531 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3532 u'c/1/2/codereview.settings#b42\n' +
3533 u' I removed this because it is bad\n'),
3534 u'approval': False,
3535 u'disapproval': False,
3536 u'sender': u'owner@example.com'})
3537 self.assertEqual(read[1], {
3538 u'date': u'2017-03-17 05:19:37.500000',
3539 u'message': (
3540 u'Patch Set 2: Code-Review+1\n' +
3541 u'\n' +
3542 u'/COMMIT_MSG\n' +
3543 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3544 u'c/1/2//COMMIT_MSG#\n' +
3545 u' Please include a bug link\n'),
3546 u'approval': False,
3547 u'disapproval': False,
3548 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003549
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003550
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003551if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003552 logging.basicConfig(
3553 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003554 unittest.main()