blob: cb7228ebbc8e43c18bf3e640fdc1df9647716bd6 [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 Gablec4c40d12017-05-22 11:49:53 -0700985 self.assertEqual(
986 '=====================================\n'
987 'NOTICE: Rietveld is being deprecated. '
988 'You can upload changes to Gerrit with\n'
989 ' git cl upload --gerrit\n'
990 'or set Gerrit to be your default code review tool with\n'
991 ' git config gerrit.host true\n'
992 '=====================================\n',
993 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000994
tandriif9aefb72016-07-01 09:06:51 -0700995 def test_bug_on_cmd(self):
996 self._run_reviewer_test(
997 ['--bug=500658,proj:123'],
998 'desc\n\nBUG=500658\nBUG=proj:123',
999 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1000 'desc\n\nBUG=500658\nBUG=proj:1234',
1001 [])
1002
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001003 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1004 parent_msg=None,
1005 new_msg=None,
1006 fail_after_parent_msg=False,
1007 fail_cherry_pick=False,
1008 fail_push_count=0,
1009 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001010 if debug:
1011 # Very useful due to finally clause in git cl land raising exceptions and
1012 # shadowing real cause of failure.
1013 self.mock(git_cl, '_IS_BEING_TESTED', True)
1014 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001015 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001016
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001017 if git_numberer_enabled:
1018 # Special mocks to check validity of timestamp.
1019 original_git_amend_head = git_cl._git_amend_head
1020 def _git_amend_head_mock(msg, tstamp):
1021 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1022 return original_git_amend_head(msg, tstamp)
1023 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1024
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001025 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1026 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001027 self.mock(RietveldMock, 'update_description', staticmethod(
1028 lambda i, d: self._mocked_call(['update_description', i, d])))
1029 self.mock(RietveldMock, 'add_comment', staticmethod(
1030 lambda i, c: self._mocked_call(['add_comment', i, c])))
1031 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001032 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1033 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1034 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1035 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1036 CERR1),
1037 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1038 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001039 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001040 ((['git', 'config', 'rietveld.server'],),
1041 'https://codereview.chromium.org'),
1042 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1043 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1044 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1045 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001046 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1047 ''), # No commits to rebase, according to local view of origin.
1048 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1049 'fake_ancestor_sha'),
1050 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1051 ((['git', 'rev-parse', '--show-cdup'],), ''),
1052 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1053 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1054 'fake_ancestor_sha...', '.'],),
1055 'M\tfile1.cpp'),
1056 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1057 ((['git', 'config', 'branch.feature.rietveldserver'],),
1058 'https://codereview.chromium.org'),
1059 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1060 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1061 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1062 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001063 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001064 # file1.cpp | 53 ++++++--
1065 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1066 ''),
1067 ((['git', 'show-ref', '--quiet', '--verify',
1068 'refs/heads/git-cl-commit'],),
1069 ''), # 0 return code means branch exists.
1070 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1071 ((['git', 'show-ref', '--quiet', '--verify',
1072 'refs/heads/git-cl-cherry-pick'],),
1073 CERR1), # This means git-cl-cherry-pick branch does not exist.
1074 ((['git', 'rev-parse', '--show-cdup'],), ''),
1075 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1076 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1077 ((['git', 'commit', '-m',
1078 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001079 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001080 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1081 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1082 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001083 repo_url),
1084
1085 ((['git', 'config', 'remote.origin.url'],), repo_url),
1086 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1087 git_numberer_enabled),
1088
1089 # Auto-rebase init.
1090 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1091 ]
1092 # Auto-rebase loops.
1093 for attempt in xrange(fail_push_count + 1):
1094 self.calls += [
1095 # Auto-rebase loop start.
1096 ((['git', 'retry', 'fetch', 'origin',
1097 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1098 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1099 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1100 # different in each loop iteration for truly realistic test.
1101 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1102 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1103 callError(1, 'failed to cherry pick') if fail_cherry_pick
1104 else ''),
1105 ]
1106 if fail_cherry_pick:
1107 return
1108
1109 if git_numberer_enabled:
1110 assert parent_msg
1111 self.calls += [
1112 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1113 parent_msg),
1114 ]
1115 if fail_after_parent_msg:
1116 return
1117 assert new_msg
1118 self.calls += [
1119 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1120 '1480022355'), # Committer's unix timestamp.
1121 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1122 '1480024000'),
1123 ((['git_amend_head committer timestamp', 1480024000],), ''),
1124 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1125 ]
1126 self.calls += [
1127 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1128 CERR1 if attempt < fail_push_count else ''),
1129 ]
1130 # End of autorebase + push.
1131
1132 self.calls += [
1133 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1134 ]
1135 if git_numberer_enabled:
1136 self.calls += [
1137 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1138 ]
1139
1140 # Cleanup calls.
1141 self.calls += [
1142 ((['git', 'checkout', '-q', 'feature'],), ''),
1143 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1144 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001145 ]
1146
1147 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001148 self._land_rietveld_calls(
1149 repo_url='https://chromium.googlesource.com/infra/infra',
1150 git_numberer_enabled=False,
1151 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001152 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001153 ((['git', 'config', 'rietveld.viewvc-url'],),
1154 'https://chromium.googlesource.com/infra/infra/+/'),
1155 ((['update_description', 123,
1156 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001157 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001158 ''),
1159 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001160 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001161 ]
1162 git_cl.main(['land'])
1163
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001164 def test_land_rietveld_fail_cherry_pick(self):
1165 self._land_rietveld_calls(
1166 repo_url='https://chromium.googlesource.com/infra/infra',
1167 git_numberer_enabled=False,
1168 fail_cherry_pick=True,
1169 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001170 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001171 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1172 'U path/file1\n'
1173 'U file2.cpp\n'),
1174 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001175 ((['git', 'checkout', '-q', 'feature'],), ''),
1176 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001177 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1178 ]
1179 git_cl.main(['land'])
1180
1181 def test_land_rietveld_git_numberer_fail_1_push(self):
1182 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1183
1184 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1185 self._land_rietveld_calls(
1186 repo_url='https://chromium.googlesource.com/chromium/src',
1187 git_numberer_enabled=True,
1188 parent_msg=('This is parent commit.\n'
1189 '\n'
1190 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1191 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1192 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1193 '\n'
1194 'Review-Url: https://codereview.chromium.org/123 .\n'
1195 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1196 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1197 fail_push_count=fail_push_count,
1198 debug=False)
1199
1200 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001201 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001202 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001203 ((['update_description', 123,
1204 'Issue: 123\n\nR=john@chromium.org\n'
1205 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001206 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001207 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1208 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1209 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001210 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001211 ''),
1212 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001213 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001214 ]
1215 git_cl.main(['land'])
1216
1217 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001218 self._land_rietveld_calls(
1219 repo_url='https://chromium.googlesource.com/v8/v8',
1220 git_numberer_enabled=True,
1221 parent_msg='This is parent commit with no footer.',
1222 fail_after_parent_msg=True,
1223 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001224 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001225 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001226 ((['git', 'checkout', '-q', 'feature'],), ''),
1227 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001228 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001229 ]
1230 with self.assertRaises(ValueError) as cm:
1231 git_cl.main(['land'])
1232 self.assertEqual(cm.exception.message,
1233 'Unable to infer commit position from footers')
1234
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001235 def test_git_numberer_not_whitelisted_repo(self):
1236 self.calls = []
1237 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001238 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1239 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001240 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001241
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001242 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001243 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1244 self.calls = [
1245 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001246 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001247 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001248 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001249 remote_url='https://chromium.googlesource.com/chromium/src',
1250 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001251 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001252
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001253 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001254 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001255 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001256 def fake_temporary_directory(**kwargs):
1257 yield tempdir
1258 self.mock(git_cl.gclient_utils, 'temporary_directory',
1259 fake_temporary_directory)
1260 self._test_GitNumbererState_valid_configs_inner(tempdir)
1261
1262 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001263 self.calls = [
1264 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001265 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001266 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1267 '''
1268 [plugin "git-numberer"]
1269 validate-enabled-refglob = refs/else/*
1270 validate-enabled-refglob = refs/heads/*
1271 validate-disabled-refglob = refs/heads/disabled
1272 validate-disabled-refglob = refs/branch-heads/*
1273 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001274 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1275 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001276 'refs/else/*\n'
1277 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001278 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1279 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001280 'refs/heads/disabled\n'
1281 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001282 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001283
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001284 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001285 remote_url='https://chromium.googlesource.com/chromium/src',
1286 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001287 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001288
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001289 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001290 remote_url='https://chromium.googlesource.com/chromium/src',
1291 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001292 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001293
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001294 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001295 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001296 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001297 remote_url='https://chromium.googlesource.com/chromium/src',
1298 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001299 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001300
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001301 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001302 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001303 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001304 if skip_auth_check:
1305 return [((cmd, ), 'true')]
1306
tandrii5d48c322016-08-18 16:19:37 -07001307 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001308 if issue:
1309 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001310 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001311 ])
1312 calls.extend([
1313 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1314 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1315 ((['git', 'config', 'remote.origin.url'],),
1316 'https://chromium.googlesource.com/my/repo'),
1317 ((['git', 'config', 'remote.origin.url'],),
1318 'https://chromium.googlesource.com/my/repo'),
1319 ])
1320 return calls
1321
1322 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001323 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001324 fetched_status=None, other_cl_owner=None,
1325 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001326 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001327 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1328 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1329 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1330 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001331 ]
1332 calls += cls._is_gerrit_calls(True)
1333 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001334 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1335 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1336 ((['git', 'config', 'branch.master.gerritissue'],),
1337 CERR1 if issue is None else str(issue)),
1338 ]
1339
1340 if custom_cl_base:
1341 ancestor_revision = custom_cl_base
1342 else:
1343 # Determine ancestor_revision to be merge base.
1344 ancestor_revision = 'fake_ancestor_sha'
1345 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001346 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001347 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001348 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001349 'refs/remotes/origin/master'],), ancestor_revision),
1350 ]
1351
1352 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001353 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1354
1355 if issue:
1356 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001357 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001358 '123456',
1359 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001360 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001361 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001362 'change_id': '123456789',
1363 'current_revision': 'sha1_of_current_revision',
1364 'revisions': { 'sha1_of_current_revision': {
1365 'commit': {'message': fetched_description},
1366 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001367 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001368 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001369 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001370 if fetched_status == 'ABANDONED':
1371 calls += [
1372 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1373 '123456 has been abandoned, new uploads are not '
1374 'allowed'), SystemExitMock()),
1375 ]
1376 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001377 if other_cl_owner:
1378 calls += [
1379 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1380 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001381
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001382 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1383 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001384 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001385 ((['git', 'rev-parse', '--show-cdup'],), ''),
1386 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001387
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001388 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1389 ancestor_revision + '...', '.'],),
1390 'M\t.gitignore\n'),
1391 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001392 ]
1393
1394 if not issue:
1395 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001396 ((['git', 'log', '--pretty=format:%s%n%n%b',
1397 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001398 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001399 ]
1400
1401 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001402 ((['git', 'config', 'user.email'],), 'me@example.com'),
1403 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1404 ([custom_cl_base] if custom_cl_base else
1405 [ancestor_revision, 'HEAD']),),
1406 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001407 ]
1408 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001409
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001410 @classmethod
1411 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001412 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001413 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001414 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001415 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001416 git_mirror=None,
1417 custom_cl_base=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001418 if post_amend_description is None:
1419 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001420 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001421 # Determined in `_gerrit_base_calls`.
1422 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1423
1424 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001425
tandriia60502f2016-06-20 02:01:53 -07001426 if squash_mode == 'default':
1427 calls.extend([
1428 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1429 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1430 ])
1431 elif squash_mode in ('override_squash', 'override_nosquash'):
1432 calls.extend([
1433 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1434 'true' if squash_mode == 'override_squash' else 'false'),
1435 ])
1436 else:
1437 assert squash_mode in ('squash', 'nosquash')
1438
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001439 # If issue is given, then description is fetched from Gerrit instead.
1440 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001441 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001442 ((['git', 'log', '--pretty=format:%s\n\n%b',
1443 ((custom_cl_base + '..') if custom_cl_base else
1444 'fake_ancestor_sha..HEAD')],),
1445 description),
1446 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001447 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001448 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001449 else:
1450 if not title:
1451 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001452 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1453 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001454 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001455 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001456 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001457 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001458 (('DownloadGerritHook', False), ''),
1459 # Amending of commit message to get the Change-Id.
1460 ((['git', 'log', '--pretty=format:%s\n\n%b',
1461 determined_ancestor_revision + '..HEAD'],),
1462 description),
1463 ((['git', 'commit', '--amend', '-m', description],), ''),
1464 ((['git', 'log', '--pretty=format:%s\n\n%b',
1465 determined_ancestor_revision + '..HEAD'],),
1466 post_amend_description)
1467 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001468 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001469 if not issue:
1470 # Prompting to edit description on first upload.
1471 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001472 ((['git', 'config', 'core.editor'],), ''),
1473 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001474 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001475 ref_to_push = 'abcdef0123456789'
1476 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001477 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1478 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1479 ]
1480
1481 if custom_cl_base is None:
1482 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001483 ((['get_or_create_merge_base', 'master',
1484 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001485 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001486 ]
1487 parent = 'origin/master'
1488 else:
1489 calls += [
1490 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1491 'refs/remotes/origin/master'],),
1492 callError(1)), # Means not ancenstor.
1493 (('ask_for_data',
1494 'Do you take responsibility for cleaning up potential mess '
1495 'resulting from proceeding with upload? Press Enter to upload, '
1496 'or Ctrl+C to abort'), ''),
1497 ]
1498 parent = custom_cl_base
1499
1500 calls += [
1501 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1502 '0123456789abcdef'),
1503 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1504 '-m', description],),
1505 ref_to_push),
1506 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001507 else:
1508 ref_to_push = 'HEAD'
1509
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001510 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001511 ((['git', 'rev-list',
1512 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1513 ref_to_push],),
1514 '1hashPerLine\n'),
1515 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001516
Aaron Gable9b713dd2016-12-14 16:04:21 -08001517 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001518 if ref_suffix:
1519 ref_suffix += ',m=' + title
1520 else:
1521 ref_suffix = '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001522
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001523 notify_suffix = 'notify=NONE'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001524 if ref_suffix:
1525 ref_suffix += ',' + notify_suffix
1526 else:
1527 ref_suffix = '%' + notify_suffix
1528
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001529 if git_mirror is None:
1530 calls += [
1531 ((['git', 'config', 'remote.origin.url'],),
1532 'https://chromium.googlesource.com/yyy/zzz'),
1533 ]
1534 else:
1535 calls += [
1536 ((['git', 'config', 'remote.origin.url'],),
1537 '/cache/this-dir-exists'),
1538 (('os.path.isdir', '/cache/this-dir-exists'),
1539 True),
1540 # Runs in /cache/this-dir-exists.
1541 ((['git', 'config', 'remote.origin.url'],),
1542 'https://chromium.googlesource.com/yyy/zzz'),
1543 ]
1544
ukai@chromium.orge8077812012-02-03 03:41:46 +00001545 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001546 ((['git', 'push',
1547 'https://chromium.googlesource.com/yyy/zzz',
1548 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001549 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001550 'remote: Processing changes: (\)\n'
1551 'remote: Processing changes: (|)\n'
1552 'remote: Processing changes: (/)\n'
1553 'remote: Processing changes: (-)\n'
1554 'remote: Processing changes: new: 1 (/)\n'
1555 'remote: Processing changes: new: 1, done\n'
1556 'remote:\n'
1557 'remote: New Changes:\n'
1558 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1559 'remote:\n'
1560 'To https://chromium.googlesource.com/yyy/zzz\n'
1561 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001562 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001563 if squash:
1564 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001565 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001566 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001567 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001568 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001569 ((['git', 'config', 'branch.master.gerritsquashhash',
1570 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001571 ]
tandrii88189772016-09-29 04:29:57 -07001572 calls += [
1573 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001574 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001575 123456 if squash else None, sorted(reviewers),
1576 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001577 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001578 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001579 return calls
1580
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001581 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001582 self,
1583 upload_args,
1584 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001585 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001586 squash=True,
1587 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001588 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001589 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001590 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001591 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001592 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001593 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001594 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001595 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001596 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001597 other_cl_owner=None,
1598 custom_cl_base=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001599 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001600 if squash_mode is None:
1601 if '--no-squash' in upload_args:
1602 squash_mode = 'nosquash'
1603 elif '--squash' in upload_args:
1604 squash_mode = 'squash'
1605 else:
1606 squash_mode = 'default'
1607
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001608 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001609 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001610 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001611 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001612 CookiesAuthenticatorMockFactory(
1613 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001614 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1615 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001616 self.mock(git_cl.gclient_utils, 'RunEditor',
1617 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001618 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1619 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001620
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001621 original_os_path_isdir = os.path.isdir
1622 def selective_os_path_isdir_mock(path):
1623 if path == '/cache/this-dir-exists':
1624 return self._mocked_call('os.path.isdir', path)
1625 return original_os_path_isdir(path)
1626 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1627
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001628 self.calls = self._gerrit_base_calls(
1629 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001630 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001631 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001632 other_cl_owner=other_cl_owner,
1633 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001634 if fetched_status != 'ABANDONED':
1635 self.calls += self._gerrit_upload_calls(
1636 description, reviewers, squash,
1637 squash_mode=squash_mode,
1638 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001639 ref_suffix=ref_suffix, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001640 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001641 issue=issue, cc=cc, git_mirror=git_mirror,
1642 custom_cl_base=custom_cl_base)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001643 # Uncomment when debugging.
1644 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001645 git_cl.main(['upload'] + upload_args)
1646
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001647 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001648 self._run_gerrit_upload_test(
1649 ['--no-squash'],
1650 'desc\n\nBUG=\n',
1651 [],
1652 squash=False,
1653 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1654
1655 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001656 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001657 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001658 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001659 [],
tandriia60502f2016-06-20 02:01:53 -07001660 squash=False,
1661 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001662 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001663
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001664 def test_gerrit_no_reviewer(self):
1665 self._run_gerrit_upload_test(
1666 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001667 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001668 [],
1669 squash=False,
1670 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001671
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001672 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001673 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1674 self._run_gerrit_upload_test(
1675 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1676 'desc\n\nBUG=\n\nChange-Id: I123456789',
1677 squash=False,
1678 squash_mode='override_nosquash',
1679 title='Dont_put_bad_chars')
1680 self.assertIn(
1681 'WARNING: Patchset title may only contain alphanumeric chars '
1682 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1683 'Cleaned up title: Dont put bad chars\n',
1684 git_cl.sys.stdout.getvalue())
1685
ukai@chromium.orge8077812012-02-03 03:41:46 +00001686 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001687 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001688 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001689 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001690 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001691 squash=False,
1692 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001693 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001694
1695 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001696 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001697 [],
bradnelsond975b302016-10-23 12:20:23 -07001698 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1699 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001700 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001701 ['reviewer@example.com', 'another@example.com'],
1702 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001703 squash_mode='override_nosquash',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001704 ref_suffix='%l=Code-Review+1',
bradnelsond975b302016-10-23 12:20:23 -07001705 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001706
1707 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001708 self._run_gerrit_upload_test(
1709 [],
1710 'desc\nBUG=\n\nChange-Id: 123456789',
1711 [],
1712 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001713
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001714 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001715 self._run_gerrit_upload_test(
1716 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001717 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001718 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001719 squash=True,
1720 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001721
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001722 def test_gerrit_upload_squash_first_against_rev(self):
1723 custom_cl_base = 'custom_cl_base_rev_or_branch'
1724 self._run_gerrit_upload_test(
1725 ['--squash', custom_cl_base],
1726 'desc\nBUG=\n\nChange-Id: 123456789',
1727 [],
1728 squash=True,
1729 expected_upstream_ref='origin/master',
1730 custom_cl_base=custom_cl_base)
1731 self.assertIn(
1732 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1733 sys.stdout.getvalue())
1734
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001735 def test_gerrit_upload_squash_first_with_mirror(self):
1736 self._run_gerrit_upload_test(
1737 ['--squash'],
1738 'desc\nBUG=\n\nChange-Id: 123456789',
1739 [],
1740 squash=True,
1741 expected_upstream_ref='origin/master',
1742 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1743
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001744 def test_gerrit_upload_squash_reupload(self):
1745 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001746 self._run_gerrit_upload_test(
1747 ['--squash'],
1748 description,
1749 [],
1750 squash=True,
1751 expected_upstream_ref='origin/master',
1752 issue=123456)
1753
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001754 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1755 self.mock(git_cl, 'DieWithError',
1756 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1757 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1758 with self.assertRaises(SystemExitMock):
1759 self._run_gerrit_upload_test(
1760 ['--squash'],
1761 description,
1762 [],
1763 squash=True,
1764 expected_upstream_ref='origin/master',
1765 issue=123456,
1766 fetched_status='ABANDONED')
1767
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001768 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1769 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1770 lambda *_, **__: {'email': 'yet-another@example.com'})
1771 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1772 self._run_gerrit_upload_test(
1773 ['--squash'],
1774 description,
1775 [],
1776 squash=True,
1777 expected_upstream_ref='origin/master',
1778 issue=123456,
1779 other_cl_owner='other@example.com')
1780 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001781 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001782 'authenticate to Gerrit as yet-another@example.com.\n'
1783 'Uploading may fail due to lack of permissions',
1784 git_cl.sys.stdout.getvalue())
1785
rmistry@google.com2dd99862015-06-22 12:22:18 +00001786 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001787 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001788 def mock_run_git(*args, **_kwargs):
1789 if args[0] == ['for-each-ref',
1790 '--format=%(refname:short) %(upstream:short)',
1791 'refs/heads']:
1792 # Create a local branch dependency tree that looks like this:
1793 # test1 -> test2 -> test3 -> test4 -> test5
1794 # -> test3.1
1795 # test6 -> test0
1796 branch_deps = [
1797 'test2 test1', # test1 -> test2
1798 'test3 test2', # test2 -> test3
1799 'test3.1 test2', # test2 -> test3.1
1800 'test4 test3', # test3 -> test4
1801 'test5 test4', # test4 -> test5
1802 'test6 test0', # test0 -> test6
1803 'test7', # test7
1804 ]
1805 return '\n'.join(branch_deps)
1806 self.mock(git_cl, 'RunGit', mock_run_git)
1807
1808 class RecordCalls:
1809 times_called = 0
1810 record_calls = RecordCalls()
1811 def mock_CMDupload(*args, **_kwargs):
1812 record_calls.times_called += 1
1813 return 0
1814 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1815
1816 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001817 (('ask_for_data', 'This command will checkout all dependent branches '
1818 'and run "git cl upload". Press Enter to continue, '
1819 'or Ctrl+C to abort'), ''),
1820 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001821
1822 class MockChangelist():
1823 def __init__(self):
1824 pass
1825 def GetBranch(self):
1826 return 'test1'
1827 def GetIssue(self):
1828 return '123'
1829 def GetPatchset(self):
1830 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001831 def IsGerrit(self):
1832 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001833
1834 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1835 # CMDupload should have been called 5 times because of 5 dependent branches.
1836 self.assertEquals(5, record_calls.times_called)
1837 self.assertEquals(0, ret)
1838
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001839 def test_gerrit_change_id(self):
1840 self.calls = [
1841 ((['git', 'write-tree'], ),
1842 'hashtree'),
1843 ((['git', 'rev-parse', 'HEAD~0'], ),
1844 'branch-parent'),
1845 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1846 'A B <a@b.org> 1456848326 +0100'),
1847 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1848 'C D <c@d.org> 1456858326 +0100'),
1849 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1850 'hashchange'),
1851 ]
1852 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1853 self.assertEqual(change_id, 'Ihashchange')
1854
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001855 def test_desecription_append_footer(self):
1856 for init_desc, footer_line, expected_desc in [
1857 # Use unique desc first lines for easy test failure identification.
1858 ('foo', 'R=one', 'foo\n\nR=one'),
1859 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1860 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1861 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1862 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1863 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1864 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1865 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1866 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1867 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1868 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1869 ]:
1870 desc = git_cl.ChangeDescription(init_desc)
1871 desc.append_footer(footer_line)
1872 self.assertEqual(desc.description, expected_desc)
1873
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001874 def test_update_reviewers(self):
1875 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001876 ('foo', [], [],
1877 'foo'),
1878 ('foo\nR=xx', [], [],
1879 'foo\nR=xx'),
1880 ('foo\nTBR=xx', [], [],
1881 'foo\nTBR=xx'),
1882 ('foo', ['a@c'], [],
1883 'foo\n\nR=a@c'),
1884 ('foo\nR=xx', ['a@c'], [],
1885 'foo\n\nR=a@c, xx'),
1886 ('foo\nTBR=xx', ['a@c'], [],
1887 'foo\n\nR=a@c\nTBR=xx'),
1888 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1889 'foo\n\nR=a@c, yy\nTBR=xx'),
1890 ('foo\nBUG=', ['a@c'], [],
1891 'foo\nBUG=\nR=a@c'),
1892 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1893 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1894 ('foo', ['a@c', 'b@c'], [],
1895 'foo\n\nR=a@c, b@c'),
1896 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1897 'foo\nBar\n\nR=c@c\nBUG='),
1898 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1899 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001900 # Same as the line before, but full of whitespaces.
1901 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001902 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001903 'foo\nBar\n\nR=c@c\n BUG =',
1904 ),
1905 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001906 ('foo BUG=allo R=joe ', ['c@c'], [],
1907 'foo BUG=allo R=joe\n\nR=c@c'),
1908 # Redundant TBRs get promoted to Rs
1909 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1910 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001911 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001912 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001913 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001914 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001915 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001916 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001917 actual.append(obj.description)
1918 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001919
wittman@chromium.org455dc922015-01-26 20:15:50 +00001920 def test_get_target_ref(self):
1921 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001922 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001923 self.assertEqual(None, git_cl.GetTargetRef(None,
1924 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001925 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001926
wittman@chromium.org455dc922015-01-26 20:15:50 +00001927 # Check default target refs for branches.
1928 self.assertEqual('refs/heads/master',
1929 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001930 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001931 self.assertEqual('refs/heads/master',
1932 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001933 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001934 self.assertEqual('refs/heads/master',
1935 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001936 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001937 self.assertEqual('refs/branch-heads/123',
1938 git_cl.GetTargetRef('origin',
1939 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001940 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001941 self.assertEqual('refs/diff/test',
1942 git_cl.GetTargetRef('origin',
1943 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001944 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001945 self.assertEqual('refs/heads/chrome/m42',
1946 git_cl.GetTargetRef('origin',
1947 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001948 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001949
1950 # Check target refs for user-specified target branch.
1951 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1952 'refs/remotes/branch-heads/123'):
1953 self.assertEqual('refs/branch-heads/123',
1954 git_cl.GetTargetRef('origin',
1955 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001956 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001957 for branch in ('origin/master', 'remotes/origin/master',
1958 'refs/remotes/origin/master'):
1959 self.assertEqual('refs/heads/master',
1960 git_cl.GetTargetRef('origin',
1961 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001962 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001963 for branch in ('master', 'heads/master', 'refs/heads/master'):
1964 self.assertEqual('refs/heads/master',
1965 git_cl.GetTargetRef('origin',
1966 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001967 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001968
wychen@chromium.orga872e752015-04-28 23:42:18 +00001969 def test_patch_when_dirty(self):
1970 # Patch when local tree is dirty
1971 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1972 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1973
1974 def test_diff_when_dirty(self):
1975 # Do 'git cl diff' when local tree is dirty
1976 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1977 self.assertNotEqual(git_cl.main(['diff']), 0)
1978
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001979 @staticmethod
1980 def _get_gerrit_codereview_server_calls(branch, value=None,
1981 git_short_host='host',
1982 detect_branch=True):
1983 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1984
1985 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1986 """
1987 calls = []
1988 if detect_branch:
1989 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1990 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1991 CERR1 if value is None else value))
1992 if value is None:
1993 calls += [
1994 ((['git', 'config', 'branch.' + branch + '.merge'],),
1995 'refs/heads' + branch),
1996 ((['git', 'config', 'branch.' + branch + '.remote'],),
1997 'origin'),
1998 ((['git', 'config', 'remote.origin.url'],),
1999 'https://%s.googlesource.com/my/repo' % git_short_host),
2000 ]
2001 return calls
2002
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002003 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002004 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002005 detect_gerrit_server=True,
2006 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002007 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002008 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2009 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002010 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002011 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002012 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2013
tandriidf09a462016-08-18 16:23:55 -07002014 if new_branch:
2015 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2016 else:
2017 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002018
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002019 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002020 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002021 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002022 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002023 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2024 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2025 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2026 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002027 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002028 if default_codereview == 'gerrit':
2029 if not force_codereview:
2030 self.calls += [
2031 ((['git', 'config', 'gerrit.host'],), 'true'),
2032 ]
2033 if detect_gerrit_server:
2034 self.calls += self._get_gerrit_codereview_server_calls(
2035 'master', git_short_host=git_short_host,
2036 detect_branch=not new_branch and force_codereview)
2037 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002038
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002039 elif default_codereview == 'rietveld':
2040 self.calls += [
2041 ((['git', 'config', 'gerrit.host'],), CERR1),
2042 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2043 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2044 ]
2045 actual_codereview = 'rietveld'
2046
2047 if actual_codereview == 'rietveld':
2048 self.calls += [
2049 ((['git', 'rev-parse', '--show-cdup'],), ''),
2050 ]
2051 if not default_codereview:
2052 self.calls += [
2053 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2054 ]
2055 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002056 self.calls += [
2057 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002058 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002059 {
2060 'current_revision': '7777777777',
2061 'revisions': {
2062 '1111111111': {
2063 '_number': 1,
2064 'fetch': {'http': {
2065 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2066 'ref': 'refs/changes/56/123456/1',
2067 }},
2068 },
2069 '7777777777': {
2070 '_number': 7,
2071 'fetch': {'http': {
2072 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2073 'ref': 'refs/changes/56/123456/7',
2074 }},
2075 },
2076 },
2077 }),
2078 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002079
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002080 def _common_patch_rietveld_successful(self, **kwargs):
2081 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002082 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002083 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002084 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002085 ((['git', 'config', 'branch.master.rietveldserver',
2086 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002087 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002088 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002089 ((['git', 'commit', '-m',
2090 'Description\n\n' +
2091 'patch from issue 123456 at patchset 60001 ' +
2092 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002093 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002094
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002095 def test_patch_rietveld_default(self):
2096 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002097 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2098
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002099 def test_patch_rietveld_successful_new_branch(self):
2100 self._common_patch_rietveld_successful(default_codereview='rietveld',
2101 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002102 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2103
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002104 def test_patch_rietveld_guess_by_url(self):
2105 self._common_patch_rietveld_successful(
2106 default_codereview=None, # It doesn't matter.
2107 actual_codereview='rietveld')
2108 self.assertEqual(git_cl.main(
2109 ['patch', 'https://codereview.example.com/123456']), 0)
2110
2111 def test_patch_rietveld_conflict(self):
2112 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002113 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002114 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002115
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002116 def test_patch_gerrit_default(self):
2117 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002118 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002119 self.calls += [
2120 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2121 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002122 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002123 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002124 ((['git', 'config', 'branch.master.gerritserver',
2125 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002126 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002127 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002128 ]
2129 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2130
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002131 def test_patch_gerrit_force(self):
2132 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002133 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002134 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002135 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002136 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002137 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002138 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002139 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002140 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002141 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002142 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002143 ]
2144 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2145
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002146 def test_patch_gerrit_guess_by_url(self):
2147 self._patch_common(
2148 default_codereview=None, # It doesn't matter what's default.
2149 actual_codereview='gerrit',
2150 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002151 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002152 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002153 'refs/changes/56/123456/1'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002154 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002155 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002156 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002157 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002158 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002159 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002160 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161 ]
2162 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002163 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002165 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2166 self._patch_common(
2167 default_codereview=None, # It doesn't matter what's default.
2168 actual_codereview='gerrit',
2169 git_short_host='else', detect_gerrit_server=False)
2170 self.calls += [
2171 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2172 'refs/changes/56/123456/1'],), ''),
2173 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2174 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2175 ''),
2176 ((['git', 'config', 'branch.master.gerritserver',
2177 'https://else-review.googlesource.com'],), ''),
2178 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2179 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2180 ]
2181 self.assertEqual(git_cl.main(
2182 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2183
2184 def test_patch_gerrit_conflict(self):
2185 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002186 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002187 self.calls += [
2188 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002189 'refs/changes/56/123456/7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002190 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2191 ''),
2192 ((['git', 'config', 'branch.master.gerritserver',
2193 'https://chromium-review.googlesource.com'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002194 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002195 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2196 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2197 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002198 ]
2199 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002200 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002202 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002203 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002204 raise git_cl.gerrit_util.GerritError(404, '')
2205 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2206
tandriic2405f52016-10-10 08:13:15 -07002207 self.calls = [
2208 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2209 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2210 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2211 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2212 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2213 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002214 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2215 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2216 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2217 ((['git', 'config', 'remote.origin.url'],),
2218 'https://chromium.googlesource.com/my/repo'),
2219 ((['DieWithError',
2220 'change 123456 at https://chromium-review.googlesource.com does not '
2221 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002222 ]
2223 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002224 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002225
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002226 def _checkout_calls(self):
2227 return [
2228 ((['git', 'config', '--local', '--get-regexp',
2229 'branch\\..*\\.rietveldissue'], ),
2230 ('branch.retrying.rietveldissue 1111111111\n'
2231 'branch.some-fix.rietveldissue 2222222222\n')),
2232 ((['git', 'config', '--local', '--get-regexp',
2233 'branch\\..*\\.gerritissue'], ),
2234 ('branch.ger-branch.gerritissue 123456\n'
2235 'branch.gbranch654.gerritissue 654321\n')),
2236 ]
2237
2238 def test_checkout_gerrit(self):
2239 """Tests git cl checkout <issue>."""
2240 self.calls = self._checkout_calls()
2241 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2242 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2243
2244 def test_checkout_rietveld(self):
2245 """Tests git cl checkout <issue>."""
2246 self.calls = self._checkout_calls()
2247 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2248 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2249
2250 def test_checkout_not_found(self):
2251 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002252 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002253 self.calls = self._checkout_calls()
2254 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2255
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002256 def test_checkout_no_branch_issues(self):
2257 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002258 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002259 self.calls = [
2260 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002261 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002262 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002263 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002264 ]
2265 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2266
tandrii@chromium.org28253532016-04-14 13:46:56 +00002267 def _test_gerrit_ensure_authenticated_common(self, auth,
2268 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002269 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2270 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2271 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002272 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002273 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002274 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002275 cl.branch = 'master'
2276 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002277 cl.lookedup_issue = True
2278 return cl
2279
2280 def test_gerrit_ensure_authenticated_missing(self):
2281 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002282 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002283 })
2284 self.calls.append(
2285 ((['DieWithError',
2286 'Credentials for the following hosts are required:\n'
2287 ' chromium-review.googlesource.com\n'
2288 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002289 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002290 'https://chromium-review.googlesource.com/new-password'],), ''),)
2291 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2292
2293 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002294 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002295 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002296 'chromium.googlesource.com':
2297 ('git-one.example.com', None, 'secret1'),
2298 'chromium-review.googlesource.com':
2299 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002300 })
2301 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002302 (('ask_for_data', 'If you know what you are doing '
2303 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002304 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2305
2306 def test_gerrit_ensure_authenticated_ok(self):
2307 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002308 'chromium.googlesource.com':
2309 ('git-same.example.com', None, 'secret'),
2310 'chromium-review.googlesource.com':
2311 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002312 })
2313 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2314
tandrii@chromium.org28253532016-04-14 13:46:56 +00002315 def test_gerrit_ensure_authenticated_skipped(self):
2316 cl = self._test_gerrit_ensure_authenticated_common(
2317 auth={}, skip_auth_check=True)
2318 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2319
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002320 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002321 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2322 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002323 self.calls = [
2324 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002325 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002326 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2327 ((['git', 'config', 'rietveld.server'],), ''),
2328 ((['git', 'config', 'rietveld.server'],), ''),
2329 ((['git', 'config', 'branch.feature.rietveldserver'],),
2330 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002331 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002332 ]
2333 self.assertEqual(0, git_cl.main(['set-commit']))
2334
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002335 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002336 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002337 lambda h, i, labels, notify=None:
2338 self._mocked_call(['SetReview', h, i, labels, notify]))
2339
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002340 self.calls = [
2341 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002342 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2343 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002344 ((['git', 'config', 'branch.feature.gerritserver'],),
2345 'https://chromium-review.googlesource.com'),
2346 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002347 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002348 ]
tandriid9e5ce52016-07-13 02:32:59 -07002349
2350 def test_cmd_set_commit_gerrit_clear(self):
2351 self._cmd_set_commit_gerrit_common(0)
2352 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2353
2354 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002355 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002356 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2357
tandriid9e5ce52016-07-13 02:32:59 -07002358 def test_cmd_set_commit_gerrit(self):
2359 self._cmd_set_commit_gerrit_common(2)
2360 self.assertEqual(0, git_cl.main(['set-commit']))
2361
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002362 def test_description_display(self):
2363 out = StringIO.StringIO()
2364 self.mock(git_cl.sys, 'stdout', out)
2365
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002366 self.mock(git_cl, 'Changelist', ChangelistMock)
2367 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002368
2369 self.assertEqual(0, git_cl.main(['description', '-d']))
2370 self.assertEqual('foo\n', out.getvalue())
2371
2372 def test_description_rietveld(self):
2373 out = StringIO.StringIO()
2374 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002375 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002376
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002377 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002378 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002379 self.assertEqual('foobar\n', out.getvalue())
2380
iannucci3c972b92016-08-17 13:24:10 -07002381 def test_StatusFieldOverrideIssueMissingArgs(self):
2382 out = StringIO.StringIO()
2383 self.mock(git_cl.sys, 'stderr', out)
2384
2385 try:
2386 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2387 except SystemExit as ex:
2388 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002389 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002390
2391 out = StringIO.StringIO()
2392 self.mock(git_cl.sys, 'stderr', out)
2393
2394 try:
2395 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2396 except SystemExit as ex:
2397 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002398 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002399
2400 def test_StatusFieldOverrideIssue(self):
2401 out = StringIO.StringIO()
2402 self.mock(git_cl.sys, 'stdout', out)
2403
2404 def assertIssue(cl_self, *_args):
2405 self.assertEquals(cl_self.issue, 1)
2406 return 'foobar'
2407
2408 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2409 self.calls = [
2410 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2411 ((['git', 'config', 'rietveld.server'],), ''),
2412 ((['git', 'config', 'rietveld.server'],), ''),
2413 ]
iannuccie53c9352016-08-17 14:40:40 -07002414 self.assertEqual(
2415 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2416 0)
iannucci3c972b92016-08-17 13:24:10 -07002417 self.assertEqual(out.getvalue(), 'foobar\n')
2418
iannuccie53c9352016-08-17 14:40:40 -07002419 def test_SetCloseOverrideIssue(self):
2420 def assertIssue(cl_self, *_args):
2421 self.assertEquals(cl_self.issue, 1)
2422 return 'foobar'
2423
2424 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2425 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2426 self.calls = [
2427 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2428 ((['git', 'config', 'rietveld.server'],), ''),
2429 ((['git', 'config', 'rietveld.server'],), ''),
2430 ]
2431 self.assertEqual(
2432 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2433
2434 def test_SetCommitOverrideIssue(self):
2435 def assertIssue(cl_self, *_args):
2436 self.assertEquals(cl_self.issue, 1)
2437 return 'foobar'
2438
2439 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2440 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2441 self.calls = [
2442 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2443 ((['git', 'config', 'rietveld.server'],), ''),
2444 ((['git', 'config', 'rietveld.server'],), ''),
2445 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2446 ((['git', 'config', 'rietveld.server'],), ''),
2447 ((['git', 'config', 'rietveld.server'],), ''),
2448 ]
2449 self.assertEqual(
2450 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2451
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002452 def test_description_gerrit(self):
2453 out = StringIO.StringIO()
2454 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002455 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002456 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002457 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2458 {
2459 'current_revision': 'sha1',
2460 'revisions': {'sha1': {
2461 'commit': {'message': 'foobar'},
2462 }},
2463 }),
2464 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002465 self.assertEqual(0, git_cl.main([
2466 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2467 self.assertEqual('foobar\n', out.getvalue())
2468
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002469 def test_description_set_raw(self):
2470 out = StringIO.StringIO()
2471 self.mock(git_cl.sys, 'stdout', out)
2472
2473 self.mock(git_cl, 'Changelist', ChangelistMock)
2474 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2475
2476 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2477 self.assertEqual('hihi', ChangelistMock.desc)
2478
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002479 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002480 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002481
2482 def RunEditor(desc, _, **kwargs):
2483 self.assertEquals(
2484 '# Enter a description of the change.\n'
2485 '# This will be displayed on the codereview site.\n'
2486 '# The first line will also be used as the subject of the review.\n'
2487 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002488 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002489 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002490 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002491 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002492 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002493
dsansomee2d6fd92016-09-08 00:10:47 -07002494 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002495 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002496
2497 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2498 self.mock(git_cl.Changelist, 'GetDescription',
2499 lambda *args: current_desc)
2500 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2501 UpdateDescriptionRemote)
2502 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2503
2504 self.calls = [
2505 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002506 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002507 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2508 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002509 ((['git', 'config', 'core.editor'],), 'vi'),
2510 ]
2511 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2512
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002513 def test_description_set_stdin(self):
2514 out = StringIO.StringIO()
2515 self.mock(git_cl.sys, 'stdout', out)
2516
2517 self.mock(git_cl, 'Changelist', ChangelistMock)
2518 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2519
2520 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2521 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2522
kmarshall3bff56b2016-06-06 18:31:47 -07002523 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002524 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2525
kmarshall3bff56b2016-06-06 18:31:47 -07002526 self.calls = \
2527 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2528 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002529 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002530 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2531 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002532 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2533 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2534 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002535 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2536 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2537 ((['git', 'branch', '-D', 'foo'],), '')]
2538
kmarshall3bff56b2016-06-06 18:31:47 -07002539 self.mock(git_cl, 'get_cl_statuses',
2540 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002541 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2542 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2543 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002544
2545 self.assertEqual(0, git_cl.main(['archive', '-f']))
2546
2547 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002548 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002549 self.calls = \
2550 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2551 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002552 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002553 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2554 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002555 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2556
kmarshall9249e012016-08-23 12:02:16 -07002557 self.mock(git_cl, 'get_cl_statuses',
2558 lambda branches, fine_grained, max_processes:
2559 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2560
2561 self.assertEqual(1, git_cl.main(['archive', '-f']))
2562
2563 def test_archive_dry_run(self):
2564 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2565
2566 self.calls = \
2567 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2568 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2569 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2570 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2571 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2572 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2573 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2574 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2575 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002576
2577 self.mock(git_cl, 'get_cl_statuses',
2578 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002579 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2580 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2581 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002582
kmarshall9249e012016-08-23 12:02:16 -07002583 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2584
2585 def test_archive_no_tags(self):
2586 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2587
2588 self.calls = \
2589 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2590 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2591 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2592 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2593 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2594 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2595 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2596 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2597 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2598 ((['git', 'branch', '-D', 'foo'],), '')]
2599
2600 self.mock(git_cl, 'get_cl_statuses',
2601 lambda branches, fine_grained, max_processes:
2602 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2603 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2604 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2605
2606 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002607
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002608 def test_cmd_issue_erase_existing(self):
2609 out = StringIO.StringIO()
2610 self.mock(git_cl.sys, 'stdout', out)
2611 self.calls = [
2612 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002613 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2614 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002615 # Let this command raise exception (retcode=1) - it should be ignored.
2616 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002617 CERR1),
2618 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2619 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002620 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2621 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2622 ''),
2623 ]
2624 self.assertEqual(0, git_cl.main(['issue', '0']))
2625
phajdan.jre328cf92016-08-22 04:12:17 -07002626 def test_cmd_issue_json(self):
2627 out = StringIO.StringIO()
2628 self.mock(git_cl.sys, 'stdout', out)
2629 self.calls = [
2630 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002631 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002632 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2633 ((['git', 'config', 'rietveld.server'],),
2634 'https://codereview.chromium.org'),
2635 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2636 (('write_json', 'output.json',
2637 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2638 ''),
2639 ]
2640 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2641
tandriide281ae2016-10-12 06:02:30 -07002642 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002643 self.mock(git_cl.Changelist, 'GetChange',
2644 lambda _, *a: (
2645 self._mocked_call(['GetChange']+list(a))))
2646 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2647 lambda *_, **__: (
2648 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002649 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2650 lambda _, s: self._mocked_call(['SetCQState', s]))
2651 self.calls = [
2652 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002653 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002654 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2655 ((['git', 'config', 'rietveld.server'],),
2656 'https://codereview.chromium.org'),
2657 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2658 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2659 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2660 ((['get_or_create_merge_base', 'feature', 'feature'],),
2661 'fake_ancestor_sha'),
2662 ((['GetChange', 'fake_ancestor_sha', None], ),
2663 git_cl.presubmit_support.GitChange(
2664 '', '', '', '', '', '', '', '')),
2665 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2666 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002667 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2668 ]
2669 out = StringIO.StringIO()
2670 self.mock(git_cl.sys, 'stdout', out)
2671 self.assertEqual(0, git_cl.main(['try']))
2672 self.assertEqual(
2673 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002674 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002675
tandrii8c5a3532016-11-04 07:52:02 -07002676 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2677 self.mock(git_cl.Changelist, 'GetChange',
2678 lambda _, *a: (
2679 self._mocked_call(['GetChange']+list(a))))
2680 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2681 lambda *_, **__: (
2682 self._mocked_call(['DoGetTryMasters'])))
2683 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2684 lambda _, s: self._mocked_call(['SetCQState', s]))
2685
tandrii8c5a3532016-11-04 07:52:02 -07002686 self.calls = [
2687 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2688 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2689 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2690 ((['git', 'config', 'branch.feature.gerritserver'],),
2691 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002692 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2693 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2694 'project': 'depot_tools',
2695 'status': 'OPEN',
2696 'owner': {'email': 'owner@e.mail'},
2697 'revisions': {
2698 'deadbeaf': {
2699 '_number': 6,
2700 },
2701 'beeeeeef': {
2702 '_number': 7,
2703 'fetch': {'http': {
2704 'url': 'https://chromium.googlesource.com/depot_tools',
2705 'ref': 'refs/changes/56/123456/7'
2706 }},
2707 },
2708 },
2709 }),
tandrii8c5a3532016-11-04 07:52:02 -07002710 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2711 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2712 ((['get_or_create_merge_base', 'feature', 'feature'],),
2713 'fake_ancestor_sha'),
2714 ((['GetChange', 'fake_ancestor_sha', None], ),
2715 git_cl.presubmit_support.GitChange(
2716 '', '', '', '', '', '', '', '')),
2717 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2718 ((['DoGetTryMasters'], ), None),
2719 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2720 ]
2721 out = StringIO.StringIO()
2722 self.mock(git_cl.sys, 'stdout', out)
2723 self.assertEqual(0, git_cl.main(['try']))
2724 self.assertEqual(
2725 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002726 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002727 'https://chromium-review.googlesource.com/123456\n')
2728
2729 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2730 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2731 lambda _: {
2732 'owner_email': 'owner@e.mail',
2733 'private': False,
2734 'closed': False,
2735 'project': 'depot_tools',
2736 'patchsets': [20001],
2737 })
tandriide281ae2016-10-12 06:02:30 -07002738 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2739 self.calls = [
2740 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2741 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2742 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2743 ((['git', 'config', 'rietveld.server'],),
2744 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002745 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002746 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002747 ]
2748
2749 def _buildbucket_retry(*_, **kw):
2750 # self.maxDiff = 10000
2751 body = json.loads(kw['body'])
2752 self.assertEqual(len(body['builds']), 1)
2753 build = body['builds'][0]
2754 params = json.loads(build.pop('parameters_json'))
2755 self.assertEqual(params, {
2756 u'builder_name': u'win',
2757 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2758 u'revision': None}],
2759 u'properties': {
2760 u'category': u'git_cl_try',
2761 u'issue': 123,
2762 u'key': u'val',
2763 u'json': [{u'a': 1}, None],
2764 u'master': u'tryserver.chromium',
2765 u'patch_project': u'depot_tools',
2766 u'patch_storage': u'rietveld',
2767 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002768 u'rietveld': u'https://codereview.chromium.org',
2769 }
2770 })
2771 self.assertEqual(build, {
2772 u'bucket': u'master.tryserver.chromium',
2773 u'client_operation_id': u'uuid4',
2774 u'tags': [u'builder:win',
2775 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002776 u'user_agent:git_cl_try',
2777 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002778 })
2779
2780 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2781
2782 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2783 self.assertEqual(0, git_cl.main([
2784 'try', '-m', 'tryserver.chromium', '-b', 'win',
2785 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2786 self.assertRegexpMatches(
2787 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002788 'Tried jobs on:\nBucket: master.tryserver.chromium')
2789
tandrii8c5a3532016-11-04 07:52:02 -07002790 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2791 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2792 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2793
tandrii8c5a3532016-11-04 07:52:02 -07002794 self.calls = [
2795 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2796 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2797 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2798 ((['git', 'config', 'branch.feature.gerritserver'],),
2799 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002800 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002801 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002802 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002803 'status': 'OPEN',
2804 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002805 'revisions': {
2806 'deadbeaf': {
2807 '_number': 6,
2808 },
2809 'beeeeeef': {
2810 '_number': 7,
2811 'fetch': {'http': {
2812 'url': 'https://chromium.googlesource.com/depot_tools',
2813 'ref': 'refs/changes/56/123456/7'
2814 }},
2815 },
2816 },
2817 }),
2818 ]
2819
2820 def _buildbucket_retry(*_, **kw):
2821 # self.maxDiff = 10000
2822 body = json.loads(kw['body'])
2823 self.assertEqual(len(body['builds']), 1)
2824 build = body['builds'][0]
2825 params = json.loads(build.pop('parameters_json'))
2826 self.assertEqual(params, {
2827 u'builder_name': u'win',
2828 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2829 u'revision': None}],
2830 u'properties': {
2831 u'category': u'git_cl_try',
2832 u'key': u'val',
2833 u'json': [{u'a': 1}, None],
2834 u'master': u'tryserver.chromium',
2835
2836 u'patch_gerrit_url':
2837 u'https://chromium-review.googlesource.com',
2838 u'patch_issue': 123456,
2839 u'patch_project': u'depot_tools',
2840 u'patch_ref': u'refs/changes/56/123456/7',
2841 u'patch_repository_url':
2842 u'https://chromium.googlesource.com/depot_tools',
2843 u'patch_set': 7,
2844 u'patch_storage': u'gerrit',
2845 }
2846 })
2847 self.assertEqual(build, {
2848 u'bucket': u'master.tryserver.chromium',
2849 u'client_operation_id': u'uuid4',
2850 u'tags': [
2851 u'builder:win',
2852 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2853 u'user_agent:git_cl_try',
2854 u'master:tryserver.chromium'],
2855 })
2856
2857 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2858
2859 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2860 self.assertEqual(0, git_cl.main([
2861 'try', '-m', 'tryserver.chromium', '-b', 'win',
2862 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2863 self.assertRegexpMatches(
2864 git_cl.sys.stdout.getvalue(),
2865 'Tried jobs on:\nBucket: master.tryserver.chromium')
2866
borenet6c0efe62016-10-19 08:13:29 -07002867 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002868 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2869 lambda _: {
2870 'owner_email': 'owner@e.mail',
2871 'private': False,
2872 'closed': False,
2873 'project': 'depot_tools',
2874 'patchsets': [20001],
2875 })
borenet6c0efe62016-10-19 08:13:29 -07002876 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2877 self.calls = [
2878 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2879 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2880 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2881 ((['git', 'config', 'rietveld.server'],),
2882 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002883 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002884 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002885 ]
2886
2887 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002888 body = json.loads(kw['body'])
2889 self.assertEqual(len(body['builds']), 1)
2890 build = body['builds'][0]
2891 params = json.loads(build.pop('parameters_json'))
2892 self.assertEqual(params, {
2893 u'builder_name': u'win',
2894 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2895 u'revision': None}],
2896 u'properties': {
2897 u'category': u'git_cl_try',
2898 u'issue': 123,
2899 u'patch_project': u'depot_tools',
2900 u'patch_storage': u'rietveld',
2901 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002902 u'rietveld': u'https://codereview.chromium.org',
2903 }
2904 })
2905 self.assertEqual(build, {
2906 u'bucket': u'test.bucket',
2907 u'client_operation_id': u'uuid4',
2908 u'tags': [u'builder:win',
2909 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2910 u'user_agent:git_cl_try'],
2911 })
2912
2913 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2914
2915 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2916 self.assertEqual(0, git_cl.main([
2917 'try', '-B', 'test.bucket', '-b', 'win']))
2918 self.assertRegexpMatches(
2919 git_cl.sys.stdout.getvalue(),
2920 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002921
qyearsley123a4682016-10-26 09:12:17 -07002922 def test_git_cl_try_bots_on_multiple_masters(self):
2923 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2924 self.calls = [
2925 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2926 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2927 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2928 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002929 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002930 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2931 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2932 ]
2933
2934 def _buildbucket_retry(*_, **kw):
2935 body = json.loads(kw['body'])
2936 self.assertEqual(len(body['builds']), 2)
2937
2938 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2939 self.assertEqual(first_build_params['builder_name'], 'builder1')
2940 self.assertEqual(first_build_params['properties']['master'], 'master1')
2941
2942 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2943 self.assertEqual(first_build_params['builder_name'], 'builder2')
2944 self.assertEqual(first_build_params['properties']['master'], 'master2')
2945
2946 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2947
2948 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2949 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2950
2951 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2952 self.assertEqual(
2953 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2954 self.assertEqual(
2955 git_cl.sys.stdout.getvalue(),
2956 'Tried jobs on:\n'
2957 'Bucket: master.master1\n'
2958 ' builder1: []\n'
2959 'Bucket: master.master2\n'
2960 ' builder2: []\n'
2961 'To see results here, run: git cl try-results\n'
2962 'To see results in browser, run: git cl web\n')
2963
tandrii16e0b4e2016-06-07 10:34:28 -07002964 def _common_GerritCommitMsgHookCheck(self):
2965 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2966 self.mock(git_cl.os.path, 'abspath',
2967 lambda path: self._mocked_call(['abspath', path]))
2968 self.mock(git_cl.os.path, 'exists',
2969 lambda path: self._mocked_call(['exists', path]))
2970 self.mock(git_cl.gclient_utils, 'FileRead',
2971 lambda path: self._mocked_call(['FileRead', path]))
2972 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2973 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2974 self.calls = [
2975 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2976 ((['abspath', '../'],), '/abs/git_repo_root'),
2977 ]
2978 return git_cl.Changelist(codereview='gerrit', issue=123)
2979
2980 def test_GerritCommitMsgHookCheck_custom_hook(self):
2981 cl = self._common_GerritCommitMsgHookCheck()
2982 self.calls += [
2983 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2984 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2985 '#!/bin/sh\necho "custom hook"')
2986 ]
2987 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2988
2989 def test_GerritCommitMsgHookCheck_not_exists(self):
2990 cl = self._common_GerritCommitMsgHookCheck()
2991 self.calls += [
2992 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2993 ]
2994 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2995
2996 def test_GerritCommitMsgHookCheck(self):
2997 cl = self._common_GerritCommitMsgHookCheck()
2998 self.calls += [
2999 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3000 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3001 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003002 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003003 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3004 ''),
3005 ]
3006 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3007
tandriic4344b52016-08-29 06:04:54 -07003008 def test_GerritCmdLand(self):
3009 self.calls += [
3010 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3011 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3012 'deadbeaf'),
3013 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3014 ((['git', 'config', 'branch.feature.gerritserver'],),
3015 'chromium-review.googlesource.com'),
3016 ]
3017 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3018 cl._codereview_impl._GetChangeDetail = lambda _: {
3019 'labels': {},
3020 'current_revision': 'deadbeaf',
3021 }
agable32978d92016-11-01 12:55:02 -07003022 cl._codereview_impl._GetChangeCommit = lambda: {
3023 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003024 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003025 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3026 }
tandriic4344b52016-08-29 06:04:54 -07003027 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003028 out = StringIO.StringIO()
3029 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003030 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003031 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003032 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003033
tandrii221ab252016-10-06 08:12:04 -07003034 BUILDBUCKET_BUILDS_MAP = {
3035 '9000': {
3036 'id': '9000',
3037 'status': 'STARTED',
3038 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3039 'result_details_json': '{"properties": {}}',
3040 'bucket': 'master.x.y',
3041 'created_by': 'user:someone@chromium.org',
3042 'created_ts': '147200002222000',
3043 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3044 },
3045 '8000': {
3046 'id': '8000',
3047 'status': 'COMPLETED',
3048 'result': 'FAILURE',
3049 'failure_reason': 'BUILD_FAILURE',
3050 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3051 'result_details_json': '{"properties": {}}',
3052 'bucket': 'master.x.y',
3053 'created_by': 'user:someone@chromium.org',
3054 'created_ts': '147200001111000',
3055 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3056 },
3057 }
3058
3059 def test_write_try_results_json(self):
3060 expected_output = [
3061 {
3062 'buildbucket_id': '8000',
3063 'bucket': 'master.x.y',
3064 'builder_name': 'my-builder',
3065 'status': 'COMPLETED',
3066 'result': 'FAILURE',
3067 'failure_reason': 'BUILD_FAILURE',
3068 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3069 },
3070 {
3071 'buildbucket_id': '9000',
3072 'bucket': 'master.x.y',
3073 'builder_name': 'my-builder',
3074 'status': 'STARTED',
3075 'result': None,
3076 'failure_reason': None,
3077 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3078 }
3079 ]
3080 self.calls = [(('write_json', 'output.json', expected_output), '')]
3081 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3082
tandrii45b2a582016-10-11 03:14:16 -07003083 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003084 out = StringIO.StringIO()
3085 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003086 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3087 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003088 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3089 self._mocked_call(['get_authenticator_for_host', host]))
3090 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3091 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003092
3093 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3094 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003095 self.calls += [
3096 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3097 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3098 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3099 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3100 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3101 ((['git', 'config', 'branch.feature.rietveldserver'],),
3102 'codereview.example.com'),
3103 ((['get_authenticator_for_host', 'codereview.example.com'],),
3104 AuthenticatorMock()),
3105 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3106
3107 def test_fetch_try_jobs_none_rietveld(self):
3108 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003109 # Simulate that user isn't logged in.
3110 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003111 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003112 self.assertRegexpMatches(sys.stdout.getvalue(),
3113 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003114 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3115
3116 def test_fetch_try_jobs_some_rietveld(self):
3117 self._setup_fetch_try_jobs_rietveld({
3118 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3119 })
3120 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003121 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3122 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3123 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3124
3125 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3126 self._setup_fetch_try_jobs(most_recent_patchset=13)
3127 self.calls += [
3128 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3129 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3130 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003131 # TODO(tandrii): Uncomment the below if we decide to support checking
3132 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003133 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003134 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003135 ((['git', 'config', 'branch.feature.gerritserver'],),
3136 'https://x-review.googlesource.com'),
3137 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3138 AuthenticatorMock()),
3139 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3140
3141 def test_fetch_try_jobs_none_gerrit(self):
3142 self._setup_fetch_try_jobs_gerrit({})
3143 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003144 # TODO(tandrii): Uncomment the below if we decide to support checking
3145 # patchsets for Gerrit.
3146 # self.assertRegexpMatches(
3147 # sys.stdout.getvalue(),
3148 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003149 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3150
3151 def test_fetch_try_jobs_some_gerrit(self):
3152 self._setup_fetch_try_jobs_gerrit({
3153 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3154 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003155 # TODO(tandrii): Uncomment the below if we decide to support checking
3156 # patchsets for Gerrit.
3157 # self.calls.remove(
3158 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003159 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3160
3161 # ... and doesn't result in warning.
3162 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3163 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003164 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3165 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3166
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003167 def _mock_gerrit_changes_for_detail_cache(self):
3168 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003169
3170 def test_gerrit_change_detail_cache_normalize(self):
3171 self._mock_gerrit_changes_for_detail_cache()
3172 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003173 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003174 ]
3175 cl = git_cl.Changelist(codereview='gerrit')
3176 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3177 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3178 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3179 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3180
3181 def test_gerrit_change_detail_cache_simple(self):
3182 self._mock_gerrit_changes_for_detail_cache()
3183 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003184 (('GetChangeDetail', 'host', '1', []), 'a'),
3185 (('GetChangeDetail', 'host', '2', []), 'b'),
3186 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003187 ]
3188 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3189 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3190 self.assertEqual(cl._GetChangeDetail(), 'a')
3191 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003192 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003193 self.assertEqual(cl._GetChangeDetail(), 'a')
3194 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3195
3196 def test_gerrit_change_detail_cache_options(self):
3197 self._mock_gerrit_changes_for_detail_cache()
3198 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003199 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3200 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3201 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3202 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003203 ]
3204 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3205 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3206 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3207 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3208 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3209 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3210 self.assertEqual(cl._GetChangeDetail(), 'cab')
3211
3212 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3213 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3214 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3215 self.assertEqual(cl._GetChangeDetail(), 'cab')
3216
3217 # Finally, no_cache should invalidate all caches for given change.
3218 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3219 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3220
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003221 def test_gerrit_description_caching(self):
3222 def gen_detail(rev, desc):
3223 return {
3224 'current_revision': rev,
3225 'revisions': {rev: {'commit': {'message': desc}}}
3226 }
3227 self.calls = [
3228 (('GetChangeDetail', 'host', '1',
3229 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3230 gen_detail('rev1', 'desc1')),
3231 (('GetChangeDetail', 'host', '1',
3232 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3233 gen_detail('rev2', 'desc2')),
3234 ]
3235
3236 self._mock_gerrit_changes_for_detail_cache()
3237 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3238 self.assertEqual(cl.GetDescription(), 'desc1')
3239 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3240 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003241
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003242 def test_print_current_creds(self):
3243 class CookiesAuthenticatorMock(object):
3244 def __init__(self):
3245 self.gitcookies = {
3246 'host.googlesource.com': ('user', 'pass'),
3247 'host-review.googlesource.com': ('user', 'pass'),
3248 }
3249 self.netrc = self
3250 self.netrc.hosts = {
3251 'github.com': ('user2', None, 'pass2'),
3252 'host2.googlesource.com': ('user3', None, 'pass'),
3253 }
3254 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3255 CookiesAuthenticatorMock)
3256 self.mock(sys, 'stdout', StringIO.StringIO())
3257 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3258 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3259 ' Host\t User\t Which file',
3260 '============================\t=====\t===========',
3261 'host-review.googlesource.com\t user\t.gitcookies',
3262 ' host.googlesource.com\t user\t.gitcookies',
3263 ' host2.googlesource.com\tuser3\t .netrc',
3264 ])
3265 sys.stdout.buf = ''
3266 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3267 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3268 ' Host\tUser\t Which file',
3269 '============================\t====\t===========',
3270 'host-review.googlesource.com\tuser\t.gitcookies',
3271 ' host.googlesource.com\tuser\t.gitcookies',
3272 ])
3273
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003274 def _common_creds_check_mocks(self):
3275 def exists_mock(path):
3276 dirname = os.path.dirname(path)
3277 if dirname == os.path.expanduser('~'):
3278 dirname = '~'
3279 base = os.path.basename(path)
3280 if base in ('.netrc', '.gitcookies'):
3281 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3282 # git cl also checks for existence other files not relevant to this test.
3283 return None
3284 self.mock(os.path, 'exists', exists_mock)
3285 self.mock(sys, 'stdout', StringIO.StringIO())
3286
3287 def test_creds_check_gitcookies_not_configured(self):
3288 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003289 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003290 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003291 self.calls = [
3292 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3293 (('os.path.exists', '~/.netrc'), True),
3294 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3295 'or Ctrl+C to abort'), ''),
3296 ((['git', 'config', '--global', 'http.cookiefile',
3297 os.path.expanduser('~/.gitcookies')], ), ''),
3298 ]
3299 self.assertEqual(0, git_cl.main(['creds-check']))
3300 self.assertRegexpMatches(
3301 sys.stdout.getvalue(),
3302 '^You seem to be using outdated .netrc for git credentials:')
3303 self.assertRegexpMatches(
3304 sys.stdout.getvalue(),
3305 '\nConfigured git to use .gitcookies from')
3306
3307 def test_creds_check_gitcookies_configured_custom_broken(self):
3308 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003309 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003310 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003311 self.calls = [
3312 ((['git', 'config', '--global', 'http.cookiefile'],),
3313 '/custom/.gitcookies'),
3314 (('os.path.exists', '/custom/.gitcookies'), False),
3315 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3316 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3317 ((['git', 'config', '--global', 'http.cookiefile',
3318 os.path.expanduser('~/.gitcookies')], ), ''),
3319 ]
3320 self.assertEqual(0, git_cl.main(['creds-check']))
3321 self.assertRegexpMatches(
3322 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003323 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003324 self.assertRegexpMatches(
3325 sys.stdout.getvalue(),
3326 'However, your configured .gitcookies file is missing.')
3327
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003328 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003329 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3330 lambda _, message: self._mocked_call('AddComment', message))
3331 self.calls = [
3332 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3333 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3334 (('AddComment', 'msg'), ''),
3335 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003336 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3337 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003338
3339 def test_git_cl_comment_add_gerrit(self):
3340 self.mock(git_cl.gerrit_util, 'SetReview',
3341 lambda host, change, msg:
3342 self._mocked_call('SetReview', host, change, msg))
3343 self.calls = [
3344 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3345 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3346 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3347 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3348 'origin/master'),
3349 ((['git', 'config', 'remote.origin.url'],),
3350 'https://chromium.googlesource.com/infra/infra'),
3351 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3352 ]
3353 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3354 '-a', 'msg']))
3355
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003356 def test_git_cl_comments_fetch_rietveld(self):
3357 self.mock(sys, 'stdout', StringIO.StringIO())
3358 self.calls = [
3359 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3360 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3361 ] * 2
3362 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3363 'messages': [
3364 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3365 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3366 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3367 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3368 # Intentionally wrong order here.
3369 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3370 'disapproval': False, 'approval': False,
3371 'sender': 'owner@example.com'},
3372 ],
3373 'owner_email': 'owner@example.com',
3374 })
3375 expected_comments_summary = [
3376 git_cl._CommentSummary(
3377 message='lgtm',
3378 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3379 disapproval=False, approval=True, sender='r@example.com'),
3380 git_cl._CommentSummary(
3381 message='not lgtm',
3382 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3383 disapproval=True, approval=False, sender='r2@example.com'),
3384 # Note: same order as in whatever Rietveld returns.
3385 git_cl._CommentSummary(
3386 message='PTAL',
3387 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3388 disapproval=False, approval=False, sender='owner@example.com'),
3389 ]
3390 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3391 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3392
3393 with git_cl.gclient_utils.temporary_directory() as tempdir:
3394 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3395 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3396 '-j', out_file]))
3397 with open(out_file) as f:
3398 read = json.load(f)
3399 self.assertEqual(len(read), 3)
3400 self.assertEqual(read[0], {
3401 'date': '2000-03-13 20:49:34.515270',
3402 'message': 'PTAL',
3403 'approval': False,
3404 'disapproval': False,
3405 'sender': 'owner@example.com'})
3406 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3407 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3408
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003409 def test_git_cl_comments_fetch_gerrit(self):
3410 self.mock(sys, 'stdout', StringIO.StringIO())
3411 self.calls = [
3412 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3413 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3414 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3415 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3416 'origin/master'),
3417 ((['git', 'config', 'remote.origin.url'],),
3418 'https://chromium.googlesource.com/infra/infra'),
3419 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3420 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3421 'owner': {'email': 'owner@example.com'},
3422 'messages': [
3423 {
3424 u'_revision_number': 1,
3425 u'author': {
3426 u'_account_id': 1111084,
3427 u'email': u'commit-bot@chromium.org',
3428 u'name': u'Commit Bot'
3429 },
3430 u'date': u'2017-03-15 20:08:45.000000000',
3431 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3432 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3433 u'tag': u'autogenerated:cq:dry-run'
3434 },
3435 {
3436 u'_revision_number': 2,
3437 u'author': {
3438 u'_account_id': 11151243,
3439 u'email': u'owner@example.com',
3440 u'name': u'owner'
3441 },
3442 u'date': u'2017-03-16 20:00:41.000000000',
3443 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3444 u'message': u'PTAL',
3445 },
3446 {
3447 u'_revision_number': 2,
3448 u'author': {
3449 u'_account_id': 148512 ,
3450 u'email': u'reviewer@example.com',
3451 u'name': u'reviewer'
3452 },
3453 u'date': u'2017-03-17 05:19:37.500000000',
3454 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3455 u'message': u'Patch Set 2: Code-Review+1',
3456 },
3457 ]
3458 })
3459 ] * 2
3460 expected_comments_summary = [
3461 git_cl._CommentSummary(
3462 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3463 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3464 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3465 git_cl._CommentSummary(
3466 message=u'PTAL',
3467 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3468 disapproval=False, approval=False, sender=u'owner@example.com'),
3469 git_cl._CommentSummary(
3470 message=u'Patch Set 2: Code-Review+1',
3471 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3472 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3473 ]
3474 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3475 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3476
3477 with git_cl.gclient_utils.temporary_directory() as tempdir:
3478 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3479 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3480 '-j', out_file]))
3481 with open(out_file) as f:
3482 read = json.load(f)
3483 self.assertEqual(len(read), 3)
3484 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3485 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3486 self.assertEqual(read[2], {
3487 u'date': u'2017-03-17 05:19:37.500000',
3488 u'message': u'Patch Set 2: Code-Review+1',
3489 u'approval': False,
3490 u'disapproval': False,
3491 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003492
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003493
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003494if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003495 logging.basicConfig(
3496 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003497 unittest.main()