blob: e9ceb3d768025a3ce2ba33d6ec4b4fd5bdecf2c0 [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Unit tests for git_cl.py."""
7
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01009import datetime
tandriide281ae2016-10-12 06:02:30 -070010import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010011import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000013import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014import sys
15import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000016import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017
18sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
19
20from testing_support.auto_stub import TestCase
21
22import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000023import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000024import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026
tandrii5d48c322016-08-18 16:19:37 -070027def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
28 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
29
30
31CERR1 = callError(1)
32
33
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000034class ChangelistMock(object):
35 # A class variable so we can access it when we don't have access to the
36 # instance that's being set.
37 desc = ""
38 def __init__(self, **kwargs):
39 pass
40 def GetIssue(self):
41 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080042 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070044 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000045 ChangelistMock.desc = desc
46
tandrii5d48c322016-08-18 16:19:37 -070047
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000048class PresubmitMock(object):
49 def __init__(self, *args, **kwargs):
50 self.reviewers = []
51 @staticmethod
52 def should_continue():
53 return True
54
55
56class RietveldMock(object):
57 def __init__(self, *args, **kwargs):
58 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000059
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000060 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080061 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000062 return 'Issue: %d' % issue
63
maruel@chromium.org78936cb2013-04-11 00:17:52 +000064 @staticmethod
65 def get_issue_properties(_issue, _messages):
66 return {
67 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
68 'messages': [
69 {
70 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070071 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000072 'sender': 'john@chromium.org',
73 },
74 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010075 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000076 }
77
iannuccie53c9352016-08-17 14:40:40 -070078 @staticmethod
79 def close_issue(_issue):
80 return 'Closed'
81
skobes6468b902016-10-24 08:45:10 -070082 @staticmethod
83 def get_patch(issue, patchset):
84 return 'patch set from issue %s patchset %s' % (issue, patchset)
85
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010086 @staticmethod
87 def update_description(_issue, _description):
88 return 'Updated'
89
90 @staticmethod
91 def add_comment(_issue, _comment):
92 return 'Commented'
93
94
95
skobes6468b902016-10-24 08:45:10 -070096
97class GitCheckoutMock(object):
98 def __init__(self, *args, **kwargs):
99 pass
100
101 @staticmethod
102 def reset():
103 GitCheckoutMock.conflict = False
104
105 def apply_patch(self, p):
106 if GitCheckoutMock.conflict:
107 raise Exception('failed')
108
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000109
110class WatchlistsMock(object):
111 def __init__(self, _):
112 pass
113 @staticmethod
114 def GetWatchersForPaths(_):
115 return ['joe@example.com']
116
117
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000118class CodereviewSettingsFileMock(object):
119 def __init__(self):
120 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800121 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000122 def read(self):
123 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000124 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000125
126
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000127class AuthenticatorMock(object):
128 def __init__(self, *_args):
129 pass
130 def has_cached_credentials(self):
131 return True
tandrii221ab252016-10-06 08:12:04 -0700132 def authorize(self, http):
133 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000134
135
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100136def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000137 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
138
139 Usage:
140 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100141 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000142
143 OR
144 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100145 CookiesAuthenticatorMockFactory(
146 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 """
148 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800149 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000150 # Intentionally not calling super() because it reads actual cookie files.
151 pass
152 @classmethod
153 def get_gitcookies_path(cls):
154 return '~/.gitcookies'
155 @classmethod
156 def get_netrc_path(cls):
157 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100158 def _get_auth_for_host(self, host):
159 if same_auth:
160 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000161 return (hosts_with_creds or {}).get(host)
162 return CookiesAuthenticatorMock
163
kmarshall9249e012016-08-23 12:02:16 -0700164class MockChangelistWithBranchAndIssue():
165 def __init__(self, branch, issue):
166 self.branch = branch
167 self.issue = issue
168 def GetBranch(self):
169 return self.branch
170 def GetIssue(self):
171 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000172
tandriic2405f52016-10-10 08:13:15 -0700173
174class SystemExitMock(Exception):
175 pass
176
177
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000178class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100179 def test_get_description(self):
180 cl = git_cl.Changelist(issue=1, codereview='rietveld',
181 codereview_host='host')
182 cl.description = 'x'
183 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800184 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100185 self.assertEquals(cl.GetDescription(), 'x')
186 self.assertEquals(cl.GetDescription(force=True), 'y')
187 self.assertEquals(cl.GetDescription(), 'y')
188
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700189 def test_description_footers(self):
190 cl = git_cl.Changelist(issue=1, codereview='gerrit',
191 codereview_host='host')
192 cl.description = '\n'.join([
193 'This is some message',
194 '',
195 'It has some lines',
196 'and, also',
197 '',
198 'Some: Really',
199 'Awesome: Footers',
200 ])
201 cl.has_description = True
202 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
203 msg, footers = cl.GetDescriptionFooters()
204 self.assertEquals(
205 msg, ['This is some message', '', 'It has some lines', 'and, also'])
206 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
207
208 msg.append('wut')
209 footers.append(('gnarly-dude', 'beans'))
210 cl.UpdateDescriptionFooters(msg, footers)
211 self.assertEquals(cl.GetDescription().splitlines(), [
212 'This is some message',
213 '',
214 'It has some lines',
215 'and, also',
216 'wut'
217 '',
218 'Some: Really',
219 'Awesome: Footers',
220 'Gnarly-Dude: beans',
221 ])
222
tandriif9aefb72016-07-01 09:06:51 -0700223 def test_get_bug_line_values(self):
224 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
225 self.assertEqual(f('', ''), [])
226 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
227 self.assertEqual(f('v8', '456'), ['v8:456'])
228 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
229 # Not nice, but not worth carying.
230 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
231 ['v8:456', 'chromium:123', 'v8:123'])
232
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100233 def _test_git_number(self, parent_msg, dest_ref, child_msg,
234 parent_hash='parenthash'):
235 desc = git_cl.ChangeDescription(child_msg)
236 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
237 return desc.description
238
239 def assertEqualByLine(self, actual, expected):
240 self.assertEqual(actual.splitlines(), expected.splitlines())
241
242 def test_git_number_bad_parent(self):
243 with self.assertRaises(ValueError):
244 self._test_git_number('Parent', 'refs/heads/master', 'Child')
245
246 def test_git_number_bad_parent_footer(self):
247 with self.assertRaises(AssertionError):
248 self._test_git_number(
249 'Parent\n'
250 '\n'
251 'Cr-Commit-Position: wrong',
252 'refs/heads/master', 'Child')
253
254 def test_git_number_bad_lineage_ignored(self):
255 actual = self._test_git_number(
256 'Parent\n'
257 '\n'
258 'Cr-Commit-Position: refs/heads/master@{#1}\n'
259 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
260 'refs/heads/master', 'Child')
261 self.assertEqualByLine(
262 actual,
263 'Child\n'
264 '\n'
265 'Cr-Commit-Position: refs/heads/master@{#2}\n'
266 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
267
268 def test_git_number_same_branch(self):
269 actual = self._test_git_number(
270 'Parent\n'
271 '\n'
272 'Cr-Commit-Position: refs/heads/master@{#12}',
273 dest_ref='refs/heads/master',
274 child_msg='Child')
275 self.assertEqualByLine(
276 actual,
277 'Child\n'
278 '\n'
279 'Cr-Commit-Position: refs/heads/master@{#13}')
280
281 def test_git_number_same_branch_with_originals(self):
282 actual = self._test_git_number(
283 'Parent\n'
284 '\n'
285 'Cr-Commit-Position: refs/heads/master@{#12}',
286 dest_ref='refs/heads/master',
287 child_msg='Child\n'
288 '\n'
289 'Some users are smart and insert their own footers\n'
290 '\n'
291 'Cr-Whatever: value\n'
292 'Cr-Commit-Position: refs/copy/paste@{#22}')
293 self.assertEqualByLine(
294 actual,
295 'Child\n'
296 '\n'
297 'Some users are smart and insert their own footers\n'
298 '\n'
299 'Cr-Original-Whatever: value\n'
300 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
301 'Cr-Commit-Position: refs/heads/master@{#13}')
302
303 def test_git_number_new_branch(self):
304 actual = self._test_git_number(
305 'Parent\n'
306 '\n'
307 'Cr-Commit-Position: refs/heads/master@{#12}',
308 dest_ref='refs/heads/branch',
309 child_msg='Child')
310 self.assertEqualByLine(
311 actual,
312 'Child\n'
313 '\n'
314 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
315 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
316
317 def test_git_number_lineage(self):
318 actual = self._test_git_number(
319 'Parent\n'
320 '\n'
321 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
322 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
323 dest_ref='refs/heads/branch',
324 child_msg='Child')
325 self.assertEqualByLine(
326 actual,
327 'Child\n'
328 '\n'
329 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
330 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
331
332 def test_git_number_moooooooore_lineage(self):
333 actual = self._test_git_number(
334 'Parent\n'
335 '\n'
336 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
337 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
338 dest_ref='refs/heads/mooore',
339 child_msg='Child')
340 self.assertEqualByLine(
341 actual,
342 'Child\n'
343 '\n'
344 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
345 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
346 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
347
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100348 def test_git_number_ever_moooooooore_lineage(self):
349 self.maxDiff = 10000
350 actual = self._test_git_number(
351 'CQ commit on fresh new branch + numbering.\n'
352 '\n'
353 'NOTRY=True\n'
354 'NOPRESUBMIT=True\n'
355 'BUG=\n'
356 '\n'
357 'Review-Url: https://codereview.chromium.org/2577703003\n'
358 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
359 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
360 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
361 dest_ref='refs/heads/gnumb-test/cl',
362 child_msg='git cl on fresh new branch + numbering.\n'
363 '\n'
364 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
365 self.assertEqualByLine(
366 actual,
367 'git cl on fresh new branch + numbering.\n'
368 '\n'
369 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
370 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
371 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
372 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
373 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100374
375 def test_git_number_cherry_pick(self):
376 actual = self._test_git_number(
377 'Parent\n'
378 '\n'
379 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
380 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
381 dest_ref='refs/heads/branch',
382 child_msg='Child, which is cherry-pick from master\n'
383 '\n'
384 'Cr-Commit-Position: refs/heads/master@{#100}\n'
385 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
386 self.assertEqualByLine(
387 actual,
388 'Child, which is cherry-pick from master\n'
389 '\n'
390 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
391 '\n'
392 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
393 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
394 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
395
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000396
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200397class TestParseIssueURL(unittest.TestCase):
398 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
399 codereview=None, fail=False):
400 self.assertIsNotNone(parsed)
401 if fail:
402 self.assertFalse(parsed.valid)
403 return
404 self.assertTrue(parsed.valid)
405 self.assertEqual(parsed.issue, issue)
406 self.assertEqual(parsed.patchset, patchset)
407 self.assertEqual(parsed.hostname, hostname)
408 self.assertEqual(parsed.codereview, codereview)
409
410 def _run_and_validate(self, func, url, *args, **kwargs):
411 result = func(urlparse.urlparse(url))
412 if kwargs.pop('fail', False):
413 self.assertIsNone(result)
414 return None
415 self._validate(result, *args, fail=False, **kwargs)
416
417 def test_rietveld(self):
418 def test(url, *args, **kwargs):
419 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
420 *args, codereview='rietveld', **kwargs)
421
422 test('http://codereview.chromium.org/123',
423 123, None, 'codereview.chromium.org')
424 test('https://codereview.chromium.org/123',
425 123, None, 'codereview.chromium.org')
426 test('https://codereview.chromium.org/123/',
427 123, None, 'codereview.chromium.org')
428 test('https://codereview.chromium.org/123/whatever',
429 123, None, 'codereview.chromium.org')
430 test('https://codereview.chromium.org/123/#ps20001',
431 123, 20001, 'codereview.chromium.org')
432 test('http://codereview.chromium.org/download/issue123_4.diff',
433 123, 4, 'codereview.chromium.org')
434 # This looks like bad Gerrit, but is actually valid Rietveld, too.
435 test('https://chrome-review.source.com/123/4/',
436 123, None, 'chrome-review.source.com')
437
438 test('https://codereview.chromium.org/deadbeaf', fail=True)
439 test('https://codereview.chromium.org/api/123', fail=True)
440 test('bad://codereview.chromium.org/123', fail=True)
441 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
442
443 def test_gerrit(self):
444 def test(url, issue=None, patchset=None, hostname=None, fail=None):
445 self._test_ParseIssueUrl(
446 git_cl._GerritChangelistImpl.ParseIssueURL,
447 url, issue, patchset, hostname, fail)
448 def test(url, *args, **kwargs):
449 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
450 *args, codereview='gerrit', **kwargs)
451
452 test('http://chrome-review.source.com/c/123',
453 123, None, 'chrome-review.source.com')
454 test('https://chrome-review.source.com/c/123/',
455 123, None, 'chrome-review.source.com')
456 test('https://chrome-review.source.com/c/123/4',
457 123, 4, 'chrome-review.source.com')
458 test('https://chrome-review.source.com/#/c/123/4',
459 123, 4, 'chrome-review.source.com')
460 test('https://chrome-review.source.com/c/123/4',
461 123, 4, 'chrome-review.source.com')
462 test('https://chrome-review.source.com/123',
463 123, None, 'chrome-review.source.com')
464 test('https://chrome-review.source.com/123/4',
465 123, 4, 'chrome-review.source.com')
466
467 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
468 test('https://chrome-review.source.com/c/abc/', fail=True)
469 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
470
471 def test_ParseIssueNumberArgument(self):
472 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200473 codereview_hint = kwargs.pop('hint', None)
474 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
475 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200476
477 test('123', 123)
478 test('', fail=True)
479 test('abc', fail=True)
480 test('123/1', fail=True)
481 test('123a', fail=True)
482 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
483 # Rietveld.
484 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200485 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200486 test('https://codereview.source.com/123',
487 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200488 # Matches both, but we take Gerrit if specifically requested.
489 test('https://codereview.source.com/123',
490 123, None, 'codereview.source.com', 'gerrit',
491 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200492 # Gerrrit.
493 test('https://chrome-review.source.com/c/123/4',
494 123, 4, 'chrome-review.source.com', 'gerrit')
495 test('https://chrome-review.source.com/bad/123/4', fail=True)
496
497
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100498class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100499 def setUp(self):
500 super(GitCookiesCheckerTest, self).setUp()
501 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100502 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100503
504 def mock_hosts_creds(self, subhost_identity_pairs):
505 def ensure_googlesource(h):
506 if not h.endswith(self.c._GOOGLESOURCE):
507 assert not h.endswith('.')
508 return h + '.' + self.c._GOOGLESOURCE
509 return h
510 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
511 for h, i in subhost_identity_pairs]
512
513 def test_analysis_nothing(self):
514 self.c._all_hosts = []
515 self.assertFalse(self.c.has_generic_host())
516 self.assertEqual(set(), self.c.get_conflicting_hosts())
517 self.assertEqual(set(), self.c.get_duplicated_hosts())
518 self.assertEqual(set(), self.c.get_partially_configured_hosts())
519 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
520
521 def test_analysis(self):
522 self.mock_hosts_creds([
523 ('.googlesource.com', 'git-example.chromium.org'),
524
525 ('chromium', 'git-example.google.com'),
526 ('chromium-review', 'git-example.google.com'),
527 ('chrome-internal', 'git-example.chromium.org'),
528 ('chrome-internal-review', 'git-example.chromium.org'),
529 ('conflict', 'git-example.google.com'),
530 ('conflict-review', 'git-example.chromium.org'),
531 ('dup', 'git-example.google.com'),
532 ('dup', 'git-example.google.com'),
533 ('dup-review', 'git-example.google.com'),
534 ('partial', 'git-example.google.com'),
535 ])
536 self.assertTrue(self.c.has_generic_host())
537 self.assertEqual(set(['conflict.googlesource.com']),
538 self.c.get_conflicting_hosts())
539 self.assertEqual(set(['dup.googlesource.com']),
540 self.c.get_duplicated_hosts())
541 self.assertEqual(set(['partial.googlesource.com']),
542 self.c.get_partially_configured_hosts())
543 self.assertEqual(set(['chromium.googlesource.com',
544 'chrome-internal.googlesource.com']),
545 self.c.get_hosts_with_wrong_identities())
546
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100547 def test_report_no_problems(self):
548 self.test_analysis_nothing()
549 self.mock(sys, 'stdout', StringIO.StringIO())
550 self.assertFalse(self.c.find_and_report_problems())
551 self.assertEqual(sys.stdout.getvalue(), '')
552
553 def test_report(self):
554 self.test_analysis()
555 self.mock(sys, 'stdout', StringIO.StringIO())
556 self.assertTrue(self.c.find_and_report_problems())
557 with open(os.path.join(os.path.dirname(__file__),
558 'git_cl_creds_check_report.txt')) as f:
559 expected = f.read()
560 def by_line(text):
561 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200562 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100563
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000564class TestGitCl(TestCase):
565 def setUp(self):
566 super(TestGitCl, self).setUp()
567 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700568 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000569 self.mock(subprocess2, 'call', self._mocked_call)
570 self.mock(subprocess2, 'check_call', self._mocked_call)
571 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700572 self.mock(subprocess2, 'communicate',
573 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000574 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000575 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000576 self.mock(git_common, 'get_or_create_merge_base',
577 lambda *a: (
578 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000579 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000580 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100581 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
582 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700583 self.mock(git_cl, 'write_json', lambda path, contents:
584 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000585 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000586 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000587 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700588 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
589 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000590 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000591 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000592 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100593 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
594 lambda *args, **kwargs: self._mocked_call(
595 'GetChangeDetail', *args, **kwargs))
596 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700597 lambda h, i, reviewers, ccs, notify: self._mocked_call(
598 'AddReviewers', h, i, reviewers, ccs, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000599 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
600 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700601 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100602 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000603 # It's important to reset settings to not have inter-tests interference.
604 git_cl.settings = None
605
606 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000607 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100608 self.assertEquals([], self.calls)
609 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000610 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100611 raise
612 # Sadly, has_failed() returns True if this OR any other tests before this
613 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200614 git_cl.logging.error(
615 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100616 'There are un-consumed self.calls after this test has finished.\n'
617 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700618 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200619 'If you are already running only this test, then **first** fix the '
620 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100621 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700622 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100623 'and follow instructions above.\n' +
624 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000625 finally:
626 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000627
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000628 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000629 self.assertTrue(
630 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700631 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000632 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000633 expected_args, result = top
634
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000635 # Also logs otherwise it could get caught in a try/finally and be hard to
636 # diagnose.
637 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700638 N = 5
639 prior_calls = '\n '.join(
640 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
641 for i, c in enumerate(self._calls_done[-N:]))
642 following_calls = '\n '.join(
643 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
644 for i, c in enumerate(self.calls[:N]))
645 extended_msg = (
646 'A few prior calls:\n %s\n\n'
647 'This (expected):\n @%d: %r\n'
648 'This (actual):\n @%d: %r\n\n'
649 'A few following expected calls:\n %s' %
650 (prior_calls, len(self._calls_done), expected_args,
651 len(self._calls_done), args, following_calls))
652 git_cl.logging.error(extended_msg)
653
tandrii99a72f22016-08-17 14:33:24 -0700654 self.fail('@%d\n'
655 ' Expected: %r\n'
656 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700657 len(self._calls_done), expected_args, args))
658
659 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700660 if isinstance(result, Exception):
661 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000662 return result
663
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100664 def test_ask_for_explicit_yes_true(self):
665 self.calls = [
666 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
667 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
668 ]
669 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
670
671 def test_ask_for_explicit_yes_true(self):
672 self.calls = [
673 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
674 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
675 ]
676 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
677
tandrii48df5812016-10-17 03:55:37 -0700678 def test_LoadCodereviewSettingsFromFile_gerrit(self):
679 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
680 self.calls = [
681 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
682 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
683 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
684 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
685 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
686 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700687 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
688 CERR1),
689 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700690 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
691 CERR1),
692 ((['git', 'config', 'gerrit.host', 'true'],), ''),
693 ]
694 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
695
maruel@chromium.orga3353652011-11-30 14:26:57 +0000696 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000697 def _is_gerrit_calls(cls, gerrit=False):
698 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
699 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
700
701 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000702 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200703 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000704 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000705
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000706 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200707 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
708 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
709 ((['git', 'config', 'core.editor'],), ''),
710 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000711
712 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200713 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000714 if similarity is None:
715 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700716 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700717 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000718 else:
tandrii33a46ff2016-08-23 05:53:40 -0700719 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700720 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000721
722 if find_copies is None:
723 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700724 find_copies_call = ((['git', 'config', '--bool',
725 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000726 else:
tandrii5d48c322016-08-18 16:19:37 -0700727 val = str(find_copies).lower()
728 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000729 'branch.master.git-find-copies', val],), '')
730
731 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000732 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800733 '-l100000', '-C'+similarity,
734 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000736 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000737 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000738
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000739 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000740 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000741 similarity_call,
742 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
743 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000744 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000745 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700746 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
747 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000748 ((['git', 'config', 'rietveld.server'],),
749 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000750 ((['git', 'config', 'branch.master.merge'],), 'master'),
751 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000752 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000753 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000754 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000755 ((['git', 'rev-parse', '--show-cdup'],), ''),
756 ((['git', 'rev-parse', 'HEAD'],), '12345'),
757 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000758 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000759 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700760 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000761 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000762 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000763 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000764 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000765 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000766 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000767 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000768 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700769 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000770 ]
771
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000772 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000773 def _git_upload_calls(cls, private):
774 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000775 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000776 private_call = []
777 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000778 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000779 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000780 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000781
maruel@chromium.orga3353652011-11-30 14:26:57 +0000782 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000784 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800786 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000787 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700788 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000789 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000790 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000791 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700792 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000793 ] + cls._git_post_upload_calls()
794
795 @classmethod
796 def _git_post_upload_calls(cls):
797 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000798 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
799 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
800 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000801 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000802 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000803 ]
804
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000805 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000806 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000807 fake_ancestor = 'fake_ancestor'
808 fake_cl = 'fake_cl_for_patch'
809 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000810 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000811 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000812 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000813 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000814 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000815 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000816 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000817 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700818 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000819 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000820 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000821 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000822 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000823 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000825 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000826 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000827 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000828 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000829 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000830
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000831 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700832 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000833 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000834 return [
835 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000836 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000837 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700839 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000840 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000841 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100842 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000843 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000844 ]
845
846 def _run_reviewer_test(
847 self,
848 upload_args,
849 expected_description,
850 returned_description,
851 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000852 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700853 private=False,
854 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000855 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000856 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000857 try:
858 similarity = upload_args[upload_args.index('--similarity')+1]
859 except ValueError:
860 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000861
862 if '--find-copies' in upload_args:
863 find_copies = True
864 elif '--no-find-copies' in upload_args:
865 find_copies = False
866 else:
867 find_copies = None
868
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000869 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700870 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000871
872 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000873
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000874 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000875 self.assertEquals(
876 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000877 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000878 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000879 '#--------------------This line is 72 characters long'
880 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000881 expected_description,
882 desc)
883 return returned_description
884 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000885
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000886 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000887 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700888 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000889 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000890 return 1, 2
891 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000892
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000893 git_cl.main(['upload'] + upload_args)
894
895 def test_no_reviewer(self):
896 self._run_reviewer_test(
897 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000898 'desc\n\nBUG=',
899 '# Blah blah comment.\ndesc\n\nBUG=',
900 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000901 [])
902
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000903 def test_keep_similarity(self):
904 self._run_reviewer_test(
905 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000906 'desc\n\nBUG=',
907 '# Blah blah comment.\ndesc\n\nBUG=',
908 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000909 [])
910
iannucci@chromium.org79540052012-10-19 23:15:26 +0000911 def test_keep_find_copies(self):
912 self._run_reviewer_test(
913 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000914 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000915 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000916 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000917 [])
918
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000919 def test_private(self):
920 self._run_reviewer_test(
921 ['--private'],
922 'desc\n\nBUG=',
923 '# Blah blah comment.\ndesc\n\nBUG=\n',
924 'desc\n\nBUG=',
925 [])
926
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000927 def test_reviewers_cmd_line(self):
928 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000929 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000930 self._run_reviewer_test(
931 ['-r' 'foo@example.com'],
932 description,
933 '\n%s\n' % description,
934 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000935 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000936
937 def test_reviewer_tbr_overriden(self):
938 # Reviewer is overriden with TBR
939 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000940 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000941 self._run_reviewer_test(
942 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000943 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000944 description.strip('\n'),
945 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000946 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947
948 def test_reviewer_multiple(self):
949 # Handles multiple R= or TBR= lines.
950 description = (
bradnelsond975b302016-10-23 12:20:23 -0700951 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
952 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000953 self._run_reviewer_test(
954 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000955 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956 description,
957 description,
bradnelsond975b302016-10-23 12:20:23 -0700958 ['--reviewers=another@example.com,reviewer@example.com'],
959 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000960
maruel@chromium.orga3353652011-11-30 14:26:57 +0000961 def test_reviewer_send_mail(self):
962 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000963 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000964 self._run_reviewer_test(
965 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000966 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000967 description.strip('\n'),
968 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000970
971 def test_reviewer_send_mail_no_rev(self):
972 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000973 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200974 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -0700975 ((['DieWithError', 'Must specify reviewers to send email.'],),
976 SystemExitMock())
977 ]
978
979 def RunEditor(desc, _, **kwargs):
980 return desc
981 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
982 self.mock(sys, 'stdout', stdout)
983 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000984 git_cl.main(['upload', '--send-mail'])
Aaron Gable2e559c92017-05-22 11:39:09 -0700985 self.assertEqual('', stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000986
tandriif9aefb72016-07-01 09:06:51 -0700987 def test_bug_on_cmd(self):
988 self._run_reviewer_test(
989 ['--bug=500658,proj:123'],
990 'desc\n\nBUG=500658\nBUG=proj:123',
991 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
992 'desc\n\nBUG=500658\nBUG=proj:1234',
993 [])
994
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100995 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
996 parent_msg=None,
997 new_msg=None,
998 fail_after_parent_msg=False,
999 fail_cherry_pick=False,
1000 fail_push_count=0,
1001 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001002 if debug:
1003 # Very useful due to finally clause in git cl land raising exceptions and
1004 # shadowing real cause of failure.
1005 self.mock(git_cl, '_IS_BEING_TESTED', True)
1006 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001007 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001008
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001009 if git_numberer_enabled:
1010 # Special mocks to check validity of timestamp.
1011 original_git_amend_head = git_cl._git_amend_head
1012 def _git_amend_head_mock(msg, tstamp):
1013 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1014 return original_git_amend_head(msg, tstamp)
1015 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1016
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001017 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1018 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001019 self.mock(RietveldMock, 'update_description', staticmethod(
1020 lambda i, d: self._mocked_call(['update_description', i, d])))
1021 self.mock(RietveldMock, 'add_comment', staticmethod(
1022 lambda i, c: self._mocked_call(['add_comment', i, c])))
1023 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001024 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1025 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1026 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1027 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1028 CERR1),
1029 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1030 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001031 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001032 ((['git', 'config', 'rietveld.server'],),
1033 'https://codereview.chromium.org'),
1034 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1035 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1036 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1037 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001038 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1039 ''), # No commits to rebase, according to local view of origin.
1040 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1041 'fake_ancestor_sha'),
1042 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1043 ((['git', 'rev-parse', '--show-cdup'],), ''),
1044 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1045 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1046 'fake_ancestor_sha...', '.'],),
1047 'M\tfile1.cpp'),
1048 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1049 ((['git', 'config', 'branch.feature.rietveldserver'],),
1050 'https://codereview.chromium.org'),
1051 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1052 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1053 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1054 'fake_ancestor_sha', 'feature'],),
1055 # This command just prints smth like this:
1056 # file1.cpp | 53 ++++++--
1057 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1058 ''),
1059 ((['git', 'show-ref', '--quiet', '--verify',
1060 'refs/heads/git-cl-commit'],),
1061 ''), # 0 return code means branch exists.
1062 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1063 ((['git', 'show-ref', '--quiet', '--verify',
1064 'refs/heads/git-cl-cherry-pick'],),
1065 CERR1), # This means git-cl-cherry-pick branch does not exist.
1066 ((['git', 'rev-parse', '--show-cdup'],), ''),
1067 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1068 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1069 ((['git', 'commit', '-m',
1070 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001071 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001072 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1073 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1074 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001075 repo_url),
1076
1077 ((['git', 'config', 'remote.origin.url'],), repo_url),
1078 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1079 git_numberer_enabled),
1080
1081 # Auto-rebase init.
1082 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1083 ]
1084 # Auto-rebase loops.
1085 for attempt in xrange(fail_push_count + 1):
1086 self.calls += [
1087 # Auto-rebase loop start.
1088 ((['git', 'retry', 'fetch', 'origin',
1089 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1090 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1091 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1092 # different in each loop iteration for truly realistic test.
1093 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1094 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1095 callError(1, 'failed to cherry pick') if fail_cherry_pick
1096 else ''),
1097 ]
1098 if fail_cherry_pick:
1099 return
1100
1101 if git_numberer_enabled:
1102 assert parent_msg
1103 self.calls += [
1104 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1105 parent_msg),
1106 ]
1107 if fail_after_parent_msg:
1108 return
1109 assert new_msg
1110 self.calls += [
1111 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1112 '1480022355'), # Committer's unix timestamp.
1113 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1114 '1480024000'),
1115 ((['git_amend_head committer timestamp', 1480024000],), ''),
1116 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1117 ]
1118 self.calls += [
1119 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1120 CERR1 if attempt < fail_push_count else ''),
1121 ]
1122 # End of autorebase + push.
1123
1124 self.calls += [
1125 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1126 ]
1127 if git_numberer_enabled:
1128 self.calls += [
1129 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1130 ]
1131
1132 # Cleanup calls.
1133 self.calls += [
1134 ((['git', 'checkout', '-q', 'feature'],), ''),
1135 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1136 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001137 ]
1138
1139 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001140 self._land_rietveld_calls(
1141 repo_url='https://chromium.googlesource.com/infra/infra',
1142 git_numberer_enabled=False,
1143 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001144 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001145 ((['git', 'config', 'rietveld.viewvc-url'],),
1146 'https://chromium.googlesource.com/infra/infra/+/'),
1147 ((['update_description', 123,
1148 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001149 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001150 ''),
1151 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001152 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001153 ]
1154 git_cl.main(['land'])
1155
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001156 def test_land_rietveld_fail_cherry_pick(self):
1157 self._land_rietveld_calls(
1158 repo_url='https://chromium.googlesource.com/infra/infra',
1159 git_numberer_enabled=False,
1160 fail_cherry_pick=True,
1161 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001162 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001163 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1164 'U path/file1\n'
1165 'U file2.cpp\n'),
1166 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001167 ((['git', 'checkout', '-q', 'feature'],), ''),
1168 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001169 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1170 ]
1171 git_cl.main(['land'])
1172
1173 def test_land_rietveld_git_numberer_fail_1_push(self):
1174 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1175
1176 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1177 self._land_rietveld_calls(
1178 repo_url='https://chromium.googlesource.com/chromium/src',
1179 git_numberer_enabled=True,
1180 parent_msg=('This is parent commit.\n'
1181 '\n'
1182 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1183 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1184 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1185 '\n'
1186 'Review-Url: https://codereview.chromium.org/123 .\n'
1187 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1188 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1189 fail_push_count=fail_push_count,
1190 debug=False)
1191
1192 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001193 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001194 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001195 ((['update_description', 123,
1196 'Issue: 123\n\nR=john@chromium.org\n'
1197 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001198 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001199 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1200 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1201 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001202 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001203 ''),
1204 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001205 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001206 ]
1207 git_cl.main(['land'])
1208
1209 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001210 self._land_rietveld_calls(
1211 repo_url='https://chromium.googlesource.com/v8/v8',
1212 git_numberer_enabled=True,
1213 parent_msg='This is parent commit with no footer.',
1214 fail_after_parent_msg=True,
1215 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001216 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001217 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001218 ((['git', 'checkout', '-q', 'feature'],), ''),
1219 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001220 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001221 ]
1222 with self.assertRaises(ValueError) as cm:
1223 git_cl.main(['land'])
1224 self.assertEqual(cm.exception.message,
1225 'Unable to infer commit position from footers')
1226
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001227 def test_git_numberer_not_whitelisted_repo(self):
1228 self.calls = []
1229 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001230 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1231 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001232 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001233
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001234 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001235 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1236 self.calls = [
1237 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001238 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001239 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001240 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001241 remote_url='https://chromium.googlesource.com/chromium/src',
1242 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001243 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001244
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001245 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001246 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001247 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001248 def fake_temporary_directory(**kwargs):
1249 yield tempdir
1250 self.mock(git_cl.gclient_utils, 'temporary_directory',
1251 fake_temporary_directory)
1252 self._test_GitNumbererState_valid_configs_inner(tempdir)
1253
1254 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001255 self.calls = [
1256 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001257 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001258 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1259 '''
1260 [plugin "git-numberer"]
1261 validate-enabled-refglob = refs/else/*
1262 validate-enabled-refglob = refs/heads/*
1263 validate-disabled-refglob = refs/heads/disabled
1264 validate-disabled-refglob = refs/branch-heads/*
1265 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001266 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1267 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001268 'refs/else/*\n'
1269 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001270 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1271 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001272 'refs/heads/disabled\n'
1273 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001274 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001275
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001276 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001277 remote_url='https://chromium.googlesource.com/chromium/src',
1278 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001279 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001280
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001281 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001282 remote_url='https://chromium.googlesource.com/chromium/src',
1283 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001284 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001285
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001286 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001287 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001288 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001289 remote_url='https://chromium.googlesource.com/chromium/src',
1290 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001291 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001292
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001293 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001294 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001295 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001296 if skip_auth_check:
1297 return [((cmd, ), 'true')]
1298
tandrii5d48c322016-08-18 16:19:37 -07001299 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001300 if issue:
1301 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001302 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001303 ])
1304 calls.extend([
1305 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1306 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1307 ((['git', 'config', 'remote.origin.url'],),
1308 'https://chromium.googlesource.com/my/repo'),
1309 ((['git', 'config', 'remote.origin.url'],),
1310 'https://chromium.googlesource.com/my/repo'),
1311 ])
1312 return calls
1313
1314 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001315 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001316 fetched_status=None, other_cl_owner=None,
1317 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001318 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001319 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1320 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1321 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1322 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001323 ]
1324 calls += cls._is_gerrit_calls(True)
1325 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001326 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1327 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1328 ((['git', 'config', 'branch.master.gerritissue'],),
1329 CERR1 if issue is None else str(issue)),
1330 ]
1331
1332 if custom_cl_base:
1333 ancestor_revision = custom_cl_base
1334 else:
1335 # Determine ancestor_revision to be merge base.
1336 ancestor_revision = 'fake_ancestor_sha'
1337 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001338 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001339 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001340 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001341 'refs/remotes/origin/master'],), ancestor_revision),
1342 ]
1343
1344 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001345 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1346
1347 if issue:
1348 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001349 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001350 '123456',
1351 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001352 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001353 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001354 'change_id': '123456789',
1355 'current_revision': 'sha1_of_current_revision',
1356 'revisions': { 'sha1_of_current_revision': {
1357 'commit': {'message': fetched_description},
1358 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001359 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001360 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001361 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001362 if fetched_status == 'ABANDONED':
1363 calls += [
1364 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1365 '123456 has been abandoned, new uploads are not '
1366 'allowed'), SystemExitMock()),
1367 ]
1368 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001369 if other_cl_owner:
1370 calls += [
1371 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1372 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001373
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001374 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1375 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001376 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001377 ((['git', 'rev-parse', '--show-cdup'],), ''),
1378 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001379
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001380 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1381 ancestor_revision + '...', '.'],),
1382 'M\t.gitignore\n'),
1383 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001384 ]
1385
1386 if not issue:
1387 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 ((['git', 'log', '--pretty=format:%s%n%n%b',
1389 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001390 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001391 ]
1392
1393 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001394 ((['git', 'config', 'user.email'],), 'me@example.com'),
1395 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1396 ([custom_cl_base] if custom_cl_base else
1397 [ancestor_revision, 'HEAD']),),
1398 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001399 ]
1400 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001401
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001402 @classmethod
1403 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001404 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001405 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001406 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001407 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001408 git_mirror=None,
1409 custom_cl_base=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001410 if post_amend_description is None:
1411 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001412 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001413 # Determined in `_gerrit_base_calls`.
1414 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1415
1416 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001417
tandriia60502f2016-06-20 02:01:53 -07001418 if squash_mode == 'default':
1419 calls.extend([
1420 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1421 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1422 ])
1423 elif squash_mode in ('override_squash', 'override_nosquash'):
1424 calls.extend([
1425 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1426 'true' if squash_mode == 'override_squash' else 'false'),
1427 ])
1428 else:
1429 assert squash_mode in ('squash', 'nosquash')
1430
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001431 # If issue is given, then description is fetched from Gerrit instead.
1432 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001433 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001434 ((['git', 'log', '--pretty=format:%s\n\n%b',
1435 ((custom_cl_base + '..') if custom_cl_base else
1436 'fake_ancestor_sha..HEAD')],),
1437 description),
1438 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001439 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001440 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001441 else:
1442 if not title:
1443 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001444 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1445 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001446 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001447 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001448 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001449 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001450 (('DownloadGerritHook', False), ''),
1451 # Amending of commit message to get the Change-Id.
1452 ((['git', 'log', '--pretty=format:%s\n\n%b',
1453 determined_ancestor_revision + '..HEAD'],),
1454 description),
1455 ((['git', 'commit', '--amend', '-m', description],), ''),
1456 ((['git', 'log', '--pretty=format:%s\n\n%b',
1457 determined_ancestor_revision + '..HEAD'],),
1458 post_amend_description)
1459 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001460 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001461 if not issue:
1462 # Prompting to edit description on first upload.
1463 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001464 ((['git', 'config', 'core.editor'],), ''),
1465 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001466 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001467 ref_to_push = 'abcdef0123456789'
1468 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001469 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1470 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1471 ]
1472
1473 if custom_cl_base is None:
1474 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001475 ((['get_or_create_merge_base', 'master',
1476 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001477 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001478 ]
1479 parent = 'origin/master'
1480 else:
1481 calls += [
1482 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1483 'refs/remotes/origin/master'],),
1484 callError(1)), # Means not ancenstor.
1485 (('ask_for_data',
1486 'Do you take responsibility for cleaning up potential mess '
1487 'resulting from proceeding with upload? Press Enter to upload, '
1488 'or Ctrl+C to abort'), ''),
1489 ]
1490 parent = custom_cl_base
1491
1492 calls += [
1493 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1494 '0123456789abcdef'),
1495 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1496 '-m', description],),
1497 ref_to_push),
1498 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001499 else:
1500 ref_to_push = 'HEAD'
1501
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001502 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001503 ((['git', 'rev-list',
1504 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1505 ref_to_push],),
1506 '1hashPerLine\n'),
1507 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001508
Aaron Gable9b713dd2016-12-14 16:04:21 -08001509 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001510 if ref_suffix:
1511 ref_suffix += ',m=' + title
1512 else:
1513 ref_suffix = '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001514
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001515 notify_suffix = 'notify=NONE'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001516 if ref_suffix:
1517 ref_suffix += ',' + notify_suffix
1518 else:
1519 ref_suffix = '%' + notify_suffix
1520
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001521 if git_mirror is None:
1522 calls += [
1523 ((['git', 'config', 'remote.origin.url'],),
1524 'https://chromium.googlesource.com/yyy/zzz'),
1525 ]
1526 else:
1527 calls += [
1528 ((['git', 'config', 'remote.origin.url'],),
1529 '/cache/this-dir-exists'),
1530 (('os.path.isdir', '/cache/this-dir-exists'),
1531 True),
1532 # Runs in /cache/this-dir-exists.
1533 ((['git', 'config', 'remote.origin.url'],),
1534 'https://chromium.googlesource.com/yyy/zzz'),
1535 ]
1536
ukai@chromium.orge8077812012-02-03 03:41:46 +00001537 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001538 ((['git', 'push',
1539 'https://chromium.googlesource.com/yyy/zzz',
1540 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001541 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001542 'remote: Processing changes: (\)\n'
1543 'remote: Processing changes: (|)\n'
1544 'remote: Processing changes: (/)\n'
1545 'remote: Processing changes: (-)\n'
1546 'remote: Processing changes: new: 1 (/)\n'
1547 'remote: Processing changes: new: 1, done\n'
1548 'remote:\n'
1549 'remote: New Changes:\n'
1550 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1551 'remote:\n'
1552 'To https://chromium.googlesource.com/yyy/zzz\n'
1553 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001554 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001555 if squash:
1556 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001557 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001558 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001559 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001560 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001561 ((['git', 'config', 'branch.master.gerritsquashhash',
1562 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001563 ]
tandrii88189772016-09-29 04:29:57 -07001564 calls += [
1565 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001566 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001567 123456 if squash else None, sorted(reviewers),
1568 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001569 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001570 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001571 return calls
1572
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001573 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001574 self,
1575 upload_args,
1576 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001577 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001578 squash=True,
1579 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001580 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001581 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001582 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001583 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001584 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001585 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001586 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001587 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001588 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001589 other_cl_owner=None,
1590 custom_cl_base=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001591 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001592 if squash_mode is None:
1593 if '--no-squash' in upload_args:
1594 squash_mode = 'nosquash'
1595 elif '--squash' in upload_args:
1596 squash_mode = 'squash'
1597 else:
1598 squash_mode = 'default'
1599
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001600 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001601 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001602 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001603 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001604 CookiesAuthenticatorMockFactory(
1605 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001606 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1607 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001608 self.mock(git_cl.gclient_utils, 'RunEditor',
1609 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001610 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1611 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001612
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001613 original_os_path_isdir = os.path.isdir
1614 def selective_os_path_isdir_mock(path):
1615 if path == '/cache/this-dir-exists':
1616 return self._mocked_call('os.path.isdir', path)
1617 return original_os_path_isdir(path)
1618 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1619
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001620 self.calls = self._gerrit_base_calls(
1621 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001622 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001623 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001624 other_cl_owner=other_cl_owner,
1625 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001626 if fetched_status != 'ABANDONED':
1627 self.calls += self._gerrit_upload_calls(
1628 description, reviewers, squash,
1629 squash_mode=squash_mode,
1630 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001631 ref_suffix=ref_suffix, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001632 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001633 issue=issue, cc=cc, git_mirror=git_mirror,
1634 custom_cl_base=custom_cl_base)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001635 # Uncomment when debugging.
1636 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001637 git_cl.main(['upload'] + upload_args)
1638
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001639 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001640 self._run_gerrit_upload_test(
1641 ['--no-squash'],
1642 'desc\n\nBUG=\n',
1643 [],
1644 squash=False,
1645 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1646
1647 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001648 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001649 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001650 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001651 [],
tandriia60502f2016-06-20 02:01:53 -07001652 squash=False,
1653 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001654 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001655
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001656 def test_gerrit_no_reviewer(self):
1657 self._run_gerrit_upload_test(
1658 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001659 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001660 [],
1661 squash=False,
1662 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001663
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001664 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001665 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1666 self._run_gerrit_upload_test(
1667 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1668 'desc\n\nBUG=\n\nChange-Id: I123456789',
1669 squash=False,
1670 squash_mode='override_nosquash',
1671 title='Dont_put_bad_chars')
1672 self.assertIn(
1673 'WARNING: Patchset title may only contain alphanumeric chars '
1674 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1675 'Cleaned up title: Dont put bad chars\n',
1676 git_cl.sys.stdout.getvalue())
1677
ukai@chromium.orge8077812012-02-03 03:41:46 +00001678 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001679 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001680 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001681 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001682 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001683 squash=False,
1684 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001685 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001686
1687 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001688 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001689 [],
bradnelsond975b302016-10-23 12:20:23 -07001690 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1691 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001692 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001693 ['reviewer@example.com', 'another@example.com'],
1694 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001695 squash_mode='override_nosquash',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001696 ref_suffix='%l=Code-Review+1',
bradnelsond975b302016-10-23 12:20:23 -07001697 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001698
1699 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001700 self._run_gerrit_upload_test(
1701 [],
1702 'desc\nBUG=\n\nChange-Id: 123456789',
1703 [],
1704 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001705
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001706 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001707 self._run_gerrit_upload_test(
1708 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001709 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001710 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001711 squash=True,
1712 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001713
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001714 def test_gerrit_upload_squash_first_against_rev(self):
1715 custom_cl_base = 'custom_cl_base_rev_or_branch'
1716 self._run_gerrit_upload_test(
1717 ['--squash', custom_cl_base],
1718 'desc\nBUG=\n\nChange-Id: 123456789',
1719 [],
1720 squash=True,
1721 expected_upstream_ref='origin/master',
1722 custom_cl_base=custom_cl_base)
1723 self.assertIn(
1724 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1725 sys.stdout.getvalue())
1726
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001727 def test_gerrit_upload_squash_first_with_mirror(self):
1728 self._run_gerrit_upload_test(
1729 ['--squash'],
1730 'desc\nBUG=\n\nChange-Id: 123456789',
1731 [],
1732 squash=True,
1733 expected_upstream_ref='origin/master',
1734 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1735
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001736 def test_gerrit_upload_squash_reupload(self):
1737 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001738 self._run_gerrit_upload_test(
1739 ['--squash'],
1740 description,
1741 [],
1742 squash=True,
1743 expected_upstream_ref='origin/master',
1744 issue=123456)
1745
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001746 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1747 self.mock(git_cl, 'DieWithError',
1748 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1749 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1750 with self.assertRaises(SystemExitMock):
1751 self._run_gerrit_upload_test(
1752 ['--squash'],
1753 description,
1754 [],
1755 squash=True,
1756 expected_upstream_ref='origin/master',
1757 issue=123456,
1758 fetched_status='ABANDONED')
1759
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001760 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1761 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1762 lambda *_, **__: {'email': 'yet-another@example.com'})
1763 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1764 self._run_gerrit_upload_test(
1765 ['--squash'],
1766 description,
1767 [],
1768 squash=True,
1769 expected_upstream_ref='origin/master',
1770 issue=123456,
1771 other_cl_owner='other@example.com')
1772 self.assertIn(
1773 'WARNING: change 123456 is owned by other@example.com, but you '
1774 'authenticate to Gerrit as yet-another@example.com.\n'
1775 'Uploading may fail due to lack of permissions',
1776 git_cl.sys.stdout.getvalue())
1777
rmistry@google.com2dd99862015-06-22 12:22:18 +00001778 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001779 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001780 def mock_run_git(*args, **_kwargs):
1781 if args[0] == ['for-each-ref',
1782 '--format=%(refname:short) %(upstream:short)',
1783 'refs/heads']:
1784 # Create a local branch dependency tree that looks like this:
1785 # test1 -> test2 -> test3 -> test4 -> test5
1786 # -> test3.1
1787 # test6 -> test0
1788 branch_deps = [
1789 'test2 test1', # test1 -> test2
1790 'test3 test2', # test2 -> test3
1791 'test3.1 test2', # test2 -> test3.1
1792 'test4 test3', # test3 -> test4
1793 'test5 test4', # test4 -> test5
1794 'test6 test0', # test0 -> test6
1795 'test7', # test7
1796 ]
1797 return '\n'.join(branch_deps)
1798 self.mock(git_cl, 'RunGit', mock_run_git)
1799
1800 class RecordCalls:
1801 times_called = 0
1802 record_calls = RecordCalls()
1803 def mock_CMDupload(*args, **_kwargs):
1804 record_calls.times_called += 1
1805 return 0
1806 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1807
1808 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001809 (('ask_for_data', 'This command will checkout all dependent branches '
1810 'and run "git cl upload". Press Enter to continue, '
1811 'or Ctrl+C to abort'), ''),
1812 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001813
1814 class MockChangelist():
1815 def __init__(self):
1816 pass
1817 def GetBranch(self):
1818 return 'test1'
1819 def GetIssue(self):
1820 return '123'
1821 def GetPatchset(self):
1822 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001823 def IsGerrit(self):
1824 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001825
1826 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1827 # CMDupload should have been called 5 times because of 5 dependent branches.
1828 self.assertEquals(5, record_calls.times_called)
1829 self.assertEquals(0, ret)
1830
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001831 def test_gerrit_change_id(self):
1832 self.calls = [
1833 ((['git', 'write-tree'], ),
1834 'hashtree'),
1835 ((['git', 'rev-parse', 'HEAD~0'], ),
1836 'branch-parent'),
1837 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1838 'A B <a@b.org> 1456848326 +0100'),
1839 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1840 'C D <c@d.org> 1456858326 +0100'),
1841 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1842 'hashchange'),
1843 ]
1844 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1845 self.assertEqual(change_id, 'Ihashchange')
1846
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001847 def test_desecription_append_footer(self):
1848 for init_desc, footer_line, expected_desc in [
1849 # Use unique desc first lines for easy test failure identification.
1850 ('foo', 'R=one', 'foo\n\nR=one'),
1851 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1852 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1853 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1854 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1855 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1856 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1857 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1858 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1859 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1860 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1861 ]:
1862 desc = git_cl.ChangeDescription(init_desc)
1863 desc.append_footer(footer_line)
1864 self.assertEqual(desc.description, expected_desc)
1865
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001866 def test_update_reviewers(self):
1867 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001868 ('foo', [], [],
1869 'foo'),
1870 ('foo\nR=xx', [], [],
1871 'foo\nR=xx'),
1872 ('foo\nTBR=xx', [], [],
1873 'foo\nTBR=xx'),
1874 ('foo', ['a@c'], [],
1875 'foo\n\nR=a@c'),
1876 ('foo\nR=xx', ['a@c'], [],
1877 'foo\n\nR=a@c, xx'),
1878 ('foo\nTBR=xx', ['a@c'], [],
1879 'foo\n\nR=a@c\nTBR=xx'),
1880 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1881 'foo\n\nR=a@c, yy\nTBR=xx'),
1882 ('foo\nBUG=', ['a@c'], [],
1883 'foo\nBUG=\nR=a@c'),
1884 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1885 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1886 ('foo', ['a@c', 'b@c'], [],
1887 'foo\n\nR=a@c, b@c'),
1888 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1889 'foo\nBar\n\nR=c@c\nBUG='),
1890 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1891 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001892 # Same as the line before, but full of whitespaces.
1893 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001894 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001895 'foo\nBar\n\nR=c@c\n BUG =',
1896 ),
1897 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001898 ('foo BUG=allo R=joe ', ['c@c'], [],
1899 'foo BUG=allo R=joe\n\nR=c@c'),
1900 # Redundant TBRs get promoted to Rs
1901 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1902 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001903 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001904 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001905 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001906 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001907 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001908 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001909 actual.append(obj.description)
1910 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001911
wittman@chromium.org455dc922015-01-26 20:15:50 +00001912 def test_get_target_ref(self):
1913 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001914 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001915 self.assertEqual(None, git_cl.GetTargetRef(None,
1916 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001917 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001918
wittman@chromium.org455dc922015-01-26 20:15:50 +00001919 # Check default target refs for branches.
1920 self.assertEqual('refs/heads/master',
1921 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001922 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001923 self.assertEqual('refs/heads/master',
1924 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001925 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001926 self.assertEqual('refs/heads/master',
1927 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001928 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001929 self.assertEqual('refs/branch-heads/123',
1930 git_cl.GetTargetRef('origin',
1931 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001932 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001933 self.assertEqual('refs/diff/test',
1934 git_cl.GetTargetRef('origin',
1935 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001936 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001937 self.assertEqual('refs/heads/chrome/m42',
1938 git_cl.GetTargetRef('origin',
1939 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001940 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001941
1942 # Check target refs for user-specified target branch.
1943 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1944 'refs/remotes/branch-heads/123'):
1945 self.assertEqual('refs/branch-heads/123',
1946 git_cl.GetTargetRef('origin',
1947 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001948 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001949 for branch in ('origin/master', 'remotes/origin/master',
1950 'refs/remotes/origin/master'):
1951 self.assertEqual('refs/heads/master',
1952 git_cl.GetTargetRef('origin',
1953 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001954 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001955 for branch in ('master', 'heads/master', 'refs/heads/master'):
1956 self.assertEqual('refs/heads/master',
1957 git_cl.GetTargetRef('origin',
1958 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001959 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001960
wychen@chromium.orga872e752015-04-28 23:42:18 +00001961 def test_patch_when_dirty(self):
1962 # Patch when local tree is dirty
1963 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1964 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1965
1966 def test_diff_when_dirty(self):
1967 # Do 'git cl diff' when local tree is dirty
1968 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1969 self.assertNotEqual(git_cl.main(['diff']), 0)
1970
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001971 @staticmethod
1972 def _get_gerrit_codereview_server_calls(branch, value=None,
1973 git_short_host='host',
1974 detect_branch=True):
1975 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1976
1977 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1978 """
1979 calls = []
1980 if detect_branch:
1981 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1982 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1983 CERR1 if value is None else value))
1984 if value is None:
1985 calls += [
1986 ((['git', 'config', 'branch.' + branch + '.merge'],),
1987 'refs/heads' + branch),
1988 ((['git', 'config', 'branch.' + branch + '.remote'],),
1989 'origin'),
1990 ((['git', 'config', 'remote.origin.url'],),
1991 'https://%s.googlesource.com/my/repo' % git_short_host),
1992 ]
1993 return calls
1994
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001995 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001996 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001997 detect_gerrit_server=True,
1998 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001999 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002000 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2001 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002002 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002003 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002004 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2005
tandriidf09a462016-08-18 16:23:55 -07002006 if new_branch:
2007 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2008 else:
2009 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002010
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002011 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002012 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002013 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002014 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002015 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2016 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2017 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2018 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002019 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002020 if default_codereview == 'gerrit':
2021 if not force_codereview:
2022 self.calls += [
2023 ((['git', 'config', 'gerrit.host'],), 'true'),
2024 ]
2025 if detect_gerrit_server:
2026 self.calls += self._get_gerrit_codereview_server_calls(
2027 'master', git_short_host=git_short_host,
2028 detect_branch=not new_branch and force_codereview)
2029 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002030
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002031 elif default_codereview == 'rietveld':
2032 self.calls += [
2033 ((['git', 'config', 'gerrit.host'],), CERR1),
2034 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2035 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2036 ]
2037 actual_codereview = 'rietveld'
2038
2039 if actual_codereview == 'rietveld':
2040 self.calls += [
2041 ((['git', 'rev-parse', '--show-cdup'],), ''),
2042 ]
2043 if not default_codereview:
2044 self.calls += [
2045 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2046 ]
2047 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002048 self.calls += [
2049 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002050 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002051 {
2052 'current_revision': '7777777777',
2053 'revisions': {
2054 '1111111111': {
2055 '_number': 1,
2056 'fetch': {'http': {
2057 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2058 'ref': 'refs/changes/56/123456/1',
2059 }},
2060 },
2061 '7777777777': {
2062 '_number': 7,
2063 'fetch': {'http': {
2064 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2065 'ref': 'refs/changes/56/123456/7',
2066 }},
2067 },
2068 },
2069 }),
2070 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002071
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002072 def _common_patch_rietveld_successful(self, **kwargs):
2073 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002074 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002075 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002076 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002077 ((['git', 'config', 'branch.master.rietveldserver',
2078 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002079 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002080 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002081 ((['git', 'commit', '-m',
2082 'Description\n\n' +
2083 'patch from issue 123456 at patchset 60001 ' +
2084 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002085 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002086
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002087 def test_patch_rietveld_default(self):
2088 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002089 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2090
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002091 def test_patch_rietveld_successful_new_branch(self):
2092 self._common_patch_rietveld_successful(default_codereview='rietveld',
2093 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002094 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2095
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002096 def test_patch_rietveld_guess_by_url(self):
2097 self._common_patch_rietveld_successful(
2098 default_codereview=None, # It doesn't matter.
2099 actual_codereview='rietveld')
2100 self.assertEqual(git_cl.main(
2101 ['patch', 'https://codereview.example.com/123456']), 0)
2102
2103 def test_patch_rietveld_conflict(self):
2104 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002105 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002106 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002107
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002108 def test_patch_gerrit_default(self):
2109 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002110 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002111 self.calls += [
2112 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2113 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002114 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002115 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002116 ((['git', 'config', 'branch.master.gerritserver',
2117 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002118 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002119 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002120 ]
2121 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2122
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002123 def test_patch_gerrit_force(self):
2124 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002125 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002126 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002127 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002128 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002129 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002130 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002131 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002132 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002133 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002134 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002135 ]
2136 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2137
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002138 def test_patch_gerrit_guess_by_url(self):
2139 self._patch_common(
2140 default_codereview=None, # It doesn't matter what's default.
2141 actual_codereview='gerrit',
2142 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002143 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002144 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002145 'refs/changes/56/123456/1'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002146 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002147 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002148 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002149 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002150 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002151 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002152 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002153 ]
2154 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002155 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002156
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002157 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2158 self._patch_common(
2159 default_codereview=None, # It doesn't matter what's default.
2160 actual_codereview='gerrit',
2161 git_short_host='else', detect_gerrit_server=False)
2162 self.calls += [
2163 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2164 'refs/changes/56/123456/1'],), ''),
2165 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2166 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2167 ''),
2168 ((['git', 'config', 'branch.master.gerritserver',
2169 'https://else-review.googlesource.com'],), ''),
2170 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2171 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2172 ]
2173 self.assertEqual(git_cl.main(
2174 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2175
2176 def test_patch_gerrit_conflict(self):
2177 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002178 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002179 self.calls += [
2180 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002181 'refs/changes/56/123456/7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002182 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2183 ''),
2184 ((['git', 'config', 'branch.master.gerritserver',
2185 'https://chromium-review.googlesource.com'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002186 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002187 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2188 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2189 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002190 ]
2191 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002192 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002193
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002194 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002195 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002196 raise git_cl.gerrit_util.GerritError(404, '')
2197 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2198
tandriic2405f52016-10-10 08:13:15 -07002199 self.calls = [
2200 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2201 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2202 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2203 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2204 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2205 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002206 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2207 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2208 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2209 ((['git', 'config', 'remote.origin.url'],),
2210 'https://chromium.googlesource.com/my/repo'),
2211 ((['DieWithError',
2212 'change 123456 at https://chromium-review.googlesource.com does not '
2213 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002214 ]
2215 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002216 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002217
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002218 def _checkout_calls(self):
2219 return [
2220 ((['git', 'config', '--local', '--get-regexp',
2221 'branch\\..*\\.rietveldissue'], ),
2222 ('branch.retrying.rietveldissue 1111111111\n'
2223 'branch.some-fix.rietveldissue 2222222222\n')),
2224 ((['git', 'config', '--local', '--get-regexp',
2225 'branch\\..*\\.gerritissue'], ),
2226 ('branch.ger-branch.gerritissue 123456\n'
2227 'branch.gbranch654.gerritissue 654321\n')),
2228 ]
2229
2230 def test_checkout_gerrit(self):
2231 """Tests git cl checkout <issue>."""
2232 self.calls = self._checkout_calls()
2233 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2234 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2235
2236 def test_checkout_rietveld(self):
2237 """Tests git cl checkout <issue>."""
2238 self.calls = self._checkout_calls()
2239 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2240 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2241
2242 def test_checkout_not_found(self):
2243 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002244 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002245 self.calls = self._checkout_calls()
2246 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2247
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002248 def test_checkout_no_branch_issues(self):
2249 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002250 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002251 self.calls = [
2252 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002253 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002254 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002255 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002256 ]
2257 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2258
tandrii@chromium.org28253532016-04-14 13:46:56 +00002259 def _test_gerrit_ensure_authenticated_common(self, auth,
2260 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002261 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2262 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2263 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002264 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002265 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002266 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002267 cl.branch = 'master'
2268 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002269 cl.lookedup_issue = True
2270 return cl
2271
2272 def test_gerrit_ensure_authenticated_missing(self):
2273 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002274 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002275 })
2276 self.calls.append(
2277 ((['DieWithError',
2278 'Credentials for the following hosts are required:\n'
2279 ' chromium-review.googlesource.com\n'
2280 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002281 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002282 'https://chromium-review.googlesource.com/new-password'],), ''),)
2283 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2284
2285 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002286 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002287 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002288 'chromium.googlesource.com':
2289 ('git-one.example.com', None, 'secret1'),
2290 'chromium-review.googlesource.com':
2291 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002292 })
2293 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002294 (('ask_for_data', 'If you know what you are doing '
2295 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002296 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2297
2298 def test_gerrit_ensure_authenticated_ok(self):
2299 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002300 'chromium.googlesource.com':
2301 ('git-same.example.com', None, 'secret'),
2302 'chromium-review.googlesource.com':
2303 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002304 })
2305 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2306
tandrii@chromium.org28253532016-04-14 13:46:56 +00002307 def test_gerrit_ensure_authenticated_skipped(self):
2308 cl = self._test_gerrit_ensure_authenticated_common(
2309 auth={}, skip_auth_check=True)
2310 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2311
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002312 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002313 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2314 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002315 self.calls = [
2316 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002317 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002318 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2319 ((['git', 'config', 'rietveld.server'],), ''),
2320 ((['git', 'config', 'rietveld.server'],), ''),
2321 ((['git', 'config', 'branch.feature.rietveldserver'],),
2322 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002323 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002324 ]
2325 self.assertEqual(0, git_cl.main(['set-commit']))
2326
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002327 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002328 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002329 lambda h, i, labels, notify=None:
2330 self._mocked_call(['SetReview', h, i, labels, notify]))
2331
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002332 self.calls = [
2333 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002334 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2335 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002336 ((['git', 'config', 'branch.feature.gerritserver'],),
2337 'https://chromium-review.googlesource.com'),
2338 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002339 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002340 ]
tandriid9e5ce52016-07-13 02:32:59 -07002341
2342 def test_cmd_set_commit_gerrit_clear(self):
2343 self._cmd_set_commit_gerrit_common(0)
2344 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2345
2346 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002347 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002348 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2349
tandriid9e5ce52016-07-13 02:32:59 -07002350 def test_cmd_set_commit_gerrit(self):
2351 self._cmd_set_commit_gerrit_common(2)
2352 self.assertEqual(0, git_cl.main(['set-commit']))
2353
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002354 def test_description_display(self):
2355 out = StringIO.StringIO()
2356 self.mock(git_cl.sys, 'stdout', out)
2357
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002358 self.mock(git_cl, 'Changelist', ChangelistMock)
2359 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002360
2361 self.assertEqual(0, git_cl.main(['description', '-d']))
2362 self.assertEqual('foo\n', out.getvalue())
2363
2364 def test_description_rietveld(self):
2365 out = StringIO.StringIO()
2366 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002367 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002368
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002369 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002370 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002371 self.assertEqual('foobar\n', out.getvalue())
2372
iannucci3c972b92016-08-17 13:24:10 -07002373 def test_StatusFieldOverrideIssueMissingArgs(self):
2374 out = StringIO.StringIO()
2375 self.mock(git_cl.sys, 'stderr', out)
2376
2377 try:
2378 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2379 except SystemExit as ex:
2380 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002381 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002382
2383 out = StringIO.StringIO()
2384 self.mock(git_cl.sys, 'stderr', out)
2385
2386 try:
2387 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2388 except SystemExit as ex:
2389 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002390 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002391
2392 def test_StatusFieldOverrideIssue(self):
2393 out = StringIO.StringIO()
2394 self.mock(git_cl.sys, 'stdout', out)
2395
2396 def assertIssue(cl_self, *_args):
2397 self.assertEquals(cl_self.issue, 1)
2398 return 'foobar'
2399
2400 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2401 self.calls = [
2402 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2403 ((['git', 'config', 'rietveld.server'],), ''),
2404 ((['git', 'config', 'rietveld.server'],), ''),
2405 ]
iannuccie53c9352016-08-17 14:40:40 -07002406 self.assertEqual(
2407 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2408 0)
iannucci3c972b92016-08-17 13:24:10 -07002409 self.assertEqual(out.getvalue(), 'foobar\n')
2410
iannuccie53c9352016-08-17 14:40:40 -07002411 def test_SetCloseOverrideIssue(self):
2412 def assertIssue(cl_self, *_args):
2413 self.assertEquals(cl_self.issue, 1)
2414 return 'foobar'
2415
2416 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2417 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2418 self.calls = [
2419 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2420 ((['git', 'config', 'rietveld.server'],), ''),
2421 ((['git', 'config', 'rietveld.server'],), ''),
2422 ]
2423 self.assertEqual(
2424 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2425
2426 def test_SetCommitOverrideIssue(self):
2427 def assertIssue(cl_self, *_args):
2428 self.assertEquals(cl_self.issue, 1)
2429 return 'foobar'
2430
2431 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2432 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2433 self.calls = [
2434 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2435 ((['git', 'config', 'rietveld.server'],), ''),
2436 ((['git', 'config', 'rietveld.server'],), ''),
2437 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2438 ((['git', 'config', 'rietveld.server'],), ''),
2439 ((['git', 'config', 'rietveld.server'],), ''),
2440 ]
2441 self.assertEqual(
2442 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2443
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002444 def test_description_gerrit(self):
2445 out = StringIO.StringIO()
2446 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002447 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002448 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002449 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2450 {
2451 'current_revision': 'sha1',
2452 'revisions': {'sha1': {
2453 'commit': {'message': 'foobar'},
2454 }},
2455 }),
2456 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002457 self.assertEqual(0, git_cl.main([
2458 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2459 self.assertEqual('foobar\n', out.getvalue())
2460
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002461 def test_description_set_raw(self):
2462 out = StringIO.StringIO()
2463 self.mock(git_cl.sys, 'stdout', out)
2464
2465 self.mock(git_cl, 'Changelist', ChangelistMock)
2466 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2467
2468 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2469 self.assertEqual('hihi', ChangelistMock.desc)
2470
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002471 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002472 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002473
2474 def RunEditor(desc, _, **kwargs):
2475 self.assertEquals(
2476 '# Enter a description of the change.\n'
2477 '# This will be displayed on the codereview site.\n'
2478 '# The first line will also be used as the subject of the review.\n'
2479 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002480 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002481 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002482 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002483 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002484 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002485
dsansomee2d6fd92016-09-08 00:10:47 -07002486 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002487 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002488
2489 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2490 self.mock(git_cl.Changelist, 'GetDescription',
2491 lambda *args: current_desc)
2492 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2493 UpdateDescriptionRemote)
2494 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2495
2496 self.calls = [
2497 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002498 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002499 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2500 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002501 ((['git', 'config', 'core.editor'],), 'vi'),
2502 ]
2503 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2504
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002505 def test_description_set_stdin(self):
2506 out = StringIO.StringIO()
2507 self.mock(git_cl.sys, 'stdout', out)
2508
2509 self.mock(git_cl, 'Changelist', ChangelistMock)
2510 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2511
2512 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2513 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2514
kmarshall3bff56b2016-06-06 18:31:47 -07002515 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002516 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2517
kmarshall3bff56b2016-06-06 18:31:47 -07002518 self.calls = \
2519 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2520 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002521 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002522 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2523 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002524 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2525 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2526 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002527 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2528 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2529 ((['git', 'branch', '-D', 'foo'],), '')]
2530
kmarshall3bff56b2016-06-06 18:31:47 -07002531 self.mock(git_cl, 'get_cl_statuses',
2532 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002533 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2534 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2535 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002536
2537 self.assertEqual(0, git_cl.main(['archive', '-f']))
2538
2539 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002540 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002541 self.calls = \
2542 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2543 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002544 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002545 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2546 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002547 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2548
kmarshall9249e012016-08-23 12:02:16 -07002549 self.mock(git_cl, 'get_cl_statuses',
2550 lambda branches, fine_grained, max_processes:
2551 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2552
2553 self.assertEqual(1, git_cl.main(['archive', '-f']))
2554
2555 def test_archive_dry_run(self):
2556 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2557
2558 self.calls = \
2559 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2560 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2561 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2562 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2563 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2564 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2565 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2566 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2567 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002568
2569 self.mock(git_cl, 'get_cl_statuses',
2570 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002571 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2572 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2573 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002574
kmarshall9249e012016-08-23 12:02:16 -07002575 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2576
2577 def test_archive_no_tags(self):
2578 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2579
2580 self.calls = \
2581 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2582 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2583 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2584 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2585 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2586 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2587 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2588 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2589 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2590 ((['git', 'branch', '-D', 'foo'],), '')]
2591
2592 self.mock(git_cl, 'get_cl_statuses',
2593 lambda branches, fine_grained, max_processes:
2594 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2595 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2596 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2597
2598 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002599
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002600 def test_cmd_issue_erase_existing(self):
2601 out = StringIO.StringIO()
2602 self.mock(git_cl.sys, 'stdout', out)
2603 self.calls = [
2604 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002605 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2606 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002607 # Let this command raise exception (retcode=1) - it should be ignored.
2608 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002609 CERR1),
2610 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2611 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002612 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2613 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2614 ''),
2615 ]
2616 self.assertEqual(0, git_cl.main(['issue', '0']))
2617
phajdan.jre328cf92016-08-22 04:12:17 -07002618 def test_cmd_issue_json(self):
2619 out = StringIO.StringIO()
2620 self.mock(git_cl.sys, 'stdout', out)
2621 self.calls = [
2622 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002623 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002624 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2625 ((['git', 'config', 'rietveld.server'],),
2626 'https://codereview.chromium.org'),
2627 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2628 (('write_json', 'output.json',
2629 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2630 ''),
2631 ]
2632 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2633
tandriide281ae2016-10-12 06:02:30 -07002634 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002635 self.mock(git_cl.Changelist, 'GetChange',
2636 lambda _, *a: (
2637 self._mocked_call(['GetChange']+list(a))))
2638 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2639 lambda *_, **__: (
2640 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002641 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2642 lambda _, s: self._mocked_call(['SetCQState', s]))
2643 self.calls = [
2644 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002645 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002646 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2647 ((['git', 'config', 'rietveld.server'],),
2648 'https://codereview.chromium.org'),
2649 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2650 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2651 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2652 ((['get_or_create_merge_base', 'feature', 'feature'],),
2653 'fake_ancestor_sha'),
2654 ((['GetChange', 'fake_ancestor_sha', None], ),
2655 git_cl.presubmit_support.GitChange(
2656 '', '', '', '', '', '', '', '')),
2657 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2658 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002659 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2660 ]
2661 out = StringIO.StringIO()
2662 self.mock(git_cl.sys, 'stdout', out)
2663 self.assertEqual(0, git_cl.main(['try']))
2664 self.assertEqual(
2665 out.getvalue(),
2666 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2667
tandrii8c5a3532016-11-04 07:52:02 -07002668 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2669 self.mock(git_cl.Changelist, 'GetChange',
2670 lambda _, *a: (
2671 self._mocked_call(['GetChange']+list(a))))
2672 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2673 lambda *_, **__: (
2674 self._mocked_call(['DoGetTryMasters'])))
2675 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2676 lambda _, s: self._mocked_call(['SetCQState', s]))
2677
tandrii8c5a3532016-11-04 07:52:02 -07002678 self.calls = [
2679 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2680 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2681 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2682 ((['git', 'config', 'branch.feature.gerritserver'],),
2683 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002684 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2685 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2686 'project': 'depot_tools',
2687 'status': 'OPEN',
2688 'owner': {'email': 'owner@e.mail'},
2689 'revisions': {
2690 'deadbeaf': {
2691 '_number': 6,
2692 },
2693 'beeeeeef': {
2694 '_number': 7,
2695 'fetch': {'http': {
2696 'url': 'https://chromium.googlesource.com/depot_tools',
2697 'ref': 'refs/changes/56/123456/7'
2698 }},
2699 },
2700 },
2701 }),
tandrii8c5a3532016-11-04 07:52:02 -07002702 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2703 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2704 ((['get_or_create_merge_base', 'feature', 'feature'],),
2705 'fake_ancestor_sha'),
2706 ((['GetChange', 'fake_ancestor_sha', None], ),
2707 git_cl.presubmit_support.GitChange(
2708 '', '', '', '', '', '', '', '')),
2709 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2710 ((['DoGetTryMasters'], ), None),
2711 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2712 ]
2713 out = StringIO.StringIO()
2714 self.mock(git_cl.sys, 'stdout', out)
2715 self.assertEqual(0, git_cl.main(['try']))
2716 self.assertEqual(
2717 out.getvalue(),
2718 'scheduled CQ Dry Run on '
2719 'https://chromium-review.googlesource.com/123456\n')
2720
2721 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2722 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2723 lambda _: {
2724 'owner_email': 'owner@e.mail',
2725 'private': False,
2726 'closed': False,
2727 'project': 'depot_tools',
2728 'patchsets': [20001],
2729 })
tandriide281ae2016-10-12 06:02:30 -07002730 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2731 self.calls = [
2732 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2733 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2734 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2735 ((['git', 'config', 'rietveld.server'],),
2736 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002737 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002738 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002739 ]
2740
2741 def _buildbucket_retry(*_, **kw):
2742 # self.maxDiff = 10000
2743 body = json.loads(kw['body'])
2744 self.assertEqual(len(body['builds']), 1)
2745 build = body['builds'][0]
2746 params = json.loads(build.pop('parameters_json'))
2747 self.assertEqual(params, {
2748 u'builder_name': u'win',
2749 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2750 u'revision': None}],
2751 u'properties': {
2752 u'category': u'git_cl_try',
2753 u'issue': 123,
2754 u'key': u'val',
2755 u'json': [{u'a': 1}, None],
2756 u'master': u'tryserver.chromium',
2757 u'patch_project': u'depot_tools',
2758 u'patch_storage': u'rietveld',
2759 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002760 u'rietveld': u'https://codereview.chromium.org',
2761 }
2762 })
2763 self.assertEqual(build, {
2764 u'bucket': u'master.tryserver.chromium',
2765 u'client_operation_id': u'uuid4',
2766 u'tags': [u'builder:win',
2767 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002768 u'user_agent:git_cl_try',
2769 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002770 })
2771
2772 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2773
2774 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2775 self.assertEqual(0, git_cl.main([
2776 'try', '-m', 'tryserver.chromium', '-b', 'win',
2777 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2778 self.assertRegexpMatches(
2779 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002780 'Tried jobs on:\nBucket: master.tryserver.chromium')
2781
tandrii8c5a3532016-11-04 07:52:02 -07002782 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2783 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2784 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2785
tandrii8c5a3532016-11-04 07:52:02 -07002786 self.calls = [
2787 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2788 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2789 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2790 ((['git', 'config', 'branch.feature.gerritserver'],),
2791 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002792 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002793 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002794 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002795 'status': 'OPEN',
2796 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002797 'revisions': {
2798 'deadbeaf': {
2799 '_number': 6,
2800 },
2801 'beeeeeef': {
2802 '_number': 7,
2803 'fetch': {'http': {
2804 'url': 'https://chromium.googlesource.com/depot_tools',
2805 'ref': 'refs/changes/56/123456/7'
2806 }},
2807 },
2808 },
2809 }),
2810 ]
2811
2812 def _buildbucket_retry(*_, **kw):
2813 # self.maxDiff = 10000
2814 body = json.loads(kw['body'])
2815 self.assertEqual(len(body['builds']), 1)
2816 build = body['builds'][0]
2817 params = json.loads(build.pop('parameters_json'))
2818 self.assertEqual(params, {
2819 u'builder_name': u'win',
2820 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2821 u'revision': None}],
2822 u'properties': {
2823 u'category': u'git_cl_try',
2824 u'key': u'val',
2825 u'json': [{u'a': 1}, None],
2826 u'master': u'tryserver.chromium',
2827
2828 u'patch_gerrit_url':
2829 u'https://chromium-review.googlesource.com',
2830 u'patch_issue': 123456,
2831 u'patch_project': u'depot_tools',
2832 u'patch_ref': u'refs/changes/56/123456/7',
2833 u'patch_repository_url':
2834 u'https://chromium.googlesource.com/depot_tools',
2835 u'patch_set': 7,
2836 u'patch_storage': u'gerrit',
2837 }
2838 })
2839 self.assertEqual(build, {
2840 u'bucket': u'master.tryserver.chromium',
2841 u'client_operation_id': u'uuid4',
2842 u'tags': [
2843 u'builder:win',
2844 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2845 u'user_agent:git_cl_try',
2846 u'master:tryserver.chromium'],
2847 })
2848
2849 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2850
2851 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2852 self.assertEqual(0, git_cl.main([
2853 'try', '-m', 'tryserver.chromium', '-b', 'win',
2854 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2855 self.assertRegexpMatches(
2856 git_cl.sys.stdout.getvalue(),
2857 'Tried jobs on:\nBucket: master.tryserver.chromium')
2858
borenet6c0efe62016-10-19 08:13:29 -07002859 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002860 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2861 lambda _: {
2862 'owner_email': 'owner@e.mail',
2863 'private': False,
2864 'closed': False,
2865 'project': 'depot_tools',
2866 'patchsets': [20001],
2867 })
borenet6c0efe62016-10-19 08:13:29 -07002868 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2869 self.calls = [
2870 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2871 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2872 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2873 ((['git', 'config', 'rietveld.server'],),
2874 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002875 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002876 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002877 ]
2878
2879 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002880 body = json.loads(kw['body'])
2881 self.assertEqual(len(body['builds']), 1)
2882 build = body['builds'][0]
2883 params = json.loads(build.pop('parameters_json'))
2884 self.assertEqual(params, {
2885 u'builder_name': u'win',
2886 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2887 u'revision': None}],
2888 u'properties': {
2889 u'category': u'git_cl_try',
2890 u'issue': 123,
2891 u'patch_project': u'depot_tools',
2892 u'patch_storage': u'rietveld',
2893 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002894 u'rietveld': u'https://codereview.chromium.org',
2895 }
2896 })
2897 self.assertEqual(build, {
2898 u'bucket': u'test.bucket',
2899 u'client_operation_id': u'uuid4',
2900 u'tags': [u'builder:win',
2901 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2902 u'user_agent:git_cl_try'],
2903 })
2904
2905 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2906
2907 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2908 self.assertEqual(0, git_cl.main([
2909 'try', '-B', 'test.bucket', '-b', 'win']))
2910 self.assertRegexpMatches(
2911 git_cl.sys.stdout.getvalue(),
2912 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002913
qyearsley123a4682016-10-26 09:12:17 -07002914 def test_git_cl_try_bots_on_multiple_masters(self):
2915 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2916 self.calls = [
2917 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2918 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2919 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2920 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002921 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002922 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2923 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2924 ]
2925
2926 def _buildbucket_retry(*_, **kw):
2927 body = json.loads(kw['body'])
2928 self.assertEqual(len(body['builds']), 2)
2929
2930 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2931 self.assertEqual(first_build_params['builder_name'], 'builder1')
2932 self.assertEqual(first_build_params['properties']['master'], 'master1')
2933
2934 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2935 self.assertEqual(first_build_params['builder_name'], 'builder2')
2936 self.assertEqual(first_build_params['properties']['master'], 'master2')
2937
2938 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2939
2940 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2941 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2942
2943 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2944 self.assertEqual(
2945 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2946 self.assertEqual(
2947 git_cl.sys.stdout.getvalue(),
2948 'Tried jobs on:\n'
2949 'Bucket: master.master1\n'
2950 ' builder1: []\n'
2951 'Bucket: master.master2\n'
2952 ' builder2: []\n'
2953 'To see results here, run: git cl try-results\n'
2954 'To see results in browser, run: git cl web\n')
2955
tandrii16e0b4e2016-06-07 10:34:28 -07002956 def _common_GerritCommitMsgHookCheck(self):
2957 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2958 self.mock(git_cl.os.path, 'abspath',
2959 lambda path: self._mocked_call(['abspath', path]))
2960 self.mock(git_cl.os.path, 'exists',
2961 lambda path: self._mocked_call(['exists', path]))
2962 self.mock(git_cl.gclient_utils, 'FileRead',
2963 lambda path: self._mocked_call(['FileRead', path]))
2964 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2965 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2966 self.calls = [
2967 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2968 ((['abspath', '../'],), '/abs/git_repo_root'),
2969 ]
2970 return git_cl.Changelist(codereview='gerrit', issue=123)
2971
2972 def test_GerritCommitMsgHookCheck_custom_hook(self):
2973 cl = self._common_GerritCommitMsgHookCheck()
2974 self.calls += [
2975 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2976 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2977 '#!/bin/sh\necho "custom hook"')
2978 ]
2979 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2980
2981 def test_GerritCommitMsgHookCheck_not_exists(self):
2982 cl = self._common_GerritCommitMsgHookCheck()
2983 self.calls += [
2984 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2985 ]
2986 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2987
2988 def test_GerritCommitMsgHookCheck(self):
2989 cl = self._common_GerritCommitMsgHookCheck()
2990 self.calls += [
2991 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2992 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2993 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002994 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002995 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2996 ''),
2997 ]
2998 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2999
tandriic4344b52016-08-29 06:04:54 -07003000 def test_GerritCmdLand(self):
3001 self.calls += [
3002 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3003 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3004 'deadbeaf'),
3005 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3006 ((['git', 'config', 'branch.feature.gerritserver'],),
3007 'chromium-review.googlesource.com'),
3008 ]
3009 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3010 cl._codereview_impl._GetChangeDetail = lambda _: {
3011 'labels': {},
3012 'current_revision': 'deadbeaf',
3013 }
agable32978d92016-11-01 12:55:02 -07003014 cl._codereview_impl._GetChangeCommit = lambda: {
3015 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003016 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003017 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3018 }
tandriic4344b52016-08-29 06:04:54 -07003019 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003020 out = StringIO.StringIO()
3021 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003022 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003023 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07003024 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003025
tandrii221ab252016-10-06 08:12:04 -07003026 BUILDBUCKET_BUILDS_MAP = {
3027 '9000': {
3028 'id': '9000',
3029 'status': 'STARTED',
3030 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3031 'result_details_json': '{"properties": {}}',
3032 'bucket': 'master.x.y',
3033 'created_by': 'user:someone@chromium.org',
3034 'created_ts': '147200002222000',
3035 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3036 },
3037 '8000': {
3038 'id': '8000',
3039 'status': 'COMPLETED',
3040 'result': 'FAILURE',
3041 'failure_reason': 'BUILD_FAILURE',
3042 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3043 'result_details_json': '{"properties": {}}',
3044 'bucket': 'master.x.y',
3045 'created_by': 'user:someone@chromium.org',
3046 'created_ts': '147200001111000',
3047 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3048 },
3049 }
3050
3051 def test_write_try_results_json(self):
3052 expected_output = [
3053 {
3054 'buildbucket_id': '8000',
3055 'bucket': 'master.x.y',
3056 'builder_name': 'my-builder',
3057 'status': 'COMPLETED',
3058 'result': 'FAILURE',
3059 'failure_reason': 'BUILD_FAILURE',
3060 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3061 },
3062 {
3063 'buildbucket_id': '9000',
3064 'bucket': 'master.x.y',
3065 'builder_name': 'my-builder',
3066 'status': 'STARTED',
3067 'result': None,
3068 'failure_reason': None,
3069 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3070 }
3071 ]
3072 self.calls = [(('write_json', 'output.json', expected_output), '')]
3073 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3074
tandrii45b2a582016-10-11 03:14:16 -07003075 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003076 out = StringIO.StringIO()
3077 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003078 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3079 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003080 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3081 self._mocked_call(['get_authenticator_for_host', host]))
3082 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3083 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003084
3085 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3086 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003087 self.calls += [
3088 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3089 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3090 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3091 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3092 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3093 ((['git', 'config', 'branch.feature.rietveldserver'],),
3094 'codereview.example.com'),
3095 ((['get_authenticator_for_host', 'codereview.example.com'],),
3096 AuthenticatorMock()),
3097 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3098
3099 def test_fetch_try_jobs_none_rietveld(self):
3100 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003101 # Simulate that user isn't logged in.
3102 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003103 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003104 self.assertRegexpMatches(sys.stdout.getvalue(),
3105 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003106 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3107
3108 def test_fetch_try_jobs_some_rietveld(self):
3109 self._setup_fetch_try_jobs_rietveld({
3110 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3111 })
3112 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003113 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3114 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3115 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3116
3117 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3118 self._setup_fetch_try_jobs(most_recent_patchset=13)
3119 self.calls += [
3120 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3121 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3122 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003123 # TODO(tandrii): Uncomment the below if we decide to support checking
3124 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003125 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003126 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003127 ((['git', 'config', 'branch.feature.gerritserver'],),
3128 'https://x-review.googlesource.com'),
3129 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3130 AuthenticatorMock()),
3131 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3132
3133 def test_fetch_try_jobs_none_gerrit(self):
3134 self._setup_fetch_try_jobs_gerrit({})
3135 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003136 # TODO(tandrii): Uncomment the below if we decide to support checking
3137 # patchsets for Gerrit.
3138 # self.assertRegexpMatches(
3139 # sys.stdout.getvalue(),
3140 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003141 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3142
3143 def test_fetch_try_jobs_some_gerrit(self):
3144 self._setup_fetch_try_jobs_gerrit({
3145 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3146 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003147 # TODO(tandrii): Uncomment the below if we decide to support checking
3148 # patchsets for Gerrit.
3149 # self.calls.remove(
3150 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003151 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3152
3153 # ... and doesn't result in warning.
3154 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3155 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003156 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3157 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3158
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003159 def _mock_gerrit_changes_for_detail_cache(self):
3160 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003161
3162 def test_gerrit_change_detail_cache_normalize(self):
3163 self._mock_gerrit_changes_for_detail_cache()
3164 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003165 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003166 ]
3167 cl = git_cl.Changelist(codereview='gerrit')
3168 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3169 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3170 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3171 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3172
3173 def test_gerrit_change_detail_cache_simple(self):
3174 self._mock_gerrit_changes_for_detail_cache()
3175 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003176 (('GetChangeDetail', 'host', '1', []), 'a'),
3177 (('GetChangeDetail', 'host', '2', []), 'b'),
3178 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003179 ]
3180 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3181 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3182 self.assertEqual(cl._GetChangeDetail(), 'a')
3183 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003184 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003185 self.assertEqual(cl._GetChangeDetail(), 'a')
3186 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3187
3188 def test_gerrit_change_detail_cache_options(self):
3189 self._mock_gerrit_changes_for_detail_cache()
3190 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003191 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3192 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3193 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3194 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003195 ]
3196 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3197 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3198 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3199 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3200 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3201 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3202 self.assertEqual(cl._GetChangeDetail(), 'cab')
3203
3204 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3205 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3206 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3207 self.assertEqual(cl._GetChangeDetail(), 'cab')
3208
3209 # Finally, no_cache should invalidate all caches for given change.
3210 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3211 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3212
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003213 def test_gerrit_description_caching(self):
3214 def gen_detail(rev, desc):
3215 return {
3216 'current_revision': rev,
3217 'revisions': {rev: {'commit': {'message': desc}}}
3218 }
3219 self.calls = [
3220 (('GetChangeDetail', 'host', '1',
3221 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3222 gen_detail('rev1', 'desc1')),
3223 (('GetChangeDetail', 'host', '1',
3224 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3225 gen_detail('rev2', 'desc2')),
3226 ]
3227
3228 self._mock_gerrit_changes_for_detail_cache()
3229 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3230 self.assertEqual(cl.GetDescription(), 'desc1')
3231 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3232 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003233
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003234 def test_print_current_creds(self):
3235 class CookiesAuthenticatorMock(object):
3236 def __init__(self):
3237 self.gitcookies = {
3238 'host.googlesource.com': ('user', 'pass'),
3239 'host-review.googlesource.com': ('user', 'pass'),
3240 }
3241 self.netrc = self
3242 self.netrc.hosts = {
3243 'github.com': ('user2', None, 'pass2'),
3244 'host2.googlesource.com': ('user3', None, 'pass'),
3245 }
3246 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3247 CookiesAuthenticatorMock)
3248 self.mock(sys, 'stdout', StringIO.StringIO())
3249 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3250 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3251 ' Host\t User\t Which file',
3252 '============================\t=====\t===========',
3253 'host-review.googlesource.com\t user\t.gitcookies',
3254 ' host.googlesource.com\t user\t.gitcookies',
3255 ' host2.googlesource.com\tuser3\t .netrc',
3256 ])
3257 sys.stdout.buf = ''
3258 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3259 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3260 ' Host\tUser\t Which file',
3261 '============================\t====\t===========',
3262 'host-review.googlesource.com\tuser\t.gitcookies',
3263 ' host.googlesource.com\tuser\t.gitcookies',
3264 ])
3265
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003266 def _common_creds_check_mocks(self):
3267 def exists_mock(path):
3268 dirname = os.path.dirname(path)
3269 if dirname == os.path.expanduser('~'):
3270 dirname = '~'
3271 base = os.path.basename(path)
3272 if base in ('.netrc', '.gitcookies'):
3273 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3274 # git cl also checks for existence other files not relevant to this test.
3275 return None
3276 self.mock(os.path, 'exists', exists_mock)
3277 self.mock(sys, 'stdout', StringIO.StringIO())
3278
3279 def test_creds_check_gitcookies_not_configured(self):
3280 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003281 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003282 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003283 self.calls = [
3284 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3285 (('os.path.exists', '~/.netrc'), True),
3286 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3287 'or Ctrl+C to abort'), ''),
3288 ((['git', 'config', '--global', 'http.cookiefile',
3289 os.path.expanduser('~/.gitcookies')], ), ''),
3290 ]
3291 self.assertEqual(0, git_cl.main(['creds-check']))
3292 self.assertRegexpMatches(
3293 sys.stdout.getvalue(),
3294 '^You seem to be using outdated .netrc for git credentials:')
3295 self.assertRegexpMatches(
3296 sys.stdout.getvalue(),
3297 '\nConfigured git to use .gitcookies from')
3298
3299 def test_creds_check_gitcookies_configured_custom_broken(self):
3300 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003301 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003302 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003303 self.calls = [
3304 ((['git', 'config', '--global', 'http.cookiefile'],),
3305 '/custom/.gitcookies'),
3306 (('os.path.exists', '/custom/.gitcookies'), False),
3307 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3308 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3309 ((['git', 'config', '--global', 'http.cookiefile',
3310 os.path.expanduser('~/.gitcookies')], ), ''),
3311 ]
3312 self.assertEqual(0, git_cl.main(['creds-check']))
3313 self.assertRegexpMatches(
3314 sys.stdout.getvalue(),
3315 'WARNING: you have configured custom path to .gitcookies: ')
3316 self.assertRegexpMatches(
3317 sys.stdout.getvalue(),
3318 'However, your configured .gitcookies file is missing.')
3319
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003320 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003321 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3322 lambda _, message: self._mocked_call('AddComment', message))
3323 self.calls = [
3324 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3325 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3326 (('AddComment', 'msg'), ''),
3327 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003328 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3329 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003330
3331 def test_git_cl_comment_add_gerrit(self):
3332 self.mock(git_cl.gerrit_util, 'SetReview',
3333 lambda host, change, msg:
3334 self._mocked_call('SetReview', host, change, msg))
3335 self.calls = [
3336 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3337 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3338 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3339 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3340 'origin/master'),
3341 ((['git', 'config', 'remote.origin.url'],),
3342 'https://chromium.googlesource.com/infra/infra'),
3343 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3344 ]
3345 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3346 '-a', 'msg']))
3347
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003348 def test_git_cl_comments_fetch_rietveld(self):
3349 self.mock(sys, 'stdout', StringIO.StringIO())
3350 self.calls = [
3351 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3352 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3353 ] * 2
3354 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3355 'messages': [
3356 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3357 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3358 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3359 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3360 # Intentionally wrong order here.
3361 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3362 'disapproval': False, 'approval': False,
3363 'sender': 'owner@example.com'},
3364 ],
3365 'owner_email': 'owner@example.com',
3366 })
3367 expected_comments_summary = [
3368 git_cl._CommentSummary(
3369 message='lgtm',
3370 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3371 disapproval=False, approval=True, sender='r@example.com'),
3372 git_cl._CommentSummary(
3373 message='not lgtm',
3374 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3375 disapproval=True, approval=False, sender='r2@example.com'),
3376 # Note: same order as in whatever Rietveld returns.
3377 git_cl._CommentSummary(
3378 message='PTAL',
3379 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3380 disapproval=False, approval=False, sender='owner@example.com'),
3381 ]
3382 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3383 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3384
3385 with git_cl.gclient_utils.temporary_directory() as tempdir:
3386 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3387 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3388 '-j', out_file]))
3389 with open(out_file) as f:
3390 read = json.load(f)
3391 self.assertEqual(len(read), 3)
3392 self.assertEqual(read[0], {
3393 'date': '2000-03-13 20:49:34.515270',
3394 'message': 'PTAL',
3395 'approval': False,
3396 'disapproval': False,
3397 'sender': 'owner@example.com'})
3398 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3399 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3400
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003401 def test_git_cl_comments_fetch_gerrit(self):
3402 self.mock(sys, 'stdout', StringIO.StringIO())
3403 self.calls = [
3404 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3405 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3406 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3407 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3408 'origin/master'),
3409 ((['git', 'config', 'remote.origin.url'],),
3410 'https://chromium.googlesource.com/infra/infra'),
3411 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3412 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3413 'owner': {'email': 'owner@example.com'},
3414 'messages': [
3415 {
3416 u'_revision_number': 1,
3417 u'author': {
3418 u'_account_id': 1111084,
3419 u'email': u'commit-bot@chromium.org',
3420 u'name': u'Commit Bot'
3421 },
3422 u'date': u'2017-03-15 20:08:45.000000000',
3423 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3424 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3425 u'tag': u'autogenerated:cq:dry-run'
3426 },
3427 {
3428 u'_revision_number': 2,
3429 u'author': {
3430 u'_account_id': 11151243,
3431 u'email': u'owner@example.com',
3432 u'name': u'owner'
3433 },
3434 u'date': u'2017-03-16 20:00:41.000000000',
3435 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3436 u'message': u'PTAL',
3437 },
3438 {
3439 u'_revision_number': 2,
3440 u'author': {
3441 u'_account_id': 148512 ,
3442 u'email': u'reviewer@example.com',
3443 u'name': u'reviewer'
3444 },
3445 u'date': u'2017-03-17 05:19:37.500000000',
3446 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3447 u'message': u'Patch Set 2: Code-Review+1',
3448 },
3449 ]
3450 })
3451 ] * 2
3452 expected_comments_summary = [
3453 git_cl._CommentSummary(
3454 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3455 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3456 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3457 git_cl._CommentSummary(
3458 message=u'PTAL',
3459 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3460 disapproval=False, approval=False, sender=u'owner@example.com'),
3461 git_cl._CommentSummary(
3462 message=u'Patch Set 2: Code-Review+1',
3463 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3464 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3465 ]
3466 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3467 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3468
3469 with git_cl.gclient_utils.temporary_directory() as tempdir:
3470 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3471 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3472 '-j', out_file]))
3473 with open(out_file) as f:
3474 read = json.load(f)
3475 self.assertEqual(len(read), 3)
3476 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3477 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3478 self.assertEqual(read[2], {
3479 u'date': u'2017-03-17 05:19:37.500000',
3480 u'message': u'Patch Set 2: Code-Review+1',
3481 u'approval': False,
3482 u'disapproval': False,
3483 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003484
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003485if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003486 logging.basicConfig(
3487 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003488 unittest.main()