blob: 17edd8fb312707f3ea52f2f772260f719f056f8a [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Unit tests for git_cl.py."""
7
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01009import datetime
tandriide281ae2016-10-12 06:02:30 -070010import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010011import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000013import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014import sys
15import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000016import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017
18sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
19
20from testing_support.auto_stub import TestCase
21
22import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000023import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000024import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026
tandrii5d48c322016-08-18 16:19:37 -070027def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
28 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
29
30
31CERR1 = callError(1)
32
33
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000034class ChangelistMock(object):
35 # A class variable so we can access it when we don't have access to the
36 # instance that's being set.
37 desc = ""
38 def __init__(self, **kwargs):
39 pass
40 def GetIssue(self):
41 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080042 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070044 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000045 ChangelistMock.desc = desc
46
tandrii5d48c322016-08-18 16:19:37 -070047
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000048class PresubmitMock(object):
49 def __init__(self, *args, **kwargs):
50 self.reviewers = []
51 @staticmethod
52 def should_continue():
53 return True
54
55
56class RietveldMock(object):
57 def __init__(self, *args, **kwargs):
58 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000059
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000060 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080061 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000062 return 'Issue: %d' % issue
63
maruel@chromium.org78936cb2013-04-11 00:17:52 +000064 @staticmethod
65 def get_issue_properties(_issue, _messages):
66 return {
67 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
68 'messages': [
69 {
70 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070071 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000072 'sender': 'john@chromium.org',
73 },
74 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010075 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000076 }
77
iannuccie53c9352016-08-17 14:40:40 -070078 @staticmethod
79 def close_issue(_issue):
80 return 'Closed'
81
skobes6468b902016-10-24 08:45:10 -070082 @staticmethod
83 def get_patch(issue, patchset):
84 return 'patch set from issue %s patchset %s' % (issue, patchset)
85
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010086 @staticmethod
87 def update_description(_issue, _description):
88 return 'Updated'
89
90 @staticmethod
91 def add_comment(_issue, _comment):
92 return 'Commented'
93
94
95
skobes6468b902016-10-24 08:45:10 -070096
97class GitCheckoutMock(object):
98 def __init__(self, *args, **kwargs):
99 pass
100
101 @staticmethod
102 def reset():
103 GitCheckoutMock.conflict = False
104
105 def apply_patch(self, p):
106 if GitCheckoutMock.conflict:
107 raise Exception('failed')
108
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000109
110class WatchlistsMock(object):
111 def __init__(self, _):
112 pass
113 @staticmethod
114 def GetWatchersForPaths(_):
115 return ['joe@example.com']
116
117
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000118class CodereviewSettingsFileMock(object):
119 def __init__(self):
120 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800121 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000122 def read(self):
123 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000124 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000125
126
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000127class AuthenticatorMock(object):
128 def __init__(self, *_args):
129 pass
130 def has_cached_credentials(self):
131 return True
tandrii221ab252016-10-06 08:12:04 -0700132 def authorize(self, http):
133 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000134
135
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100136def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000137 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
138
139 Usage:
140 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100141 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000142
143 OR
144 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100145 CookiesAuthenticatorMockFactory(
146 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 """
148 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800149 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000150 # Intentionally not calling super() because it reads actual cookie files.
151 pass
152 @classmethod
153 def get_gitcookies_path(cls):
154 return '~/.gitcookies'
155 @classmethod
156 def get_netrc_path(cls):
157 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100158 def _get_auth_for_host(self, host):
159 if same_auth:
160 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000161 return (hosts_with_creds or {}).get(host)
162 return CookiesAuthenticatorMock
163
kmarshall9249e012016-08-23 12:02:16 -0700164class MockChangelistWithBranchAndIssue():
165 def __init__(self, branch, issue):
166 self.branch = branch
167 self.issue = issue
168 def GetBranch(self):
169 return self.branch
170 def GetIssue(self):
171 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000172
tandriic2405f52016-10-10 08:13:15 -0700173
174class SystemExitMock(Exception):
175 pass
176
177
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000178class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100179 def test_get_description(self):
180 cl = git_cl.Changelist(issue=1, codereview='rietveld',
181 codereview_host='host')
182 cl.description = 'x'
183 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800184 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100185 self.assertEquals(cl.GetDescription(), 'x')
186 self.assertEquals(cl.GetDescription(force=True), 'y')
187 self.assertEquals(cl.GetDescription(), 'y')
188
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700189 def test_description_footers(self):
190 cl = git_cl.Changelist(issue=1, codereview='gerrit',
191 codereview_host='host')
192 cl.description = '\n'.join([
193 'This is some message',
194 '',
195 'It has some lines',
196 'and, also',
197 '',
198 'Some: Really',
199 'Awesome: Footers',
200 ])
201 cl.has_description = True
202 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
203 msg, footers = cl.GetDescriptionFooters()
204 self.assertEquals(
205 msg, ['This is some message', '', 'It has some lines', 'and, also'])
206 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
207
208 msg.append('wut')
209 footers.append(('gnarly-dude', 'beans'))
210 cl.UpdateDescriptionFooters(msg, footers)
211 self.assertEquals(cl.GetDescription().splitlines(), [
212 'This is some message',
213 '',
214 'It has some lines',
215 'and, also',
216 'wut'
217 '',
218 'Some: Really',
219 'Awesome: Footers',
220 'Gnarly-Dude: beans',
221 ])
222
tandriif9aefb72016-07-01 09:06:51 -0700223 def test_get_bug_line_values(self):
224 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
225 self.assertEqual(f('', ''), [])
226 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
227 self.assertEqual(f('v8', '456'), ['v8:456'])
228 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
229 # Not nice, but not worth carying.
230 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
231 ['v8:456', 'chromium:123', 'v8:123'])
232
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100233 def _test_git_number(self, parent_msg, dest_ref, child_msg,
234 parent_hash='parenthash'):
235 desc = git_cl.ChangeDescription(child_msg)
236 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
237 return desc.description
238
239 def assertEqualByLine(self, actual, expected):
240 self.assertEqual(actual.splitlines(), expected.splitlines())
241
242 def test_git_number_bad_parent(self):
243 with self.assertRaises(ValueError):
244 self._test_git_number('Parent', 'refs/heads/master', 'Child')
245
246 def test_git_number_bad_parent_footer(self):
247 with self.assertRaises(AssertionError):
248 self._test_git_number(
249 'Parent\n'
250 '\n'
251 'Cr-Commit-Position: wrong',
252 'refs/heads/master', 'Child')
253
254 def test_git_number_bad_lineage_ignored(self):
255 actual = self._test_git_number(
256 'Parent\n'
257 '\n'
258 'Cr-Commit-Position: refs/heads/master@{#1}\n'
259 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
260 'refs/heads/master', 'Child')
261 self.assertEqualByLine(
262 actual,
263 'Child\n'
264 '\n'
265 'Cr-Commit-Position: refs/heads/master@{#2}\n'
266 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
267
268 def test_git_number_same_branch(self):
269 actual = self._test_git_number(
270 'Parent\n'
271 '\n'
272 'Cr-Commit-Position: refs/heads/master@{#12}',
273 dest_ref='refs/heads/master',
274 child_msg='Child')
275 self.assertEqualByLine(
276 actual,
277 'Child\n'
278 '\n'
279 'Cr-Commit-Position: refs/heads/master@{#13}')
280
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200281 def test_git_number_same_branch_mixed_footers(self):
282 actual = self._test_git_number(
283 'Parent\n'
284 '\n'
285 'Cr-Commit-Position: refs/heads/master@{#12}',
286 dest_ref='refs/heads/master',
287 child_msg='Child\n'
288 '\n'
289 'Broken-by: design\n'
290 'BUG=123')
291 self.assertEqualByLine(
292 actual,
293 'Child\n'
294 '\n'
295 'Broken-by: design\n'
296 'BUG=123\n'
297 'Cr-Commit-Position: refs/heads/master@{#13}')
298
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100299 def test_git_number_same_branch_with_originals(self):
300 actual = self._test_git_number(
301 'Parent\n'
302 '\n'
303 'Cr-Commit-Position: refs/heads/master@{#12}',
304 dest_ref='refs/heads/master',
305 child_msg='Child\n'
306 '\n'
307 'Some users are smart and insert their own footers\n'
308 '\n'
309 'Cr-Whatever: value\n'
310 'Cr-Commit-Position: refs/copy/paste@{#22}')
311 self.assertEqualByLine(
312 actual,
313 'Child\n'
314 '\n'
315 'Some users are smart and insert their own footers\n'
316 '\n'
317 'Cr-Original-Whatever: value\n'
318 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
319 'Cr-Commit-Position: refs/heads/master@{#13}')
320
321 def test_git_number_new_branch(self):
322 actual = self._test_git_number(
323 'Parent\n'
324 '\n'
325 'Cr-Commit-Position: refs/heads/master@{#12}',
326 dest_ref='refs/heads/branch',
327 child_msg='Child')
328 self.assertEqualByLine(
329 actual,
330 'Child\n'
331 '\n'
332 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
333 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
334
335 def test_git_number_lineage(self):
336 actual = self._test_git_number(
337 'Parent\n'
338 '\n'
339 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
340 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
341 dest_ref='refs/heads/branch',
342 child_msg='Child')
343 self.assertEqualByLine(
344 actual,
345 'Child\n'
346 '\n'
347 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
348 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
349
350 def test_git_number_moooooooore_lineage(self):
351 actual = self._test_git_number(
352 'Parent\n'
353 '\n'
354 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
355 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
356 dest_ref='refs/heads/mooore',
357 child_msg='Child')
358 self.assertEqualByLine(
359 actual,
360 'Child\n'
361 '\n'
362 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
363 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
364 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
365
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100366 def test_git_number_ever_moooooooore_lineage(self):
367 self.maxDiff = 10000
368 actual = self._test_git_number(
369 'CQ commit on fresh new branch + numbering.\n'
370 '\n'
371 'NOTRY=True\n'
372 'NOPRESUBMIT=True\n'
373 'BUG=\n'
374 '\n'
375 'Review-Url: https://codereview.chromium.org/2577703003\n'
376 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
377 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
378 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
379 dest_ref='refs/heads/gnumb-test/cl',
380 child_msg='git cl on fresh new branch + numbering.\n'
381 '\n'
382 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
383 self.assertEqualByLine(
384 actual,
385 'git cl on fresh new branch + numbering.\n'
386 '\n'
387 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
388 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
389 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
390 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
391 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100392
393 def test_git_number_cherry_pick(self):
394 actual = self._test_git_number(
395 'Parent\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
398 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
399 dest_ref='refs/heads/branch',
400 child_msg='Child, which is cherry-pick from master\n'
401 '\n'
402 'Cr-Commit-Position: refs/heads/master@{#100}\n'
403 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
404 self.assertEqualByLine(
405 actual,
406 'Child, which is cherry-pick from master\n'
407 '\n'
408 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
409 '\n'
410 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
411 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
412 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
413
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000414
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200415class TestParseIssueURL(unittest.TestCase):
416 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
417 codereview=None, fail=False):
418 self.assertIsNotNone(parsed)
419 if fail:
420 self.assertFalse(parsed.valid)
421 return
422 self.assertTrue(parsed.valid)
423 self.assertEqual(parsed.issue, issue)
424 self.assertEqual(parsed.patchset, patchset)
425 self.assertEqual(parsed.hostname, hostname)
426 self.assertEqual(parsed.codereview, codereview)
427
428 def _run_and_validate(self, func, url, *args, **kwargs):
429 result = func(urlparse.urlparse(url))
430 if kwargs.pop('fail', False):
431 self.assertIsNone(result)
432 return None
433 self._validate(result, *args, fail=False, **kwargs)
434
435 def test_rietveld(self):
436 def test(url, *args, **kwargs):
437 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
438 *args, codereview='rietveld', **kwargs)
439
440 test('http://codereview.chromium.org/123',
441 123, None, 'codereview.chromium.org')
442 test('https://codereview.chromium.org/123',
443 123, None, 'codereview.chromium.org')
444 test('https://codereview.chromium.org/123/',
445 123, None, 'codereview.chromium.org')
446 test('https://codereview.chromium.org/123/whatever',
447 123, None, 'codereview.chromium.org')
448 test('https://codereview.chromium.org/123/#ps20001',
449 123, 20001, 'codereview.chromium.org')
450 test('http://codereview.chromium.org/download/issue123_4.diff',
451 123, 4, 'codereview.chromium.org')
452 # This looks like bad Gerrit, but is actually valid Rietveld, too.
453 test('https://chrome-review.source.com/123/4/',
454 123, None, 'chrome-review.source.com')
455
456 test('https://codereview.chromium.org/deadbeaf', fail=True)
457 test('https://codereview.chromium.org/api/123', fail=True)
458 test('bad://codereview.chromium.org/123', fail=True)
459 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
460
461 def test_gerrit(self):
462 def test(url, issue=None, patchset=None, hostname=None, fail=None):
463 self._test_ParseIssueUrl(
464 git_cl._GerritChangelistImpl.ParseIssueURL,
465 url, issue, patchset, hostname, fail)
466 def test(url, *args, **kwargs):
467 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
468 *args, codereview='gerrit', **kwargs)
469
470 test('http://chrome-review.source.com/c/123',
471 123, None, 'chrome-review.source.com')
472 test('https://chrome-review.source.com/c/123/',
473 123, None, 'chrome-review.source.com')
474 test('https://chrome-review.source.com/c/123/4',
475 123, 4, 'chrome-review.source.com')
476 test('https://chrome-review.source.com/#/c/123/4',
477 123, 4, 'chrome-review.source.com')
478 test('https://chrome-review.source.com/c/123/4',
479 123, 4, 'chrome-review.source.com')
480 test('https://chrome-review.source.com/123',
481 123, None, 'chrome-review.source.com')
482 test('https://chrome-review.source.com/123/4',
483 123, 4, 'chrome-review.source.com')
484
485 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
486 test('https://chrome-review.source.com/c/abc/', fail=True)
487 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
488
489 def test_ParseIssueNumberArgument(self):
490 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200491 codereview_hint = kwargs.pop('hint', None)
492 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
493 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200494
495 test('123', 123)
496 test('', fail=True)
497 test('abc', fail=True)
498 test('123/1', fail=True)
499 test('123a', fail=True)
500 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
501 # Rietveld.
502 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200503 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200504 test('https://codereview.source.com/123',
505 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200506 # Matches both, but we take Gerrit if specifically requested.
507 test('https://codereview.source.com/123',
508 123, None, 'codereview.source.com', 'gerrit',
509 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200510 # Gerrrit.
511 test('https://chrome-review.source.com/c/123/4',
512 123, 4, 'chrome-review.source.com', 'gerrit')
513 test('https://chrome-review.source.com/bad/123/4', fail=True)
514
515
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100516class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100517 def setUp(self):
518 super(GitCookiesCheckerTest, self).setUp()
519 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100520 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100521
522 def mock_hosts_creds(self, subhost_identity_pairs):
523 def ensure_googlesource(h):
524 if not h.endswith(self.c._GOOGLESOURCE):
525 assert not h.endswith('.')
526 return h + '.' + self.c._GOOGLESOURCE
527 return h
528 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
529 for h, i in subhost_identity_pairs]
530
531 def test_analysis_nothing(self):
532 self.c._all_hosts = []
533 self.assertFalse(self.c.has_generic_host())
534 self.assertEqual(set(), self.c.get_conflicting_hosts())
535 self.assertEqual(set(), self.c.get_duplicated_hosts())
536 self.assertEqual(set(), self.c.get_partially_configured_hosts())
537 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
538
539 def test_analysis(self):
540 self.mock_hosts_creds([
541 ('.googlesource.com', 'git-example.chromium.org'),
542
543 ('chromium', 'git-example.google.com'),
544 ('chromium-review', 'git-example.google.com'),
545 ('chrome-internal', 'git-example.chromium.org'),
546 ('chrome-internal-review', 'git-example.chromium.org'),
547 ('conflict', 'git-example.google.com'),
548 ('conflict-review', 'git-example.chromium.org'),
549 ('dup', 'git-example.google.com'),
550 ('dup', 'git-example.google.com'),
551 ('dup-review', 'git-example.google.com'),
552 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200553 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100554 ])
555 self.assertTrue(self.c.has_generic_host())
556 self.assertEqual(set(['conflict.googlesource.com']),
557 self.c.get_conflicting_hosts())
558 self.assertEqual(set(['dup.googlesource.com']),
559 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200560 self.assertEqual(set(['partial.googlesource.com',
561 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100562 self.c.get_partially_configured_hosts())
563 self.assertEqual(set(['chromium.googlesource.com',
564 'chrome-internal.googlesource.com']),
565 self.c.get_hosts_with_wrong_identities())
566
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100567 def test_report_no_problems(self):
568 self.test_analysis_nothing()
569 self.mock(sys, 'stdout', StringIO.StringIO())
570 self.assertFalse(self.c.find_and_report_problems())
571 self.assertEqual(sys.stdout.getvalue(), '')
572
573 def test_report(self):
574 self.test_analysis()
575 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200576 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
577 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100578 self.assertTrue(self.c.find_and_report_problems())
579 with open(os.path.join(os.path.dirname(__file__),
580 'git_cl_creds_check_report.txt')) as f:
581 expected = f.read()
582 def by_line(text):
583 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200584 self.maxDiff = 10000
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200585 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100586
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000587class TestGitCl(TestCase):
588 def setUp(self):
589 super(TestGitCl, self).setUp()
590 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700591 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000592 self.mock(subprocess2, 'call', self._mocked_call)
593 self.mock(subprocess2, 'check_call', self._mocked_call)
594 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700595 self.mock(subprocess2, 'communicate',
596 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000597 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000598 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000599 self.mock(git_common, 'get_or_create_merge_base',
600 lambda *a: (
601 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000602 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000603 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100604 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
605 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700606 self.mock(git_cl, 'write_json', lambda path, contents:
607 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000608 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000609 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000610 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700611 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
612 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000613 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000614 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000615 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100616 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
617 lambda *args, **kwargs: self._mocked_call(
618 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700619 self.mock(git_cl.gerrit_util, 'GetChangeComments',
620 lambda *args, **kwargs: self._mocked_call(
621 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100622 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700623 lambda h, i, reviewers, ccs, notify: self._mocked_call(
624 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700625 self.mock(git_cl.gerrit_util, 'SetReview',
626 lambda h, i, labels, notify: self._mocked_call(
627 'SetReview', h, i, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000628 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
629 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700630 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100631 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000632 # It's important to reset settings to not have inter-tests interference.
633 git_cl.settings = None
634
635 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000636 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100637 self.assertEquals([], self.calls)
638 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000639 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100640 raise
641 # Sadly, has_failed() returns True if this OR any other tests before this
642 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200643 git_cl.logging.error(
644 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100645 'There are un-consumed self.calls after this test has finished.\n'
646 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700647 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200648 'If you are already running only this test, then **first** fix the '
649 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100650 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700651 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100652 'and follow instructions above.\n' +
653 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000654 finally:
655 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000656
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000657 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000658 self.assertTrue(
659 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700660 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000661 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000662 expected_args, result = top
663
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000664 # Also logs otherwise it could get caught in a try/finally and be hard to
665 # diagnose.
666 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700667 N = 5
668 prior_calls = '\n '.join(
669 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
670 for i, c in enumerate(self._calls_done[-N:]))
671 following_calls = '\n '.join(
672 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
673 for i, c in enumerate(self.calls[:N]))
674 extended_msg = (
675 'A few prior calls:\n %s\n\n'
676 'This (expected):\n @%d: %r\n'
677 'This (actual):\n @%d: %r\n\n'
678 'A few following expected calls:\n %s' %
679 (prior_calls, len(self._calls_done), expected_args,
680 len(self._calls_done), args, following_calls))
681 git_cl.logging.error(extended_msg)
682
tandrii99a72f22016-08-17 14:33:24 -0700683 self.fail('@%d\n'
684 ' Expected: %r\n'
685 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700686 len(self._calls_done), expected_args, args))
687
688 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700689 if isinstance(result, Exception):
690 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000691 return result
692
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100693 def test_ask_for_explicit_yes_true(self):
694 self.calls = [
695 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
696 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
697 ]
698 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
699
700 def test_ask_for_explicit_yes_true(self):
701 self.calls = [
702 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
703 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
704 ]
705 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
706
tandrii48df5812016-10-17 03:55:37 -0700707 def test_LoadCodereviewSettingsFromFile_gerrit(self):
708 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
709 self.calls = [
710 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
711 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
712 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
713 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
714 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
715 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700716 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
717 CERR1),
718 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700719 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
720 CERR1),
721 ((['git', 'config', 'gerrit.host', 'true'],), ''),
722 ]
723 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
724
maruel@chromium.orga3353652011-11-30 14:26:57 +0000725 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000726 def _is_gerrit_calls(cls, gerrit=False):
727 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
728 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
729
730 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000731 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200732 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000733 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000734
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000735 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200736 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
737 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
738 ((['git', 'config', 'core.editor'],), ''),
739 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000740
741 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200742 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000743 if similarity is None:
744 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700745 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700746 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000747 else:
tandrii33a46ff2016-08-23 05:53:40 -0700748 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700749 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000750
751 if find_copies is None:
752 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700753 find_copies_call = ((['git', 'config', '--bool',
754 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000755 else:
tandrii5d48c322016-08-18 16:19:37 -0700756 val = str(find_copies).lower()
757 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000758 'branch.master.git-find-copies', val],), '')
759
760 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000761 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800762 '-l100000', '-C'+similarity,
763 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000764 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000765 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000766 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000767
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000768 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000769 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000770 similarity_call,
771 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
772 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000773 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000774 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700775 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
776 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000777 ((['git', 'config', 'rietveld.server'],),
778 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000779 ((['git', 'config', 'branch.master.merge'],), 'master'),
780 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000781 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000782 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000783 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000784 ((['git', 'rev-parse', '--show-cdup'],), ''),
785 ((['git', 'rev-parse', 'HEAD'],), '12345'),
786 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000787 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000788 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700789 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000791 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000792 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000793 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000794 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000795 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000796 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000797 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700798 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000799 ]
800
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000801 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000802 def _git_upload_calls(cls, private):
803 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000804 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000805 private_call = []
806 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000807 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000808 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000809 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000810
maruel@chromium.orga3353652011-11-30 14:26:57 +0000811 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000812 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000813 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000814 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800815 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000816 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700817 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000819 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000820 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700821 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000822 ] + cls._git_post_upload_calls()
823
824 @classmethod
825 def _git_post_upload_calls(cls):
826 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
828 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
829 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000830 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000831 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000832 ]
833
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000834 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000835 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000836 fake_ancestor = 'fake_ancestor'
837 fake_cl = 'fake_cl_for_patch'
838 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000839 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000840 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000841 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000842 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000844 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000845 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000846 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700847 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000848 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000849 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000850 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000851 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000852 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000853 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000854 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000855 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000856 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000857 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000858 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000859
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000860 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700861 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000862 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000863 return [
864 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000865 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000866 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000867 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700868 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000869 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000870 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100871 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000872 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000873 ]
874
875 def _run_reviewer_test(
876 self,
877 upload_args,
878 expected_description,
879 returned_description,
880 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000881 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700882 private=False,
883 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000884 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000885 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000886 try:
887 similarity = upload_args[upload_args.index('--similarity')+1]
888 except ValueError:
889 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000890
891 if '--find-copies' in upload_args:
892 find_copies = True
893 elif '--no-find-copies' in upload_args:
894 find_copies = False
895 else:
896 find_copies = None
897
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000898 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700899 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000900
901 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000902
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000903 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000904 self.assertEquals(
905 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000906 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000907 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000908 '#--------------------This line is 72 characters long'
909 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000910 expected_description,
911 desc)
912 return returned_description
913 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000914
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000915 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000916 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700917 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000918 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000919 return 1, 2
920 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000921
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000922 git_cl.main(['upload'] + upload_args)
923
924 def test_no_reviewer(self):
925 self._run_reviewer_test(
926 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000927 'desc\n\nBUG=',
928 '# Blah blah comment.\ndesc\n\nBUG=',
929 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000930 [])
931
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000932 def test_keep_similarity(self):
933 self._run_reviewer_test(
934 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000935 'desc\n\nBUG=',
936 '# Blah blah comment.\ndesc\n\nBUG=',
937 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000938 [])
939
iannucci@chromium.org79540052012-10-19 23:15:26 +0000940 def test_keep_find_copies(self):
941 self._run_reviewer_test(
942 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000943 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000944 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000945 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000946 [])
947
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000948 def test_private(self):
949 self._run_reviewer_test(
950 ['--private'],
951 'desc\n\nBUG=',
952 '# Blah blah comment.\ndesc\n\nBUG=\n',
953 'desc\n\nBUG=',
954 [])
955
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956 def test_reviewers_cmd_line(self):
957 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000958 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000959 self._run_reviewer_test(
960 ['-r' 'foo@example.com'],
961 description,
962 '\n%s\n' % description,
963 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000964 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000965
966 def test_reviewer_tbr_overriden(self):
967 # Reviewer is overriden with TBR
968 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000970 self._run_reviewer_test(
971 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000972 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000973 description.strip('\n'),
974 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000975 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000976
977 def test_reviewer_multiple(self):
978 # Handles multiple R= or TBR= lines.
979 description = (
bradnelsond975b302016-10-23 12:20:23 -0700980 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
981 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000982 self._run_reviewer_test(
983 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000984 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000985 description,
986 description,
bradnelsond975b302016-10-23 12:20:23 -0700987 ['--reviewers=another@example.com,reviewer@example.com'],
988 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000989
maruel@chromium.orga3353652011-11-30 14:26:57 +0000990 def test_reviewer_send_mail(self):
991 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000992 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000993 self._run_reviewer_test(
994 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000995 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000996 description.strip('\n'),
997 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000998 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000999
1000 def test_reviewer_send_mail_no_rev(self):
1001 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001002 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +02001003 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -07001004 ((['DieWithError', 'Must specify reviewers to send email.'],),
1005 SystemExitMock())
1006 ]
1007
1008 def RunEditor(desc, _, **kwargs):
1009 return desc
1010 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1011 self.mock(sys, 'stdout', stdout)
1012 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001013 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001014 self.assertEqual(
1015 '=====================================\n'
1016 'NOTICE: Rietveld is being deprecated. '
1017 'You can upload changes to Gerrit with\n'
1018 ' git cl upload --gerrit\n'
1019 'or set Gerrit to be your default code review tool with\n'
1020 ' git config gerrit.host true\n'
1021 '=====================================\n',
1022 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001023
tandriif9aefb72016-07-01 09:06:51 -07001024 def test_bug_on_cmd(self):
1025 self._run_reviewer_test(
1026 ['--bug=500658,proj:123'],
1027 'desc\n\nBUG=500658\nBUG=proj:123',
1028 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1029 'desc\n\nBUG=500658\nBUG=proj:1234',
1030 [])
1031
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001032 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1033 parent_msg=None,
1034 new_msg=None,
1035 fail_after_parent_msg=False,
1036 fail_cherry_pick=False,
1037 fail_push_count=0,
1038 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001039 if debug:
1040 # Very useful due to finally clause in git cl land raising exceptions and
1041 # shadowing real cause of failure.
1042 self.mock(git_cl, '_IS_BEING_TESTED', True)
1043 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001044 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001045
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001046 if git_numberer_enabled:
1047 # Special mocks to check validity of timestamp.
1048 original_git_amend_head = git_cl._git_amend_head
1049 def _git_amend_head_mock(msg, tstamp):
1050 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1051 return original_git_amend_head(msg, tstamp)
1052 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1053
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001054 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1055 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001056 self.mock(RietveldMock, 'update_description', staticmethod(
1057 lambda i, d: self._mocked_call(['update_description', i, d])))
1058 self.mock(RietveldMock, 'add_comment', staticmethod(
1059 lambda i, c: self._mocked_call(['add_comment', i, c])))
1060 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001061 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1062 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1063 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1064 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1065 CERR1),
1066 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1067 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001068 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001069 ((['git', 'config', 'rietveld.server'],),
1070 'https://codereview.chromium.org'),
1071 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1072 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1073 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1074 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001075 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1076 ''), # No commits to rebase, according to local view of origin.
1077 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1078 'fake_ancestor_sha'),
1079 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1080 ((['git', 'rev-parse', '--show-cdup'],), ''),
1081 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1082 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1083 'fake_ancestor_sha...', '.'],),
1084 'M\tfile1.cpp'),
1085 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1086 ((['git', 'config', 'branch.feature.rietveldserver'],),
1087 'https://codereview.chromium.org'),
1088 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1089 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1090 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1091 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001092 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001093 # file1.cpp | 53 ++++++--
1094 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1095 ''),
1096 ((['git', 'show-ref', '--quiet', '--verify',
1097 'refs/heads/git-cl-commit'],),
1098 ''), # 0 return code means branch exists.
1099 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1100 ((['git', 'show-ref', '--quiet', '--verify',
1101 'refs/heads/git-cl-cherry-pick'],),
1102 CERR1), # This means git-cl-cherry-pick branch does not exist.
1103 ((['git', 'rev-parse', '--show-cdup'],), ''),
1104 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1105 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1106 ((['git', 'commit', '-m',
1107 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001108 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001109 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1110 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1111 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001112 repo_url),
1113
1114 ((['git', 'config', 'remote.origin.url'],), repo_url),
1115 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1116 git_numberer_enabled),
1117
1118 # Auto-rebase init.
1119 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1120 ]
1121 # Auto-rebase loops.
1122 for attempt in xrange(fail_push_count + 1):
1123 self.calls += [
1124 # Auto-rebase loop start.
1125 ((['git', 'retry', 'fetch', 'origin',
1126 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1127 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1128 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1129 # different in each loop iteration for truly realistic test.
1130 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1131 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1132 callError(1, 'failed to cherry pick') if fail_cherry_pick
1133 else ''),
1134 ]
1135 if fail_cherry_pick:
1136 return
1137
1138 if git_numberer_enabled:
1139 assert parent_msg
1140 self.calls += [
1141 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1142 parent_msg),
1143 ]
1144 if fail_after_parent_msg:
1145 return
1146 assert new_msg
1147 self.calls += [
1148 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1149 '1480022355'), # Committer's unix timestamp.
1150 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1151 '1480024000'),
1152 ((['git_amend_head committer timestamp', 1480024000],), ''),
1153 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1154 ]
1155 self.calls += [
1156 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1157 CERR1 if attempt < fail_push_count else ''),
1158 ]
1159 # End of autorebase + push.
1160
1161 self.calls += [
1162 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1163 ]
1164 if git_numberer_enabled:
1165 self.calls += [
1166 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1167 ]
1168
1169 # Cleanup calls.
1170 self.calls += [
1171 ((['git', 'checkout', '-q', 'feature'],), ''),
1172 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1173 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001174 ]
1175
1176 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001177 self._land_rietveld_calls(
1178 repo_url='https://chromium.googlesource.com/infra/infra',
1179 git_numberer_enabled=False,
1180 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001181 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001182 ((['git', 'config', 'rietveld.viewvc-url'],),
1183 'https://chromium.googlesource.com/infra/infra/+/'),
1184 ((['update_description', 123,
1185 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001186 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001187 ''),
1188 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001189 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001190 ]
1191 git_cl.main(['land'])
1192
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001193 def test_land_rietveld_fail_cherry_pick(self):
1194 self._land_rietveld_calls(
1195 repo_url='https://chromium.googlesource.com/infra/infra',
1196 git_numberer_enabled=False,
1197 fail_cherry_pick=True,
1198 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001199 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001200 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1201 'U path/file1\n'
1202 'U file2.cpp\n'),
1203 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001204 ((['git', 'checkout', '-q', 'feature'],), ''),
1205 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001206 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1207 ]
1208 git_cl.main(['land'])
1209
1210 def test_land_rietveld_git_numberer_fail_1_push(self):
1211 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1212
1213 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1214 self._land_rietveld_calls(
1215 repo_url='https://chromium.googlesource.com/chromium/src',
1216 git_numberer_enabled=True,
1217 parent_msg=('This is parent commit.\n'
1218 '\n'
1219 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1220 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1221 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1222 '\n'
1223 'Review-Url: https://codereview.chromium.org/123 .\n'
1224 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1225 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1226 fail_push_count=fail_push_count,
1227 debug=False)
1228
1229 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001230 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001231 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001232 ((['update_description', 123,
1233 'Issue: 123\n\nR=john@chromium.org\n'
1234 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001235 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001236 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1237 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1238 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001239 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001240 ''),
1241 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001242 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001243 ]
1244 git_cl.main(['land'])
1245
1246 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001247 self._land_rietveld_calls(
1248 repo_url='https://chromium.googlesource.com/v8/v8',
1249 git_numberer_enabled=True,
1250 parent_msg='This is parent commit with no footer.',
1251 fail_after_parent_msg=True,
1252 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001253 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001254 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001255 ((['git', 'checkout', '-q', 'feature'],), ''),
1256 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001257 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001258 ]
1259 with self.assertRaises(ValueError) as cm:
1260 git_cl.main(['land'])
1261 self.assertEqual(cm.exception.message,
1262 'Unable to infer commit position from footers')
1263
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001264 def test_git_numberer_not_whitelisted_repo(self):
1265 self.calls = []
1266 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001267 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1268 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001269 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001270
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001271 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001272 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1273 self.calls = [
1274 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001275 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001276 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001277 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001278 remote_url='https://chromium.googlesource.com/chromium/src',
1279 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001280 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001281
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001282 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001283 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001284 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001285 def fake_temporary_directory(**kwargs):
1286 yield tempdir
1287 self.mock(git_cl.gclient_utils, 'temporary_directory',
1288 fake_temporary_directory)
1289 self._test_GitNumbererState_valid_configs_inner(tempdir)
1290
1291 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001292 self.calls = [
1293 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001294 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001295 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1296 '''
1297 [plugin "git-numberer"]
1298 validate-enabled-refglob = refs/else/*
1299 validate-enabled-refglob = refs/heads/*
1300 validate-disabled-refglob = refs/heads/disabled
1301 validate-disabled-refglob = refs/branch-heads/*
1302 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001303 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1304 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001305 'refs/else/*\n'
1306 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001307 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1308 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001309 'refs/heads/disabled\n'
1310 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001311 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001312
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001313 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001314 remote_url='https://chromium.googlesource.com/chromium/src',
1315 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001316 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001317
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001318 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001319 remote_url='https://chromium.googlesource.com/chromium/src',
1320 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001321 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001322
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001323 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001324 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001325 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001326 remote_url='https://chromium.googlesource.com/chromium/src',
1327 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001328 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001329
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001330 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001331 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001332 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001333 if skip_auth_check:
1334 return [((cmd, ), 'true')]
1335
tandrii5d48c322016-08-18 16:19:37 -07001336 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001337 if issue:
1338 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001339 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001340 ])
1341 calls.extend([
1342 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1343 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1344 ((['git', 'config', 'remote.origin.url'],),
1345 'https://chromium.googlesource.com/my/repo'),
1346 ((['git', 'config', 'remote.origin.url'],),
1347 'https://chromium.googlesource.com/my/repo'),
1348 ])
1349 return calls
1350
1351 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001352 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001353 fetched_status=None, other_cl_owner=None,
1354 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001355 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001356 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1357 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1358 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1359 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001360 ]
1361 calls += cls._is_gerrit_calls(True)
1362 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001363 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1364 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1365 ((['git', 'config', 'branch.master.gerritissue'],),
1366 CERR1 if issue is None else str(issue)),
1367 ]
1368
1369 if custom_cl_base:
1370 ancestor_revision = custom_cl_base
1371 else:
1372 # Determine ancestor_revision to be merge base.
1373 ancestor_revision = 'fake_ancestor_sha'
1374 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001375 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001376 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001377 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001378 'refs/remotes/origin/master'],), ancestor_revision),
1379 ]
1380
1381 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001382 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1383
1384 if issue:
1385 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001386 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001387 '123456',
1388 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001389 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001390 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001391 'change_id': '123456789',
1392 'current_revision': 'sha1_of_current_revision',
1393 'revisions': { 'sha1_of_current_revision': {
1394 'commit': {'message': fetched_description},
1395 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001396 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001397 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001398 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001399 if fetched_status == 'ABANDONED':
1400 calls += [
1401 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1402 '123456 has been abandoned, new uploads are not '
1403 'allowed'), SystemExitMock()),
1404 ]
1405 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001406 if other_cl_owner:
1407 calls += [
1408 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1409 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001410
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001411 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1412 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001413 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001414 ((['git', 'rev-parse', '--show-cdup'],), ''),
1415 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001416
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001417 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1418 ancestor_revision + '...', '.'],),
1419 'M\t.gitignore\n'),
1420 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001421 ]
1422
1423 if not issue:
1424 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001425 ((['git', 'log', '--pretty=format:%s%n%n%b',
1426 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001427 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001428 ]
1429
1430 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001431 ((['git', 'config', 'user.email'],), 'me@example.com'),
1432 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1433 ([custom_cl_base] if custom_cl_base else
1434 [ancestor_revision, 'HEAD']),),
1435 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001436 ]
1437 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001438
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001439 @classmethod
1440 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001441 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001442 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001443 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001444 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001445 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001446 if post_amend_description is None:
1447 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001448 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001449 # Determined in `_gerrit_base_calls`.
1450 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1451
1452 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001453
tandriia60502f2016-06-20 02:01:53 -07001454 if squash_mode == 'default':
1455 calls.extend([
1456 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1457 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1458 ])
1459 elif squash_mode in ('override_squash', 'override_nosquash'):
1460 calls.extend([
1461 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1462 'true' if squash_mode == 'override_squash' else 'false'),
1463 ])
1464 else:
1465 assert squash_mode in ('squash', 'nosquash')
1466
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001467 # If issue is given, then description is fetched from Gerrit instead.
1468 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001469 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001470 ((['git', 'log', '--pretty=format:%s\n\n%b',
1471 ((custom_cl_base + '..') if custom_cl_base else
1472 'fake_ancestor_sha..HEAD')],),
1473 description),
1474 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001475 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001476 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001477 else:
1478 if not title:
1479 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001480 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1481 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001482 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001483 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001484 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001485 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001486 (('DownloadGerritHook', False), ''),
1487 # Amending of commit message to get the Change-Id.
1488 ((['git', 'log', '--pretty=format:%s\n\n%b',
1489 determined_ancestor_revision + '..HEAD'],),
1490 description),
1491 ((['git', 'commit', '--amend', '-m', description],), ''),
1492 ((['git', 'log', '--pretty=format:%s\n\n%b',
1493 determined_ancestor_revision + '..HEAD'],),
1494 post_amend_description)
1495 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001496 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001497 if not issue:
1498 # Prompting to edit description on first upload.
1499 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001500 ((['git', 'config', 'core.editor'],), ''),
1501 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001502 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001503 ref_to_push = 'abcdef0123456789'
1504 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001505 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1506 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1507 ]
1508
1509 if custom_cl_base is None:
1510 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001511 ((['get_or_create_merge_base', 'master',
1512 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001513 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001514 ]
1515 parent = 'origin/master'
1516 else:
1517 calls += [
1518 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1519 'refs/remotes/origin/master'],),
1520 callError(1)), # Means not ancenstor.
1521 (('ask_for_data',
1522 'Do you take responsibility for cleaning up potential mess '
1523 'resulting from proceeding with upload? Press Enter to upload, '
1524 'or Ctrl+C to abort'), ''),
1525 ]
1526 parent = custom_cl_base
1527
1528 calls += [
1529 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1530 '0123456789abcdef'),
1531 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1532 '-m', description],),
1533 ref_to_push),
1534 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001535 else:
1536 ref_to_push = 'HEAD'
1537
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001538 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001539 ((['git', 'rev-list',
1540 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1541 ref_to_push],),
1542 '1hashPerLine\n'),
1543 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001544
Aaron Gableafd52772017-06-27 16:40:10 -07001545 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001546 ref_suffix = '%ready,notify=ALL'
1547 else:
1548 if not issue:
1549 ref_suffix = '%wip'
1550 else:
1551 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001552
Aaron Gable70f4e242017-06-26 10:45:59 -07001553 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001554 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001555
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001556 if git_mirror is None:
1557 calls += [
1558 ((['git', 'config', 'remote.origin.url'],),
1559 'https://chromium.googlesource.com/yyy/zzz'),
1560 ]
1561 else:
1562 calls += [
1563 ((['git', 'config', 'remote.origin.url'],),
1564 '/cache/this-dir-exists'),
1565 (('os.path.isdir', '/cache/this-dir-exists'),
1566 True),
1567 # Runs in /cache/this-dir-exists.
1568 ((['git', 'config', 'remote.origin.url'],),
1569 'https://chromium.googlesource.com/yyy/zzz'),
1570 ]
1571
ukai@chromium.orge8077812012-02-03 03:41:46 +00001572 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001573 ((['git', 'push',
1574 'https://chromium.googlesource.com/yyy/zzz',
1575 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001576 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001577 'remote: Processing changes: (\)\n'
1578 'remote: Processing changes: (|)\n'
1579 'remote: Processing changes: (/)\n'
1580 'remote: Processing changes: (-)\n'
1581 'remote: Processing changes: new: 1 (/)\n'
1582 'remote: Processing changes: new: 1, done\n'
1583 'remote:\n'
1584 'remote: New Changes:\n'
1585 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1586 'remote:\n'
1587 'To https://chromium.googlesource.com/yyy/zzz\n'
1588 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001589 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001590 if squash:
1591 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001592 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001593 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001594 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001595 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001596 ((['git', 'config', 'branch.master.gerritsquashhash',
1597 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001598 ]
tandrii88189772016-09-29 04:29:57 -07001599 calls += [
1600 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001601 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001602 123456 if squash else None, sorted(reviewers),
1603 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001604 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001605 if tbr:
1606 calls += [
1607 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gable75e78722017-06-09 10:40:16 -07001608 123456 if squash else None, {'Code-Review': 1}, notify), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001609 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001610 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001611 return calls
1612
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001613 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001614 self,
1615 upload_args,
1616 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001617 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001618 squash=True,
1619 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001620 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001621 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001622 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001623 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001624 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001625 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001626 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001627 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001628 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001629 custom_cl_base=None,
1630 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001631 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001632 if squash_mode is None:
1633 if '--no-squash' in upload_args:
1634 squash_mode = 'nosquash'
1635 elif '--squash' in upload_args:
1636 squash_mode = 'squash'
1637 else:
1638 squash_mode = 'default'
1639
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001640 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001641 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001642 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001643 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001644 CookiesAuthenticatorMockFactory(
1645 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001646 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1647 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001648 self.mock(git_cl.gclient_utils, 'RunEditor',
1649 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001650 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1651 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001652
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001653 original_os_path_isdir = os.path.isdir
1654 def selective_os_path_isdir_mock(path):
1655 if path == '/cache/this-dir-exists':
1656 return self._mocked_call('os.path.isdir', path)
1657 return original_os_path_isdir(path)
1658 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1659
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001660 self.calls = self._gerrit_base_calls(
1661 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001662 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001663 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001664 other_cl_owner=other_cl_owner,
1665 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001666 if fetched_status != 'ABANDONED':
1667 self.calls += self._gerrit_upload_calls(
1668 description, reviewers, squash,
1669 squash_mode=squash_mode,
1670 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001671 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001672 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001673 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001674 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001675 # Uncomment when debugging.
1676 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001677 git_cl.main(['upload'] + upload_args)
1678
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001679 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001680 self._run_gerrit_upload_test(
1681 ['--no-squash'],
1682 'desc\n\nBUG=\n',
1683 [],
1684 squash=False,
1685 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1686
1687 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001688 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001689 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001690 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001691 [],
tandriia60502f2016-06-20 02:01:53 -07001692 squash=False,
1693 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001694 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001695
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001696 def test_gerrit_no_reviewer(self):
1697 self._run_gerrit_upload_test(
1698 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001699 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001700 [],
1701 squash=False,
1702 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001703
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001704 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001705 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1706 self._run_gerrit_upload_test(
1707 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1708 'desc\n\nBUG=\n\nChange-Id: I123456789',
1709 squash=False,
1710 squash_mode='override_nosquash',
1711 title='Dont_put_bad_chars')
1712 self.assertIn(
1713 'WARNING: Patchset title may only contain alphanumeric chars '
1714 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1715 'Cleaned up title: Dont put bad chars\n',
1716 git_cl.sys.stdout.getvalue())
1717
ukai@chromium.orge8077812012-02-03 03:41:46 +00001718 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001719 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001720 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001721 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001722 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001723 squash=False,
1724 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001725 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001726
1727 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001728 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001729 [],
bradnelsond975b302016-10-23 12:20:23 -07001730 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1731 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001732 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001733 ['reviewer@example.com', 'another@example.com'],
1734 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001735 squash_mode='override_nosquash',
Aaron Gablefd238082017-06-07 13:42:34 -07001736 cc=['more@example.com', 'people@example.com'],
1737 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001738
1739 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001740 self._run_gerrit_upload_test(
1741 [],
1742 'desc\nBUG=\n\nChange-Id: 123456789',
1743 [],
1744 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001745
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001746 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001747 self._run_gerrit_upload_test(
1748 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001749 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001750 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001751 squash=True,
1752 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001753
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001754 def test_gerrit_upload_squash_first_against_rev(self):
1755 custom_cl_base = 'custom_cl_base_rev_or_branch'
1756 self._run_gerrit_upload_test(
1757 ['--squash', custom_cl_base],
1758 'desc\nBUG=\n\nChange-Id: 123456789',
1759 [],
1760 squash=True,
1761 expected_upstream_ref='origin/master',
1762 custom_cl_base=custom_cl_base)
1763 self.assertIn(
1764 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1765 sys.stdout.getvalue())
1766
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001767 def test_gerrit_upload_squash_first_with_mirror(self):
1768 self._run_gerrit_upload_test(
1769 ['--squash'],
1770 'desc\nBUG=\n\nChange-Id: 123456789',
1771 [],
1772 squash=True,
1773 expected_upstream_ref='origin/master',
1774 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1775
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001776 def test_gerrit_upload_squash_reupload(self):
1777 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001778 self._run_gerrit_upload_test(
1779 ['--squash'],
1780 description,
1781 [],
1782 squash=True,
1783 expected_upstream_ref='origin/master',
1784 issue=123456)
1785
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001786 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1787 self.mock(git_cl, 'DieWithError',
1788 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1789 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1790 with self.assertRaises(SystemExitMock):
1791 self._run_gerrit_upload_test(
1792 ['--squash'],
1793 description,
1794 [],
1795 squash=True,
1796 expected_upstream_ref='origin/master',
1797 issue=123456,
1798 fetched_status='ABANDONED')
1799
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001800 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1801 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1802 lambda *_, **__: {'email': 'yet-another@example.com'})
1803 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1804 self._run_gerrit_upload_test(
1805 ['--squash'],
1806 description,
1807 [],
1808 squash=True,
1809 expected_upstream_ref='origin/master',
1810 issue=123456,
1811 other_cl_owner='other@example.com')
1812 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001813 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001814 'authenticate to Gerrit as yet-another@example.com.\n'
1815 'Uploading may fail due to lack of permissions',
1816 git_cl.sys.stdout.getvalue())
1817
rmistry@google.com2dd99862015-06-22 12:22:18 +00001818 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001819 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001820 def mock_run_git(*args, **_kwargs):
1821 if args[0] == ['for-each-ref',
1822 '--format=%(refname:short) %(upstream:short)',
1823 'refs/heads']:
1824 # Create a local branch dependency tree that looks like this:
1825 # test1 -> test2 -> test3 -> test4 -> test5
1826 # -> test3.1
1827 # test6 -> test0
1828 branch_deps = [
1829 'test2 test1', # test1 -> test2
1830 'test3 test2', # test2 -> test3
1831 'test3.1 test2', # test2 -> test3.1
1832 'test4 test3', # test3 -> test4
1833 'test5 test4', # test4 -> test5
1834 'test6 test0', # test0 -> test6
1835 'test7', # test7
1836 ]
1837 return '\n'.join(branch_deps)
1838 self.mock(git_cl, 'RunGit', mock_run_git)
1839
1840 class RecordCalls:
1841 times_called = 0
1842 record_calls = RecordCalls()
1843 def mock_CMDupload(*args, **_kwargs):
1844 record_calls.times_called += 1
1845 return 0
1846 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1847
1848 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001849 (('ask_for_data', 'This command will checkout all dependent branches '
1850 'and run "git cl upload". Press Enter to continue, '
1851 'or Ctrl+C to abort'), ''),
1852 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001853
1854 class MockChangelist():
1855 def __init__(self):
1856 pass
1857 def GetBranch(self):
1858 return 'test1'
1859 def GetIssue(self):
1860 return '123'
1861 def GetPatchset(self):
1862 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001863 def IsGerrit(self):
1864 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001865
1866 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1867 # CMDupload should have been called 5 times because of 5 dependent branches.
1868 self.assertEquals(5, record_calls.times_called)
1869 self.assertEquals(0, ret)
1870
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001871 def test_gerrit_change_id(self):
1872 self.calls = [
1873 ((['git', 'write-tree'], ),
1874 'hashtree'),
1875 ((['git', 'rev-parse', 'HEAD~0'], ),
1876 'branch-parent'),
1877 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1878 'A B <a@b.org> 1456848326 +0100'),
1879 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1880 'C D <c@d.org> 1456858326 +0100'),
1881 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1882 'hashchange'),
1883 ]
1884 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1885 self.assertEqual(change_id, 'Ihashchange')
1886
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001887 def test_desecription_append_footer(self):
1888 for init_desc, footer_line, expected_desc in [
1889 # Use unique desc first lines for easy test failure identification.
1890 ('foo', 'R=one', 'foo\n\nR=one'),
1891 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1892 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1893 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1894 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1895 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1896 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1897 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1898 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1899 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1900 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1901 ]:
1902 desc = git_cl.ChangeDescription(init_desc)
1903 desc.append_footer(footer_line)
1904 self.assertEqual(desc.description, expected_desc)
1905
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001906 def test_update_reviewers(self):
1907 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001908 ('foo', [], [],
1909 'foo'),
1910 ('foo\nR=xx', [], [],
1911 'foo\nR=xx'),
1912 ('foo\nTBR=xx', [], [],
1913 'foo\nTBR=xx'),
1914 ('foo', ['a@c'], [],
1915 'foo\n\nR=a@c'),
1916 ('foo\nR=xx', ['a@c'], [],
1917 'foo\n\nR=a@c, xx'),
1918 ('foo\nTBR=xx', ['a@c'], [],
1919 'foo\n\nR=a@c\nTBR=xx'),
1920 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1921 'foo\n\nR=a@c, yy\nTBR=xx'),
1922 ('foo\nBUG=', ['a@c'], [],
1923 'foo\nBUG=\nR=a@c'),
1924 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1925 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1926 ('foo', ['a@c', 'b@c'], [],
1927 'foo\n\nR=a@c, b@c'),
1928 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1929 'foo\nBar\n\nR=c@c\nBUG='),
1930 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1931 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001932 # Same as the line before, but full of whitespaces.
1933 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001934 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001935 'foo\nBar\n\nR=c@c\n BUG =',
1936 ),
1937 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001938 ('foo BUG=allo R=joe ', ['c@c'], [],
1939 'foo BUG=allo R=joe\n\nR=c@c'),
1940 # Redundant TBRs get promoted to Rs
1941 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1942 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001943 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001944 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001945 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001946 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001947 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001948 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001949 actual.append(obj.description)
1950 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001951
wittman@chromium.org455dc922015-01-26 20:15:50 +00001952 def test_get_target_ref(self):
1953 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001954 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001955 self.assertEqual(None, git_cl.GetTargetRef(None,
1956 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001957 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001958
wittman@chromium.org455dc922015-01-26 20:15:50 +00001959 # Check default target refs for branches.
1960 self.assertEqual('refs/heads/master',
1961 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001962 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001963 self.assertEqual('refs/heads/master',
1964 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001965 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001966 self.assertEqual('refs/heads/master',
1967 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001968 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001969 self.assertEqual('refs/branch-heads/123',
1970 git_cl.GetTargetRef('origin',
1971 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001972 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001973 self.assertEqual('refs/diff/test',
1974 git_cl.GetTargetRef('origin',
1975 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001976 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001977 self.assertEqual('refs/heads/chrome/m42',
1978 git_cl.GetTargetRef('origin',
1979 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001980 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001981
1982 # Check target refs for user-specified target branch.
1983 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1984 'refs/remotes/branch-heads/123'):
1985 self.assertEqual('refs/branch-heads/123',
1986 git_cl.GetTargetRef('origin',
1987 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001988 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001989 for branch in ('origin/master', 'remotes/origin/master',
1990 'refs/remotes/origin/master'):
1991 self.assertEqual('refs/heads/master',
1992 git_cl.GetTargetRef('origin',
1993 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001994 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001995 for branch in ('master', 'heads/master', 'refs/heads/master'):
1996 self.assertEqual('refs/heads/master',
1997 git_cl.GetTargetRef('origin',
1998 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001999 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002000
wychen@chromium.orga872e752015-04-28 23:42:18 +00002001 def test_patch_when_dirty(self):
2002 # Patch when local tree is dirty
2003 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2004 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2005
2006 def test_diff_when_dirty(self):
2007 # Do 'git cl diff' when local tree is dirty
2008 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2009 self.assertNotEqual(git_cl.main(['diff']), 0)
2010
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002011 @staticmethod
2012 def _get_gerrit_codereview_server_calls(branch, value=None,
2013 git_short_host='host',
2014 detect_branch=True):
2015 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2016
2017 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2018 """
2019 calls = []
2020 if detect_branch:
2021 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
2022 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2023 CERR1 if value is None else value))
2024 if value is None:
2025 calls += [
2026 ((['git', 'config', 'branch.' + branch + '.merge'],),
2027 'refs/heads' + branch),
2028 ((['git', 'config', 'branch.' + branch + '.remote'],),
2029 'origin'),
2030 ((['git', 'config', 'remote.origin.url'],),
2031 'https://%s.googlesource.com/my/repo' % git_short_host),
2032 ]
2033 return calls
2034
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002035 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002036 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002037 detect_gerrit_server=True,
2038 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002039 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002040 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2041 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002042 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002043 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002044 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2045
tandriidf09a462016-08-18 16:23:55 -07002046 if new_branch:
2047 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2048 else:
2049 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002050
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002051 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002052 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002053 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002054 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002055 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2056 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2057 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2058 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002059 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002060 if default_codereview == 'gerrit':
2061 if not force_codereview:
2062 self.calls += [
2063 ((['git', 'config', 'gerrit.host'],), 'true'),
2064 ]
2065 if detect_gerrit_server:
2066 self.calls += self._get_gerrit_codereview_server_calls(
2067 'master', git_short_host=git_short_host,
2068 detect_branch=not new_branch and force_codereview)
2069 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002070
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002071 elif default_codereview == 'rietveld':
2072 self.calls += [
2073 ((['git', 'config', 'gerrit.host'],), CERR1),
2074 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2075 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2076 ]
2077 actual_codereview = 'rietveld'
2078
2079 if actual_codereview == 'rietveld':
2080 self.calls += [
2081 ((['git', 'rev-parse', '--show-cdup'],), ''),
2082 ]
2083 if not default_codereview:
2084 self.calls += [
2085 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2086 ]
2087 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002088 self.calls += [
2089 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002090 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002091 {
2092 'current_revision': '7777777777',
2093 'revisions': {
2094 '1111111111': {
2095 '_number': 1,
2096 'fetch': {'http': {
2097 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2098 'ref': 'refs/changes/56/123456/1',
2099 }},
2100 },
2101 '7777777777': {
2102 '_number': 7,
2103 'fetch': {'http': {
2104 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2105 'ref': 'refs/changes/56/123456/7',
2106 }},
2107 },
2108 },
2109 }),
2110 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002111
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002112 def _common_patch_rietveld_successful(self, **kwargs):
2113 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002114 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002115 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002116 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002117 ((['git', 'config', 'branch.master.rietveldserver',
2118 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002119 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002120 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002121 ((['git', 'commit', '-m',
2122 'Description\n\n' +
2123 'patch from issue 123456 at patchset 60001 ' +
2124 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002125 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002126
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002127 def test_patch_rietveld_default(self):
2128 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002129 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2130
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002131 def test_patch_rietveld_successful_new_branch(self):
2132 self._common_patch_rietveld_successful(default_codereview='rietveld',
2133 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002134 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2135
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002136 def test_patch_rietveld_guess_by_url(self):
2137 self._common_patch_rietveld_successful(
2138 default_codereview=None, # It doesn't matter.
2139 actual_codereview='rietveld')
2140 self.assertEqual(git_cl.main(
2141 ['patch', 'https://codereview.example.com/123456']), 0)
2142
2143 def test_patch_rietveld_conflict(self):
2144 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002145 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002146 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002147
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002148 def test_patch_gerrit_default(self):
2149 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002150 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002151 self.calls += [
2152 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2153 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002154 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002155 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002156 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002157 ((['git', 'config', 'branch.master.gerritserver',
2158 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002159 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002160 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2161 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2162 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002163 ]
2164 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2165
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002166 def test_patch_gerrit_force(self):
2167 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002168 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002169 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002170 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002171 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002172 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002173 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002174 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002175 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002176 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002177 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002178 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2179 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2180 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002181 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002182 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002183
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002184 def test_patch_gerrit_guess_by_url(self):
2185 self._patch_common(
2186 default_codereview=None, # It doesn't matter what's default.
2187 actual_codereview='gerrit',
2188 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002189 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002190 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002191 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002192 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002193 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002194 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002195 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002196 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002197 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002198 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002199 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2200 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2201 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002202 ]
2203 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002204 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002205
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002206 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2207 self._patch_common(
2208 default_codereview=None, # It doesn't matter what's default.
2209 actual_codereview='gerrit',
2210 git_short_host='else', detect_gerrit_server=False)
2211 self.calls += [
2212 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2213 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002214 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002215 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2216 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2217 ''),
2218 ((['git', 'config', 'branch.master.gerritserver',
2219 'https://else-review.googlesource.com'],), ''),
2220 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002221 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2222 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2223 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002224 ]
2225 self.assertEqual(git_cl.main(
2226 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2227
2228 def test_patch_gerrit_conflict(self):
2229 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002230 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002231 self.calls += [
2232 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002233 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002234 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2235 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2236 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002237 ]
2238 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002239 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002240
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002241 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002242 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002243 raise git_cl.gerrit_util.GerritError(404, '')
2244 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2245
tandriic2405f52016-10-10 08:13:15 -07002246 self.calls = [
2247 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2248 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2249 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2250 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2251 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2252 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002253 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2254 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2255 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2256 ((['git', 'config', 'remote.origin.url'],),
2257 'https://chromium.googlesource.com/my/repo'),
2258 ((['DieWithError',
2259 'change 123456 at https://chromium-review.googlesource.com does not '
2260 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002261 ]
2262 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002263 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002264
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002265 def _checkout_calls(self):
2266 return [
2267 ((['git', 'config', '--local', '--get-regexp',
2268 'branch\\..*\\.rietveldissue'], ),
2269 ('branch.retrying.rietveldissue 1111111111\n'
2270 'branch.some-fix.rietveldissue 2222222222\n')),
2271 ((['git', 'config', '--local', '--get-regexp',
2272 'branch\\..*\\.gerritissue'], ),
2273 ('branch.ger-branch.gerritissue 123456\n'
2274 'branch.gbranch654.gerritissue 654321\n')),
2275 ]
2276
2277 def test_checkout_gerrit(self):
2278 """Tests git cl checkout <issue>."""
2279 self.calls = self._checkout_calls()
2280 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2281 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2282
2283 def test_checkout_rietveld(self):
2284 """Tests git cl checkout <issue>."""
2285 self.calls = self._checkout_calls()
2286 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2287 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2288
2289 def test_checkout_not_found(self):
2290 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002291 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002292 self.calls = self._checkout_calls()
2293 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2294
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002295 def test_checkout_no_branch_issues(self):
2296 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002297 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002298 self.calls = [
2299 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002300 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002301 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002302 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002303 ]
2304 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2305
tandrii@chromium.org28253532016-04-14 13:46:56 +00002306 def _test_gerrit_ensure_authenticated_common(self, auth,
2307 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002308 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2309 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2310 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002311 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002312 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002313 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002314 cl.branch = 'master'
2315 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002316 cl.lookedup_issue = True
2317 return cl
2318
2319 def test_gerrit_ensure_authenticated_missing(self):
2320 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002321 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002322 })
2323 self.calls.append(
2324 ((['DieWithError',
2325 'Credentials for the following hosts are required:\n'
2326 ' chromium-review.googlesource.com\n'
2327 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002328 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002329 'https://chromium-review.googlesource.com/new-password'],), ''),)
2330 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2331
2332 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002333 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002334 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002335 'chromium.googlesource.com':
2336 ('git-one.example.com', None, 'secret1'),
2337 'chromium-review.googlesource.com':
2338 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002339 })
2340 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002341 (('ask_for_data', 'If you know what you are doing '
2342 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002343 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2344
2345 def test_gerrit_ensure_authenticated_ok(self):
2346 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002347 'chromium.googlesource.com':
2348 ('git-same.example.com', None, 'secret'),
2349 'chromium-review.googlesource.com':
2350 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002351 })
2352 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2353
tandrii@chromium.org28253532016-04-14 13:46:56 +00002354 def test_gerrit_ensure_authenticated_skipped(self):
2355 cl = self._test_gerrit_ensure_authenticated_common(
2356 auth={}, skip_auth_check=True)
2357 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2358
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002359 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002360 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2361 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002362 self.calls = [
2363 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002364 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002365 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2366 ((['git', 'config', 'rietveld.server'],), ''),
2367 ((['git', 'config', 'rietveld.server'],), ''),
2368 ((['git', 'config', 'branch.feature.rietveldserver'],),
2369 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002370 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002371 ]
2372 self.assertEqual(0, git_cl.main(['set-commit']))
2373
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002374 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002375 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002376 lambda h, i, labels, notify=None:
2377 self._mocked_call(['SetReview', h, i, labels, notify]))
2378
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002379 self.calls = [
2380 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002381 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2382 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002383 ((['git', 'config', 'branch.feature.gerritserver'],),
2384 'https://chromium-review.googlesource.com'),
2385 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002386 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002387 ]
tandriid9e5ce52016-07-13 02:32:59 -07002388
2389 def test_cmd_set_commit_gerrit_clear(self):
2390 self._cmd_set_commit_gerrit_common(0)
2391 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2392
2393 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002394 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002395 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2396
tandriid9e5ce52016-07-13 02:32:59 -07002397 def test_cmd_set_commit_gerrit(self):
2398 self._cmd_set_commit_gerrit_common(2)
2399 self.assertEqual(0, git_cl.main(['set-commit']))
2400
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002401 def test_description_display(self):
2402 out = StringIO.StringIO()
2403 self.mock(git_cl.sys, 'stdout', out)
2404
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002405 self.mock(git_cl, 'Changelist', ChangelistMock)
2406 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002407
2408 self.assertEqual(0, git_cl.main(['description', '-d']))
2409 self.assertEqual('foo\n', out.getvalue())
2410
2411 def test_description_rietveld(self):
2412 out = StringIO.StringIO()
2413 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002414 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002415
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002416 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002417 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002418 self.assertEqual('foobar\n', out.getvalue())
2419
iannucci3c972b92016-08-17 13:24:10 -07002420 def test_StatusFieldOverrideIssueMissingArgs(self):
2421 out = StringIO.StringIO()
2422 self.mock(git_cl.sys, 'stderr', out)
2423
2424 try:
2425 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2426 except SystemExit as ex:
2427 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002428 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002429
2430 out = StringIO.StringIO()
2431 self.mock(git_cl.sys, 'stderr', out)
2432
2433 try:
2434 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2435 except SystemExit as ex:
2436 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002437 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002438
2439 def test_StatusFieldOverrideIssue(self):
2440 out = StringIO.StringIO()
2441 self.mock(git_cl.sys, 'stdout', out)
2442
2443 def assertIssue(cl_self, *_args):
2444 self.assertEquals(cl_self.issue, 1)
2445 return 'foobar'
2446
2447 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2448 self.calls = [
2449 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2450 ((['git', 'config', 'rietveld.server'],), ''),
2451 ((['git', 'config', 'rietveld.server'],), ''),
2452 ]
iannuccie53c9352016-08-17 14:40:40 -07002453 self.assertEqual(
2454 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2455 0)
iannucci3c972b92016-08-17 13:24:10 -07002456 self.assertEqual(out.getvalue(), 'foobar\n')
2457
iannuccie53c9352016-08-17 14:40:40 -07002458 def test_SetCloseOverrideIssue(self):
2459 def assertIssue(cl_self, *_args):
2460 self.assertEquals(cl_self.issue, 1)
2461 return 'foobar'
2462
2463 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2464 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2465 self.calls = [
2466 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2467 ((['git', 'config', 'rietveld.server'],), ''),
2468 ((['git', 'config', 'rietveld.server'],), ''),
2469 ]
2470 self.assertEqual(
2471 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2472
2473 def test_SetCommitOverrideIssue(self):
2474 def assertIssue(cl_self, *_args):
2475 self.assertEquals(cl_self.issue, 1)
2476 return 'foobar'
2477
2478 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2479 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2480 self.calls = [
2481 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2482 ((['git', 'config', 'rietveld.server'],), ''),
2483 ((['git', 'config', 'rietveld.server'],), ''),
2484 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2485 ((['git', 'config', 'rietveld.server'],), ''),
2486 ((['git', 'config', 'rietveld.server'],), ''),
2487 ]
2488 self.assertEqual(
2489 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2490
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002491 def test_description_gerrit(self):
2492 out = StringIO.StringIO()
2493 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002494 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002495 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002496 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2497 {
2498 'current_revision': 'sha1',
2499 'revisions': {'sha1': {
2500 'commit': {'message': 'foobar'},
2501 }},
2502 }),
2503 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002504 self.assertEqual(0, git_cl.main([
2505 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2506 self.assertEqual('foobar\n', out.getvalue())
2507
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002508 def test_description_set_raw(self):
2509 out = StringIO.StringIO()
2510 self.mock(git_cl.sys, 'stdout', out)
2511
2512 self.mock(git_cl, 'Changelist', ChangelistMock)
2513 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2514
2515 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2516 self.assertEqual('hihi', ChangelistMock.desc)
2517
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002518 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002519 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002520
2521 def RunEditor(desc, _, **kwargs):
2522 self.assertEquals(
2523 '# Enter a description of the change.\n'
2524 '# This will be displayed on the codereview site.\n'
2525 '# The first line will also be used as the subject of the review.\n'
2526 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002527 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002528 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002529 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002530 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002531 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002532
dsansomee2d6fd92016-09-08 00:10:47 -07002533 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002534 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002535
2536 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2537 self.mock(git_cl.Changelist, 'GetDescription',
2538 lambda *args: current_desc)
2539 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2540 UpdateDescriptionRemote)
2541 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2542
2543 self.calls = [
2544 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002545 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002546 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2547 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002548 ((['git', 'config', 'core.editor'],), 'vi'),
2549 ]
2550 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2551
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002552 def test_description_set_stdin(self):
2553 out = StringIO.StringIO()
2554 self.mock(git_cl.sys, 'stdout', out)
2555
2556 self.mock(git_cl, 'Changelist', ChangelistMock)
2557 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2558
2559 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2560 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2561
kmarshall3bff56b2016-06-06 18:31:47 -07002562 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002563 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2564
kmarshall3bff56b2016-06-06 18:31:47 -07002565 self.calls = \
2566 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2567 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002568 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002569 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2570 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002571 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2572 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2573 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002574 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2575 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2576 ((['git', 'branch', '-D', 'foo'],), '')]
2577
kmarshall3bff56b2016-06-06 18:31:47 -07002578 self.mock(git_cl, 'get_cl_statuses',
2579 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002580 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2581 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2582 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002583
2584 self.assertEqual(0, git_cl.main(['archive', '-f']))
2585
2586 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002587 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002588 self.calls = \
2589 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2590 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002591 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002592 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2593 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002594 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2595
kmarshall9249e012016-08-23 12:02:16 -07002596 self.mock(git_cl, 'get_cl_statuses',
2597 lambda branches, fine_grained, max_processes:
2598 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2599
2600 self.assertEqual(1, git_cl.main(['archive', '-f']))
2601
2602 def test_archive_dry_run(self):
2603 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2604
2605 self.calls = \
2606 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2607 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2608 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2609 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2610 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2611 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2612 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2613 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2614 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002615
2616 self.mock(git_cl, 'get_cl_statuses',
2617 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002618 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2619 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2620 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002621
kmarshall9249e012016-08-23 12:02:16 -07002622 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2623
2624 def test_archive_no_tags(self):
2625 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2626
2627 self.calls = \
2628 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2629 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2630 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2631 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2632 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2633 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2634 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2635 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2636 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2637 ((['git', 'branch', '-D', 'foo'],), '')]
2638
2639 self.mock(git_cl, 'get_cl_statuses',
2640 lambda branches, fine_grained, max_processes:
2641 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2642 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2643 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2644
2645 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002646
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002647 def test_cmd_issue_erase_existing(self):
2648 out = StringIO.StringIO()
2649 self.mock(git_cl.sys, 'stdout', out)
Aaron Gable400e9892017-07-12 15:31:21 -07002650 self.mock(git_cl.Changelist, 'GetDescription',
2651 lambda _: 'This is a description')
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002652 self.calls = [
2653 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002654 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2655 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002656 # Let this command raise exception (retcode=1) - it should be ignored.
2657 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002658 CERR1),
2659 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2660 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002661 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2662 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2663 ''),
2664 ]
2665 self.assertEqual(0, git_cl.main(['issue', '0']))
2666
Aaron Gable400e9892017-07-12 15:31:21 -07002667 def test_cmd_issue_erase_existing_with_change_id(self):
2668 out = StringIO.StringIO()
2669 self.mock(git_cl.sys, 'stdout', out)
2670 self.mock(git_cl.Changelist, 'GetDescription',
2671 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2672 self.calls = [
2673 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2674 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2675 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
2676 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
2677 # Let this command raise exception (retcode=1) - it should be ignored.
2678 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2679 CERR1),
2680 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2681 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2682 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2683 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2684 ''),
2685 ]
2686 self.assertEqual(0, git_cl.main(['issue', '0']))
2687
phajdan.jre328cf92016-08-22 04:12:17 -07002688 def test_cmd_issue_json(self):
2689 out = StringIO.StringIO()
2690 self.mock(git_cl.sys, 'stdout', out)
2691 self.calls = [
2692 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002693 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002694 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2695 ((['git', 'config', 'rietveld.server'],),
2696 'https://codereview.chromium.org'),
2697 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2698 (('write_json', 'output.json',
2699 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2700 ''),
2701 ]
2702 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2703
tandriide281ae2016-10-12 06:02:30 -07002704 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002705 self.mock(git_cl.Changelist, 'GetChange',
2706 lambda _, *a: (
2707 self._mocked_call(['GetChange']+list(a))))
2708 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2709 lambda *_, **__: (
2710 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002711 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2712 lambda _, s: self._mocked_call(['SetCQState', s]))
2713 self.calls = [
2714 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002715 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002716 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2717 ((['git', 'config', 'rietveld.server'],),
2718 'https://codereview.chromium.org'),
2719 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2720 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2721 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2722 ((['get_or_create_merge_base', 'feature', 'feature'],),
2723 'fake_ancestor_sha'),
2724 ((['GetChange', 'fake_ancestor_sha', None], ),
2725 git_cl.presubmit_support.GitChange(
2726 '', '', '', '', '', '', '', '')),
2727 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2728 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002729 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2730 ]
2731 out = StringIO.StringIO()
2732 self.mock(git_cl.sys, 'stdout', out)
2733 self.assertEqual(0, git_cl.main(['try']))
2734 self.assertEqual(
2735 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002736 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002737
tandrii8c5a3532016-11-04 07:52:02 -07002738 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2739 self.mock(git_cl.Changelist, 'GetChange',
2740 lambda _, *a: (
2741 self._mocked_call(['GetChange']+list(a))))
2742 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2743 lambda *_, **__: (
2744 self._mocked_call(['DoGetTryMasters'])))
2745 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2746 lambda _, s: self._mocked_call(['SetCQState', s]))
2747
tandrii8c5a3532016-11-04 07:52:02 -07002748 self.calls = [
2749 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2750 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2751 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2752 ((['git', 'config', 'branch.feature.gerritserver'],),
2753 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002754 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2755 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2756 'project': 'depot_tools',
2757 'status': 'OPEN',
2758 'owner': {'email': 'owner@e.mail'},
2759 'revisions': {
2760 'deadbeaf': {
2761 '_number': 6,
2762 },
2763 'beeeeeef': {
2764 '_number': 7,
2765 'fetch': {'http': {
2766 'url': 'https://chromium.googlesource.com/depot_tools',
2767 'ref': 'refs/changes/56/123456/7'
2768 }},
2769 },
2770 },
2771 }),
tandrii8c5a3532016-11-04 07:52:02 -07002772 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2773 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2774 ((['get_or_create_merge_base', 'feature', 'feature'],),
2775 'fake_ancestor_sha'),
2776 ((['GetChange', 'fake_ancestor_sha', None], ),
2777 git_cl.presubmit_support.GitChange(
2778 '', '', '', '', '', '', '', '')),
2779 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2780 ((['DoGetTryMasters'], ), None),
2781 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2782 ]
2783 out = StringIO.StringIO()
2784 self.mock(git_cl.sys, 'stdout', out)
2785 self.assertEqual(0, git_cl.main(['try']))
2786 self.assertEqual(
2787 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002788 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002789 'https://chromium-review.googlesource.com/123456\n')
2790
2791 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2792 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2793 lambda _: {
2794 'owner_email': 'owner@e.mail',
2795 'private': False,
2796 'closed': False,
2797 'project': 'depot_tools',
2798 'patchsets': [20001],
2799 })
tandriide281ae2016-10-12 06:02:30 -07002800 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2801 self.calls = [
2802 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2803 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2804 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2805 ((['git', 'config', 'rietveld.server'],),
2806 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002807 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002808 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002809 ]
2810
2811 def _buildbucket_retry(*_, **kw):
2812 # self.maxDiff = 10000
2813 body = json.loads(kw['body'])
2814 self.assertEqual(len(body['builds']), 1)
2815 build = body['builds'][0]
2816 params = json.loads(build.pop('parameters_json'))
2817 self.assertEqual(params, {
2818 u'builder_name': u'win',
2819 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2820 u'revision': None}],
2821 u'properties': {
2822 u'category': u'git_cl_try',
2823 u'issue': 123,
2824 u'key': u'val',
2825 u'json': [{u'a': 1}, None],
2826 u'master': u'tryserver.chromium',
2827 u'patch_project': u'depot_tools',
2828 u'patch_storage': u'rietveld',
2829 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002830 u'rietveld': u'https://codereview.chromium.org',
2831 }
2832 })
2833 self.assertEqual(build, {
2834 u'bucket': u'master.tryserver.chromium',
2835 u'client_operation_id': u'uuid4',
2836 u'tags': [u'builder:win',
2837 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002838 u'user_agent:git_cl_try',
2839 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002840 })
2841
2842 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2843
2844 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2845 self.assertEqual(0, git_cl.main([
2846 'try', '-m', 'tryserver.chromium', '-b', 'win',
2847 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2848 self.assertRegexpMatches(
2849 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002850 'Tried jobs on:\nBucket: master.tryserver.chromium')
2851
tandrii8c5a3532016-11-04 07:52:02 -07002852 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2853 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2854 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2855
tandrii8c5a3532016-11-04 07:52:02 -07002856 self.calls = [
2857 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2858 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2859 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2860 ((['git', 'config', 'branch.feature.gerritserver'],),
2861 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002862 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002863 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002864 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002865 'status': 'OPEN',
2866 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002867 'revisions': {
2868 'deadbeaf': {
2869 '_number': 6,
2870 },
2871 'beeeeeef': {
2872 '_number': 7,
2873 'fetch': {'http': {
2874 'url': 'https://chromium.googlesource.com/depot_tools',
2875 'ref': 'refs/changes/56/123456/7'
2876 }},
2877 },
2878 },
2879 }),
2880 ]
2881
2882 def _buildbucket_retry(*_, **kw):
2883 # self.maxDiff = 10000
2884 body = json.loads(kw['body'])
2885 self.assertEqual(len(body['builds']), 1)
2886 build = body['builds'][0]
2887 params = json.loads(build.pop('parameters_json'))
2888 self.assertEqual(params, {
2889 u'builder_name': u'win',
2890 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2891 u'revision': None}],
2892 u'properties': {
2893 u'category': u'git_cl_try',
2894 u'key': u'val',
2895 u'json': [{u'a': 1}, None],
2896 u'master': u'tryserver.chromium',
2897
2898 u'patch_gerrit_url':
2899 u'https://chromium-review.googlesource.com',
2900 u'patch_issue': 123456,
2901 u'patch_project': u'depot_tools',
2902 u'patch_ref': u'refs/changes/56/123456/7',
2903 u'patch_repository_url':
2904 u'https://chromium.googlesource.com/depot_tools',
2905 u'patch_set': 7,
2906 u'patch_storage': u'gerrit',
2907 }
2908 })
2909 self.assertEqual(build, {
2910 u'bucket': u'master.tryserver.chromium',
2911 u'client_operation_id': u'uuid4',
2912 u'tags': [
2913 u'builder:win',
2914 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2915 u'user_agent:git_cl_try',
2916 u'master:tryserver.chromium'],
2917 })
2918
2919 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2920
2921 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2922 self.assertEqual(0, git_cl.main([
2923 'try', '-m', 'tryserver.chromium', '-b', 'win',
2924 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2925 self.assertRegexpMatches(
2926 git_cl.sys.stdout.getvalue(),
2927 'Tried jobs on:\nBucket: master.tryserver.chromium')
2928
borenet6c0efe62016-10-19 08:13:29 -07002929 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002930 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2931 lambda _: {
2932 'owner_email': 'owner@e.mail',
2933 'private': False,
2934 'closed': False,
2935 'project': 'depot_tools',
2936 'patchsets': [20001],
2937 })
borenet6c0efe62016-10-19 08:13:29 -07002938 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2939 self.calls = [
2940 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2941 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2942 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2943 ((['git', 'config', 'rietveld.server'],),
2944 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002945 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002946 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002947 ]
2948
2949 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002950 body = json.loads(kw['body'])
2951 self.assertEqual(len(body['builds']), 1)
2952 build = body['builds'][0]
2953 params = json.loads(build.pop('parameters_json'))
2954 self.assertEqual(params, {
2955 u'builder_name': u'win',
2956 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2957 u'revision': None}],
2958 u'properties': {
2959 u'category': u'git_cl_try',
2960 u'issue': 123,
2961 u'patch_project': u'depot_tools',
2962 u'patch_storage': u'rietveld',
2963 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002964 u'rietveld': u'https://codereview.chromium.org',
2965 }
2966 })
2967 self.assertEqual(build, {
2968 u'bucket': u'test.bucket',
2969 u'client_operation_id': u'uuid4',
2970 u'tags': [u'builder:win',
2971 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2972 u'user_agent:git_cl_try'],
2973 })
2974
2975 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2976
2977 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2978 self.assertEqual(0, git_cl.main([
2979 'try', '-B', 'test.bucket', '-b', 'win']))
2980 self.assertRegexpMatches(
2981 git_cl.sys.stdout.getvalue(),
2982 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002983
qyearsley123a4682016-10-26 09:12:17 -07002984 def test_git_cl_try_bots_on_multiple_masters(self):
2985 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2986 self.calls = [
2987 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2988 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2989 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2990 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002991 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002992 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2993 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2994 ]
2995
2996 def _buildbucket_retry(*_, **kw):
2997 body = json.loads(kw['body'])
2998 self.assertEqual(len(body['builds']), 2)
2999
3000 first_build_params = json.loads(body['builds'][0]['parameters_json'])
3001 self.assertEqual(first_build_params['builder_name'], 'builder1')
3002 self.assertEqual(first_build_params['properties']['master'], 'master1')
3003
3004 first_build_params = json.loads(body['builds'][1]['parameters_json'])
3005 self.assertEqual(first_build_params['builder_name'], 'builder2')
3006 self.assertEqual(first_build_params['properties']['master'], 'master2')
3007
3008 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3009
3010 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
3011 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3012
3013 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3014 self.assertEqual(
3015 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3016 self.assertEqual(
3017 git_cl.sys.stdout.getvalue(),
3018 'Tried jobs on:\n'
3019 'Bucket: master.master1\n'
3020 ' builder1: []\n'
3021 'Bucket: master.master2\n'
3022 ' builder2: []\n'
3023 'To see results here, run: git cl try-results\n'
3024 'To see results in browser, run: git cl web\n')
3025
tandrii16e0b4e2016-06-07 10:34:28 -07003026 def _common_GerritCommitMsgHookCheck(self):
3027 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3028 self.mock(git_cl.os.path, 'abspath',
3029 lambda path: self._mocked_call(['abspath', path]))
3030 self.mock(git_cl.os.path, 'exists',
3031 lambda path: self._mocked_call(['exists', path]))
3032 self.mock(git_cl.gclient_utils, 'FileRead',
3033 lambda path: self._mocked_call(['FileRead', path]))
3034 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3035 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3036 self.calls = [
3037 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3038 ((['abspath', '../'],), '/abs/git_repo_root'),
3039 ]
3040 return git_cl.Changelist(codereview='gerrit', issue=123)
3041
3042 def test_GerritCommitMsgHookCheck_custom_hook(self):
3043 cl = self._common_GerritCommitMsgHookCheck()
3044 self.calls += [
3045 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3046 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3047 '#!/bin/sh\necho "custom hook"')
3048 ]
3049 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3050
3051 def test_GerritCommitMsgHookCheck_not_exists(self):
3052 cl = self._common_GerritCommitMsgHookCheck()
3053 self.calls += [
3054 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3055 ]
3056 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3057
3058 def test_GerritCommitMsgHookCheck(self):
3059 cl = self._common_GerritCommitMsgHookCheck()
3060 self.calls += [
3061 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3062 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3063 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003064 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003065 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3066 ''),
3067 ]
3068 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3069
tandriic4344b52016-08-29 06:04:54 -07003070 def test_GerritCmdLand(self):
3071 self.calls += [
3072 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3073 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3074 'deadbeaf'),
3075 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3076 ((['git', 'config', 'branch.feature.gerritserver'],),
3077 'chromium-review.googlesource.com'),
3078 ]
3079 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3080 cl._codereview_impl._GetChangeDetail = lambda _: {
3081 'labels': {},
3082 'current_revision': 'deadbeaf',
3083 }
agable32978d92016-11-01 12:55:02 -07003084 cl._codereview_impl._GetChangeCommit = lambda: {
3085 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003086 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003087 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3088 }
tandriic4344b52016-08-29 06:04:54 -07003089 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003090 out = StringIO.StringIO()
3091 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003092 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003093 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003094 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003095
tandrii221ab252016-10-06 08:12:04 -07003096 BUILDBUCKET_BUILDS_MAP = {
3097 '9000': {
3098 'id': '9000',
3099 'status': 'STARTED',
3100 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3101 'result_details_json': '{"properties": {}}',
3102 'bucket': 'master.x.y',
3103 'created_by': 'user:someone@chromium.org',
3104 'created_ts': '147200002222000',
3105 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3106 },
3107 '8000': {
3108 'id': '8000',
3109 'status': 'COMPLETED',
3110 'result': 'FAILURE',
3111 'failure_reason': 'BUILD_FAILURE',
3112 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3113 'result_details_json': '{"properties": {}}',
3114 'bucket': 'master.x.y',
3115 'created_by': 'user:someone@chromium.org',
3116 'created_ts': '147200001111000',
3117 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3118 },
3119 }
3120
3121 def test_write_try_results_json(self):
3122 expected_output = [
3123 {
3124 'buildbucket_id': '8000',
3125 'bucket': 'master.x.y',
3126 'builder_name': 'my-builder',
3127 'status': 'COMPLETED',
3128 'result': 'FAILURE',
3129 'failure_reason': 'BUILD_FAILURE',
3130 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3131 },
3132 {
3133 'buildbucket_id': '9000',
3134 'bucket': 'master.x.y',
3135 'builder_name': 'my-builder',
3136 'status': 'STARTED',
3137 'result': None,
3138 'failure_reason': None,
3139 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3140 }
3141 ]
3142 self.calls = [(('write_json', 'output.json', expected_output), '')]
3143 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3144
tandrii45b2a582016-10-11 03:14:16 -07003145 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003146 out = StringIO.StringIO()
3147 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003148 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3149 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003150 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3151 self._mocked_call(['get_authenticator_for_host', host]))
3152 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3153 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003154
3155 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3156 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003157 self.calls += [
3158 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3159 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3160 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3161 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3162 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3163 ((['git', 'config', 'branch.feature.rietveldserver'],),
3164 'codereview.example.com'),
3165 ((['get_authenticator_for_host', 'codereview.example.com'],),
3166 AuthenticatorMock()),
3167 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3168
3169 def test_fetch_try_jobs_none_rietveld(self):
3170 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003171 # Simulate that user isn't logged in.
3172 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003173 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003174 self.assertRegexpMatches(sys.stdout.getvalue(),
3175 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003176 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3177
3178 def test_fetch_try_jobs_some_rietveld(self):
3179 self._setup_fetch_try_jobs_rietveld({
3180 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3181 })
3182 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003183 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3184 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3185 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3186
3187 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3188 self._setup_fetch_try_jobs(most_recent_patchset=13)
3189 self.calls += [
3190 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3191 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3192 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003193 # TODO(tandrii): Uncomment the below if we decide to support checking
3194 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003195 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003196 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003197 ((['git', 'config', 'branch.feature.gerritserver'],),
3198 'https://x-review.googlesource.com'),
3199 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3200 AuthenticatorMock()),
3201 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3202
3203 def test_fetch_try_jobs_none_gerrit(self):
3204 self._setup_fetch_try_jobs_gerrit({})
3205 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003206 # TODO(tandrii): Uncomment the below if we decide to support checking
3207 # patchsets for Gerrit.
3208 # self.assertRegexpMatches(
3209 # sys.stdout.getvalue(),
3210 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003211 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3212
3213 def test_fetch_try_jobs_some_gerrit(self):
3214 self._setup_fetch_try_jobs_gerrit({
3215 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3216 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003217 # TODO(tandrii): Uncomment the below if we decide to support checking
3218 # patchsets for Gerrit.
3219 # self.calls.remove(
3220 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003221 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3222
3223 # ... and doesn't result in warning.
3224 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3225 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003226 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3227 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3228
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003229 def _mock_gerrit_changes_for_detail_cache(self):
3230 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003231
3232 def test_gerrit_change_detail_cache_normalize(self):
3233 self._mock_gerrit_changes_for_detail_cache()
3234 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003235 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003236 ]
3237 cl = git_cl.Changelist(codereview='gerrit')
3238 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3239 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3240 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3241 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3242
3243 def test_gerrit_change_detail_cache_simple(self):
3244 self._mock_gerrit_changes_for_detail_cache()
3245 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003246 (('GetChangeDetail', 'host', '1', []), 'a'),
3247 (('GetChangeDetail', 'host', '2', []), 'b'),
3248 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003249 ]
3250 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3251 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3252 self.assertEqual(cl._GetChangeDetail(), 'a')
3253 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003254 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003255 self.assertEqual(cl._GetChangeDetail(), 'a')
3256 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3257
3258 def test_gerrit_change_detail_cache_options(self):
3259 self._mock_gerrit_changes_for_detail_cache()
3260 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003261 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3262 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3263 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3264 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003265 ]
3266 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3267 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3268 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3269 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3270 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3271 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3272 self.assertEqual(cl._GetChangeDetail(), 'cab')
3273
3274 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3275 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3276 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3277 self.assertEqual(cl._GetChangeDetail(), 'cab')
3278
3279 # Finally, no_cache should invalidate all caches for given change.
3280 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3281 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3282
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003283 def test_gerrit_description_caching(self):
3284 def gen_detail(rev, desc):
3285 return {
3286 'current_revision': rev,
3287 'revisions': {rev: {'commit': {'message': desc}}}
3288 }
3289 self.calls = [
3290 (('GetChangeDetail', 'host', '1',
3291 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3292 gen_detail('rev1', 'desc1')),
3293 (('GetChangeDetail', 'host', '1',
3294 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3295 gen_detail('rev2', 'desc2')),
3296 ]
3297
3298 self._mock_gerrit_changes_for_detail_cache()
3299 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3300 self.assertEqual(cl.GetDescription(), 'desc1')
3301 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3302 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003303
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003304 def test_print_current_creds(self):
3305 class CookiesAuthenticatorMock(object):
3306 def __init__(self):
3307 self.gitcookies = {
3308 'host.googlesource.com': ('user', 'pass'),
3309 'host-review.googlesource.com': ('user', 'pass'),
3310 }
3311 self.netrc = self
3312 self.netrc.hosts = {
3313 'github.com': ('user2', None, 'pass2'),
3314 'host2.googlesource.com': ('user3', None, 'pass'),
3315 }
3316 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3317 CookiesAuthenticatorMock)
3318 self.mock(sys, 'stdout', StringIO.StringIO())
3319 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3320 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3321 ' Host\t User\t Which file',
3322 '============================\t=====\t===========',
3323 'host-review.googlesource.com\t user\t.gitcookies',
3324 ' host.googlesource.com\t user\t.gitcookies',
3325 ' host2.googlesource.com\tuser3\t .netrc',
3326 ])
3327 sys.stdout.buf = ''
3328 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3329 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3330 ' Host\tUser\t Which file',
3331 '============================\t====\t===========',
3332 'host-review.googlesource.com\tuser\t.gitcookies',
3333 ' host.googlesource.com\tuser\t.gitcookies',
3334 ])
3335
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003336 def _common_creds_check_mocks(self):
3337 def exists_mock(path):
3338 dirname = os.path.dirname(path)
3339 if dirname == os.path.expanduser('~'):
3340 dirname = '~'
3341 base = os.path.basename(path)
3342 if base in ('.netrc', '.gitcookies'):
3343 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3344 # git cl also checks for existence other files not relevant to this test.
3345 return None
3346 self.mock(os.path, 'exists', exists_mock)
3347 self.mock(sys, 'stdout', StringIO.StringIO())
3348
3349 def test_creds_check_gitcookies_not_configured(self):
3350 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003351 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003352 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003353 self.calls = [
3354 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3355 (('os.path.exists', '~/.netrc'), True),
3356 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3357 'or Ctrl+C to abort'), ''),
3358 ((['git', 'config', '--global', 'http.cookiefile',
3359 os.path.expanduser('~/.gitcookies')], ), ''),
3360 ]
3361 self.assertEqual(0, git_cl.main(['creds-check']))
3362 self.assertRegexpMatches(
3363 sys.stdout.getvalue(),
3364 '^You seem to be using outdated .netrc for git credentials:')
3365 self.assertRegexpMatches(
3366 sys.stdout.getvalue(),
3367 '\nConfigured git to use .gitcookies from')
3368
3369 def test_creds_check_gitcookies_configured_custom_broken(self):
3370 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003371 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003372 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003373 self.calls = [
3374 ((['git', 'config', '--global', 'http.cookiefile'],),
3375 '/custom/.gitcookies'),
3376 (('os.path.exists', '/custom/.gitcookies'), False),
3377 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3378 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3379 ((['git', 'config', '--global', 'http.cookiefile',
3380 os.path.expanduser('~/.gitcookies')], ), ''),
3381 ]
3382 self.assertEqual(0, git_cl.main(['creds-check']))
3383 self.assertRegexpMatches(
3384 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003385 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003386 self.assertRegexpMatches(
3387 sys.stdout.getvalue(),
3388 'However, your configured .gitcookies file is missing.')
3389
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003390 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003391 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003392 lambda _, message, publish: self._mocked_call(
3393 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003394 self.calls = [
3395 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3396 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003397 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003398 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003399 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3400 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003401
3402 def test_git_cl_comment_add_gerrit(self):
3403 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003404 lambda host, change, msg, ready:
3405 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003406 self.calls = [
3407 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3408 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3409 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3410 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3411 'origin/master'),
3412 ((['git', 'config', 'remote.origin.url'],),
3413 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003414 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3415 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003416 ]
3417 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3418 '-a', 'msg']))
3419
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003420 def test_git_cl_comments_fetch_rietveld(self):
3421 self.mock(sys, 'stdout', StringIO.StringIO())
3422 self.calls = [
3423 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3424 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3425 ] * 2
3426 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3427 'messages': [
3428 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3429 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3430 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3431 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3432 # Intentionally wrong order here.
3433 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3434 'disapproval': False, 'approval': False,
3435 'sender': 'owner@example.com'},
3436 ],
3437 'owner_email': 'owner@example.com',
3438 })
3439 expected_comments_summary = [
3440 git_cl._CommentSummary(
3441 message='lgtm',
3442 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3443 disapproval=False, approval=True, sender='r@example.com'),
3444 git_cl._CommentSummary(
3445 message='not lgtm',
3446 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3447 disapproval=True, approval=False, sender='r2@example.com'),
3448 # Note: same order as in whatever Rietveld returns.
3449 git_cl._CommentSummary(
3450 message='PTAL',
3451 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3452 disapproval=False, approval=False, sender='owner@example.com'),
3453 ]
3454 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3455 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3456
3457 with git_cl.gclient_utils.temporary_directory() as tempdir:
3458 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3459 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3460 '-j', out_file]))
3461 with open(out_file) as f:
3462 read = json.load(f)
3463 self.assertEqual(len(read), 3)
3464 self.assertEqual(read[0], {
3465 'date': '2000-03-13 20:49:34.515270',
3466 'message': 'PTAL',
3467 'approval': False,
3468 'disapproval': False,
3469 'sender': 'owner@example.com'})
3470 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3471 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3472
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003473 def test_git_cl_comments_fetch_gerrit(self):
3474 self.mock(sys, 'stdout', StringIO.StringIO())
3475 self.calls = [
3476 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3477 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3478 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3479 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3480 'origin/master'),
3481 ((['git', 'config', 'remote.origin.url'],),
3482 'https://chromium.googlesource.com/infra/infra'),
3483 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3484 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003485 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003486 'messages': [
3487 {
3488 u'_revision_number': 1,
3489 u'author': {
3490 u'_account_id': 1111084,
3491 u'email': u'commit-bot@chromium.org',
3492 u'name': u'Commit Bot'
3493 },
3494 u'date': u'2017-03-15 20:08:45.000000000',
3495 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3496 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3497 u'tag': u'autogenerated:cq:dry-run'
3498 },
3499 {
3500 u'_revision_number': 2,
3501 u'author': {
3502 u'_account_id': 11151243,
3503 u'email': u'owner@example.com',
3504 u'name': u'owner'
3505 },
3506 u'date': u'2017-03-16 20:00:41.000000000',
3507 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3508 u'message': u'PTAL',
3509 },
3510 {
3511 u'_revision_number': 2,
3512 u'author': {
3513 u'_account_id': 148512 ,
3514 u'email': u'reviewer@example.com',
3515 u'name': u'reviewer'
3516 },
3517 u'date': u'2017-03-17 05:19:37.500000000',
3518 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3519 u'message': u'Patch Set 2: Code-Review+1',
3520 },
3521 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003522 }),
3523 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3524 '/COMMIT_MSG': [
3525 {
3526 'author': {'email': u'reviewer@example.com'},
3527 'updated': u'2017-03-17 05:19:37.500000000',
3528 'patch_set': 2,
3529 'side': 'REVISION',
3530 'message': 'Please include a bug link',
3531 },
3532 ],
3533 'codereview.settings': [
3534 {
3535 'author': {'email': u'owner@example.com'},
3536 'updated': u'2017-03-16 20:00:41.000000000',
3537 'patch_set': 2,
3538 'side': 'PARENT',
3539 'line': 42,
3540 'message': 'I removed this because it is bad',
3541 },
3542 ]
3543 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003544 ] * 2
3545 expected_comments_summary = [
3546 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003547 message=(
3548 u'PTAL\n' +
3549 u'\n' +
3550 u'codereview.settings\n' +
3551 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3552 u'c/1/2/codereview.settings#b42\n' +
3553 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003554 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3555 disapproval=False, approval=False, sender=u'owner@example.com'),
3556 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003557 message=(
3558 u'Patch Set 2: Code-Review+1\n' +
3559 u'\n' +
3560 u'/COMMIT_MSG\n' +
3561 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3562 u'c/1/2//COMMIT_MSG#\n' +
3563 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003564 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3565 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3566 ]
3567 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3568 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3569
3570 with git_cl.gclient_utils.temporary_directory() as tempdir:
3571 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3572 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3573 '-j', out_file]))
3574 with open(out_file) as f:
3575 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003576 self.assertEqual(len(read), 2)
3577 self.assertEqual(read[0], {
3578 u'date': u'2017-03-16 20:00:41.000000',
3579 u'message': (
3580 u'PTAL\n' +
3581 u'\n' +
3582 u'codereview.settings\n' +
3583 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3584 u'c/1/2/codereview.settings#b42\n' +
3585 u' I removed this because it is bad\n'),
3586 u'approval': False,
3587 u'disapproval': False,
3588 u'sender': u'owner@example.com'})
3589 self.assertEqual(read[1], {
3590 u'date': u'2017-03-17 05:19:37.500000',
3591 u'message': (
3592 u'Patch Set 2: Code-Review+1\n' +
3593 u'\n' +
3594 u'/COMMIT_MSG\n' +
3595 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3596 u'c/1/2//COMMIT_MSG#\n' +
3597 u' Please include a bug link\n'),
3598 u'approval': False,
3599 u'disapproval': False,
3600 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003601
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003602
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003603if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003604 logging.basicConfig(
3605 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003606 unittest.main()