blob: a1a19520c9a7fc626c3530f9b8766fbbb1b2169f [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',
597 lambda h, i, add, is_reviewer, notify: self._mocked_call(
598 'AddReviewers', h, i, add, is_reviewer, 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'])
tandriic2405f52016-10-10 08:13:15 -0700985 self.assertEqual(
986 'Using 50% similarity for rename/copy detection. Override with '
987 '--similarity.\n',
988 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000989
tandriif9aefb72016-07-01 09:06:51 -0700990 def test_bug_on_cmd(self):
991 self._run_reviewer_test(
992 ['--bug=500658,proj:123'],
993 'desc\n\nBUG=500658\nBUG=proj:123',
994 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
995 'desc\n\nBUG=500658\nBUG=proj:1234',
996 [])
997
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100998 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
999 parent_msg=None,
1000 new_msg=None,
1001 fail_after_parent_msg=False,
1002 fail_cherry_pick=False,
1003 fail_push_count=0,
1004 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001005 if debug:
1006 # Very useful due to finally clause in git cl land raising exceptions and
1007 # shadowing real cause of failure.
1008 self.mock(git_cl, '_IS_BEING_TESTED', True)
1009 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001010 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001011
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001012 if git_numberer_enabled:
1013 # Special mocks to check validity of timestamp.
1014 original_git_amend_head = git_cl._git_amend_head
1015 def _git_amend_head_mock(msg, tstamp):
1016 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1017 return original_git_amend_head(msg, tstamp)
1018 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1019
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001020 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1021 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001022 self.mock(RietveldMock, 'update_description', staticmethod(
1023 lambda i, d: self._mocked_call(['update_description', i, d])))
1024 self.mock(RietveldMock, 'add_comment', staticmethod(
1025 lambda i, c: self._mocked_call(['add_comment', i, c])))
1026 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001027 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1028 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1029 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1030 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1031 CERR1),
1032 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1033 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001034 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001035 ((['git', 'config', 'rietveld.server'],),
1036 'https://codereview.chromium.org'),
1037 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1038 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1039 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1040 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001041 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1042 ''), # No commits to rebase, according to local view of origin.
1043 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1044 'fake_ancestor_sha'),
1045 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1046 ((['git', 'rev-parse', '--show-cdup'],), ''),
1047 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1048 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1049 'fake_ancestor_sha...', '.'],),
1050 'M\tfile1.cpp'),
1051 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1052 ((['git', 'config', 'branch.feature.rietveldserver'],),
1053 'https://codereview.chromium.org'),
1054 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1055 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1056 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1057 'fake_ancestor_sha', 'feature'],),
1058 # This command just prints smth like this:
1059 # file1.cpp | 53 ++++++--
1060 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1061 ''),
1062 ((['git', 'show-ref', '--quiet', '--verify',
1063 'refs/heads/git-cl-commit'],),
1064 ''), # 0 return code means branch exists.
1065 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1066 ((['git', 'show-ref', '--quiet', '--verify',
1067 'refs/heads/git-cl-cherry-pick'],),
1068 CERR1), # This means git-cl-cherry-pick branch does not exist.
1069 ((['git', 'rev-parse', '--show-cdup'],), ''),
1070 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1071 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1072 ((['git', 'commit', '-m',
1073 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001074 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001075 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1076 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1077 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001078 repo_url),
1079
1080 ((['git', 'config', 'remote.origin.url'],), repo_url),
1081 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1082 git_numberer_enabled),
1083
1084 # Auto-rebase init.
1085 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1086 ]
1087 # Auto-rebase loops.
1088 for attempt in xrange(fail_push_count + 1):
1089 self.calls += [
1090 # Auto-rebase loop start.
1091 ((['git', 'retry', 'fetch', 'origin',
1092 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1093 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1094 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1095 # different in each loop iteration for truly realistic test.
1096 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1097 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1098 callError(1, 'failed to cherry pick') if fail_cherry_pick
1099 else ''),
1100 ]
1101 if fail_cherry_pick:
1102 return
1103
1104 if git_numberer_enabled:
1105 assert parent_msg
1106 self.calls += [
1107 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1108 parent_msg),
1109 ]
1110 if fail_after_parent_msg:
1111 return
1112 assert new_msg
1113 self.calls += [
1114 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1115 '1480022355'), # Committer's unix timestamp.
1116 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1117 '1480024000'),
1118 ((['git_amend_head committer timestamp', 1480024000],), ''),
1119 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1120 ]
1121 self.calls += [
1122 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1123 CERR1 if attempt < fail_push_count else ''),
1124 ]
1125 # End of autorebase + push.
1126
1127 self.calls += [
1128 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1129 ]
1130 if git_numberer_enabled:
1131 self.calls += [
1132 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1133 ]
1134
1135 # Cleanup calls.
1136 self.calls += [
1137 ((['git', 'checkout', '-q', 'feature'],), ''),
1138 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1139 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001140 ]
1141
1142 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001143 self._land_rietveld_calls(
1144 repo_url='https://chromium.googlesource.com/infra/infra',
1145 git_numberer_enabled=False,
1146 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001147 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001148 ((['git', 'config', 'rietveld.viewvc-url'],),
1149 'https://chromium.googlesource.com/infra/infra/+/'),
1150 ((['update_description', 123,
1151 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001152 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001153 ''),
1154 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001155 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001156 ]
1157 git_cl.main(['land'])
1158
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001159 def test_land_rietveld_fail_cherry_pick(self):
1160 self._land_rietveld_calls(
1161 repo_url='https://chromium.googlesource.com/infra/infra',
1162 git_numberer_enabled=False,
1163 fail_cherry_pick=True,
1164 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001165 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001166 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1167 'U path/file1\n'
1168 'U file2.cpp\n'),
1169 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001170 ((['git', 'checkout', '-q', 'feature'],), ''),
1171 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001172 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1173 ]
1174 git_cl.main(['land'])
1175
1176 def test_land_rietveld_git_numberer_fail_1_push(self):
1177 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1178
1179 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1180 self._land_rietveld_calls(
1181 repo_url='https://chromium.googlesource.com/chromium/src',
1182 git_numberer_enabled=True,
1183 parent_msg=('This is parent commit.\n'
1184 '\n'
1185 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1186 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1187 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1188 '\n'
1189 'Review-Url: https://codereview.chromium.org/123 .\n'
1190 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1191 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1192 fail_push_count=fail_push_count,
1193 debug=False)
1194
1195 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001196 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001197 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001198 ((['update_description', 123,
1199 'Issue: 123\n\nR=john@chromium.org\n'
1200 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001201 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001202 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1203 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1204 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001205 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001206 ''),
1207 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001208 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001209 ]
1210 git_cl.main(['land'])
1211
1212 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001213 self._land_rietveld_calls(
1214 repo_url='https://chromium.googlesource.com/v8/v8',
1215 git_numberer_enabled=True,
1216 parent_msg='This is parent commit with no footer.',
1217 fail_after_parent_msg=True,
1218 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001219 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001220 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001221 ((['git', 'checkout', '-q', 'feature'],), ''),
1222 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001223 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001224 ]
1225 with self.assertRaises(ValueError) as cm:
1226 git_cl.main(['land'])
1227 self.assertEqual(cm.exception.message,
1228 'Unable to infer commit position from footers')
1229
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001230 def test_git_numberer_not_whitelisted_repo(self):
1231 self.calls = []
1232 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001233 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1234 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001235 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001236
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001237 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001238 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1239 self.calls = [
1240 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001241 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001242 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001243 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001244 remote_url='https://chromium.googlesource.com/chromium/src',
1245 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001246 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001247
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001248 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001249 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001250 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001251 def fake_temporary_directory(**kwargs):
1252 yield tempdir
1253 self.mock(git_cl.gclient_utils, 'temporary_directory',
1254 fake_temporary_directory)
1255 self._test_GitNumbererState_valid_configs_inner(tempdir)
1256
1257 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001258 self.calls = [
1259 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001260 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001261 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1262 '''
1263 [plugin "git-numberer"]
1264 validate-enabled-refglob = refs/else/*
1265 validate-enabled-refglob = refs/heads/*
1266 validate-disabled-refglob = refs/heads/disabled
1267 validate-disabled-refglob = refs/branch-heads/*
1268 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001269 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1270 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001271 'refs/else/*\n'
1272 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001273 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1274 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001275 'refs/heads/disabled\n'
1276 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001277 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001278
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001279 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001280 remote_url='https://chromium.googlesource.com/chromium/src',
1281 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001282 self.assertEqual(res, True)
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/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001287 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001288
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001289 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001290 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001291 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001292 remote_url='https://chromium.googlesource.com/chromium/src',
1293 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001294 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001295
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001296 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001297 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001298 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001299 if skip_auth_check:
1300 return [((cmd, ), 'true')]
1301
tandrii5d48c322016-08-18 16:19:37 -07001302 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001303 if issue:
1304 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001305 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001306 ])
1307 calls.extend([
1308 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1309 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1310 ((['git', 'config', 'remote.origin.url'],),
1311 'https://chromium.googlesource.com/my/repo'),
1312 ((['git', 'config', 'remote.origin.url'],),
1313 'https://chromium.googlesource.com/my/repo'),
1314 ])
1315 return calls
1316
1317 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001318 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001319 fetched_status=None, other_cl_owner=None,
1320 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001321 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001322 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1323 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1324 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1325 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001326 ]
1327 calls += cls._is_gerrit_calls(True)
1328 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001329 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1330 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1331 ((['git', 'config', 'branch.master.gerritissue'],),
1332 CERR1 if issue is None else str(issue)),
1333 ]
1334
1335 if custom_cl_base:
1336 ancestor_revision = custom_cl_base
1337 else:
1338 # Determine ancestor_revision to be merge base.
1339 ancestor_revision = 'fake_ancestor_sha'
1340 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001341 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001342 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001343 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001344 'refs/remotes/origin/master'],), ancestor_revision),
1345 ]
1346
1347 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001348 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1349
1350 if issue:
1351 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001352 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001353 '123456',
1354 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001355 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001356 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001357 'change_id': '123456789',
1358 'current_revision': 'sha1_of_current_revision',
1359 'revisions': { 'sha1_of_current_revision': {
1360 'commit': {'message': fetched_description},
1361 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001362 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001363 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001364 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001365 if fetched_status == 'ABANDONED':
1366 calls += [
1367 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1368 '123456 has been abandoned, new uploads are not '
1369 'allowed'), SystemExitMock()),
1370 ]
1371 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001372 if other_cl_owner:
1373 calls += [
1374 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1375 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001376
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001377 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1378 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001379 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001380 ((['git', 'rev-parse', '--show-cdup'],), ''),
1381 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001382
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001383 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1384 ancestor_revision + '...', '.'],),
1385 'M\t.gitignore\n'),
1386 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001387 ]
1388
1389 if not issue:
1390 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001391 ((['git', 'log', '--pretty=format:%s%n%n%b',
1392 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001393 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001394 ]
1395
1396 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001397 ((['git', 'config', 'user.email'],), 'me@example.com'),
1398 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1399 ([custom_cl_base] if custom_cl_base else
1400 [ancestor_revision, 'HEAD']),),
1401 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001402 ]
1403 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001404
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001405 @classmethod
1406 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001407 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001408 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001409 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001410 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001411 git_mirror=None,
1412 custom_cl_base=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001413 if post_amend_description is None:
1414 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001415 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001416 # Determined in `_gerrit_base_calls`.
1417 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1418
1419 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001420
tandriia60502f2016-06-20 02:01:53 -07001421 if squash_mode == 'default':
1422 calls.extend([
1423 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1424 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1425 ])
1426 elif squash_mode in ('override_squash', 'override_nosquash'):
1427 calls.extend([
1428 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1429 'true' if squash_mode == 'override_squash' else 'false'),
1430 ])
1431 else:
1432 assert squash_mode in ('squash', 'nosquash')
1433
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001434 # If issue is given, then description is fetched from Gerrit instead.
1435 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001436 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001437 ((['git', 'log', '--pretty=format:%s\n\n%b',
1438 ((custom_cl_base + '..') if custom_cl_base else
1439 'fake_ancestor_sha..HEAD')],),
1440 description),
1441 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001442 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001443 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001444 else:
1445 if not title:
1446 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001447 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1448 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001449 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001450 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001451 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001452 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001453 (('DownloadGerritHook', False), ''),
1454 # Amending of commit message to get the Change-Id.
1455 ((['git', 'log', '--pretty=format:%s\n\n%b',
1456 determined_ancestor_revision + '..HEAD'],),
1457 description),
1458 ((['git', 'commit', '--amend', '-m', description],), ''),
1459 ((['git', 'log', '--pretty=format:%s\n\n%b',
1460 determined_ancestor_revision + '..HEAD'],),
1461 post_amend_description)
1462 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001463 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001464 if not issue:
1465 # Prompting to edit description on first upload.
1466 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001467 ((['git', 'config', 'core.editor'],), ''),
1468 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001469 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001470 ref_to_push = 'abcdef0123456789'
1471 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001472 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1473 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1474 ]
1475
1476 if custom_cl_base is None:
1477 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001478 ((['get_or_create_merge_base', 'master',
1479 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001480 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001481 ]
1482 parent = 'origin/master'
1483 else:
1484 calls += [
1485 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1486 'refs/remotes/origin/master'],),
1487 callError(1)), # Means not ancenstor.
1488 (('ask_for_data',
1489 'Do you take responsibility for cleaning up potential mess '
1490 'resulting from proceeding with upload? Press Enter to upload, '
1491 'or Ctrl+C to abort'), ''),
1492 ]
1493 parent = custom_cl_base
1494
1495 calls += [
1496 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1497 '0123456789abcdef'),
1498 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1499 '-m', description],),
1500 ref_to_push),
1501 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001502 else:
1503 ref_to_push = 'HEAD'
1504
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001505 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001506 ((['git', 'rev-list',
1507 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1508 ref_to_push],),
1509 '1hashPerLine\n'),
1510 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001511
Aaron Gable9b713dd2016-12-14 16:04:21 -08001512 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001513 if ref_suffix:
1514 ref_suffix += ',m=' + title
1515 else:
1516 ref_suffix = '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001517
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001518 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1519 if ref_suffix:
1520 ref_suffix += ',' + notify_suffix
1521 else:
1522 ref_suffix = '%' + notify_suffix
1523
1524 if reviewers:
1525 ref_suffix += ',' + ','.join('r=%s' % email
1526 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001527
1528 if git_mirror is None:
1529 calls += [
1530 ((['git', 'config', 'remote.origin.url'],),
1531 'https://chromium.googlesource.com/yyy/zzz'),
1532 ]
1533 else:
1534 calls += [
1535 ((['git', 'config', 'remote.origin.url'],),
1536 '/cache/this-dir-exists'),
1537 (('os.path.isdir', '/cache/this-dir-exists'),
1538 True),
1539 # Runs in /cache/this-dir-exists.
1540 ((['git', 'config', 'remote.origin.url'],),
1541 'https://chromium.googlesource.com/yyy/zzz'),
1542 ]
1543
ukai@chromium.orge8077812012-02-03 03:41:46 +00001544 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001545 ((['git', 'push',
1546 'https://chromium.googlesource.com/yyy/zzz',
1547 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001548 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001549 'remote: Processing changes: (\)\n'
1550 'remote: Processing changes: (|)\n'
1551 'remote: Processing changes: (/)\n'
1552 'remote: Processing changes: (-)\n'
1553 'remote: Processing changes: new: 1 (/)\n'
1554 'remote: Processing changes: new: 1, done\n'
1555 'remote:\n'
1556 'remote: New Changes:\n'
1557 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1558 'remote:\n'
1559 'To https://chromium.googlesource.com/yyy/zzz\n'
1560 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001561 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001562 if squash:
1563 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001564 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001565 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001566 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001567 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001568 ((['git', 'config', 'branch.master.gerritsquashhash',
1569 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001570 ]
tandrii88189772016-09-29 04:29:57 -07001571 calls += [
1572 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001573 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001574 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001575 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001576 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001577 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001578 return calls
1579
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001580 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001581 self,
1582 upload_args,
1583 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001584 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001585 squash=True,
1586 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001587 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001588 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001589 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001590 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001591 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001592 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001593 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001594 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001595 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001596 other_cl_owner=None,
1597 custom_cl_base=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001598 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001599 if squash_mode is None:
1600 if '--no-squash' in upload_args:
1601 squash_mode = 'nosquash'
1602 elif '--squash' in upload_args:
1603 squash_mode = 'squash'
1604 else:
1605 squash_mode = 'default'
1606
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001607 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001608 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001609 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001610 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001611 CookiesAuthenticatorMockFactory(
1612 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001613 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1614 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001615 self.mock(git_cl.gclient_utils, 'RunEditor',
1616 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001617 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1618 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001619
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001620 original_os_path_isdir = os.path.isdir
1621 def selective_os_path_isdir_mock(path):
1622 if path == '/cache/this-dir-exists':
1623 return self._mocked_call('os.path.isdir', path)
1624 return original_os_path_isdir(path)
1625 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1626
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001627 self.calls = self._gerrit_base_calls(
1628 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001629 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001630 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001631 other_cl_owner=other_cl_owner,
1632 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001633 if fetched_status != 'ABANDONED':
1634 self.calls += self._gerrit_upload_calls(
1635 description, reviewers, squash,
1636 squash_mode=squash_mode,
1637 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001638 ref_suffix=ref_suffix, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001639 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001640 issue=issue, cc=cc, git_mirror=git_mirror,
1641 custom_cl_base=custom_cl_base)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001642 # Uncomment when debugging.
1643 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001644 git_cl.main(['upload'] + upload_args)
1645
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001646 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001647 self._run_gerrit_upload_test(
1648 ['--no-squash'],
1649 'desc\n\nBUG=\n',
1650 [],
1651 squash=False,
1652 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1653
1654 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001655 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001656 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001657 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001658 [],
tandriia60502f2016-06-20 02:01:53 -07001659 squash=False,
1660 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001661 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001662
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001663 def test_gerrit_no_reviewer(self):
1664 self._run_gerrit_upload_test(
1665 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001666 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001667 [],
1668 squash=False,
1669 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001670
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001671 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001672 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1673 self._run_gerrit_upload_test(
1674 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1675 'desc\n\nBUG=\n\nChange-Id: I123456789',
1676 squash=False,
1677 squash_mode='override_nosquash',
1678 title='Dont_put_bad_chars')
1679 self.assertIn(
1680 'WARNING: Patchset title may only contain alphanumeric chars '
1681 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1682 'Cleaned up title: Dont put bad chars\n',
1683 git_cl.sys.stdout.getvalue())
1684
ukai@chromium.orge8077812012-02-03 03:41:46 +00001685 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001686 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001687 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001688 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001689 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001690 squash=False,
1691 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001692 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001693
1694 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001695 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001696 [],
bradnelsond975b302016-10-23 12:20:23 -07001697 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1698 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001699 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001700 ['reviewer@example.com', 'another@example.com'],
1701 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001702 squash_mode='override_nosquash',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001703 ref_suffix='%l=Code-Review+1',
bradnelsond975b302016-10-23 12:20:23 -07001704 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001705
1706 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001707 self._run_gerrit_upload_test(
1708 [],
1709 'desc\nBUG=\n\nChange-Id: 123456789',
1710 [],
1711 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001712
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001713 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001714 self._run_gerrit_upload_test(
1715 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001716 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001717 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001718 squash=True,
1719 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001720
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001721 def test_gerrit_upload_squash_first_against_rev(self):
1722 custom_cl_base = 'custom_cl_base_rev_or_branch'
1723 self._run_gerrit_upload_test(
1724 ['--squash', custom_cl_base],
1725 'desc\nBUG=\n\nChange-Id: 123456789',
1726 [],
1727 squash=True,
1728 expected_upstream_ref='origin/master',
1729 custom_cl_base=custom_cl_base)
1730 self.assertIn(
1731 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1732 sys.stdout.getvalue())
1733
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001734 def test_gerrit_upload_squash_first_with_mirror(self):
1735 self._run_gerrit_upload_test(
1736 ['--squash'],
1737 'desc\nBUG=\n\nChange-Id: 123456789',
1738 [],
1739 squash=True,
1740 expected_upstream_ref='origin/master',
1741 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1742
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001743 def test_gerrit_upload_squash_reupload(self):
1744 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001745 self._run_gerrit_upload_test(
1746 ['--squash'],
1747 description,
1748 [],
1749 squash=True,
1750 expected_upstream_ref='origin/master',
1751 issue=123456)
1752
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001753 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1754 self.mock(git_cl, 'DieWithError',
1755 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1756 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1757 with self.assertRaises(SystemExitMock):
1758 self._run_gerrit_upload_test(
1759 ['--squash'],
1760 description,
1761 [],
1762 squash=True,
1763 expected_upstream_ref='origin/master',
1764 issue=123456,
1765 fetched_status='ABANDONED')
1766
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001767 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1768 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1769 lambda *_, **__: {'email': 'yet-another@example.com'})
1770 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1771 self._run_gerrit_upload_test(
1772 ['--squash'],
1773 description,
1774 [],
1775 squash=True,
1776 expected_upstream_ref='origin/master',
1777 issue=123456,
1778 other_cl_owner='other@example.com')
1779 self.assertIn(
1780 'WARNING: change 123456 is owned by other@example.com, but you '
1781 'authenticate to Gerrit as yet-another@example.com.\n'
1782 'Uploading may fail due to lack of permissions',
1783 git_cl.sys.stdout.getvalue())
1784
rmistry@google.com2dd99862015-06-22 12:22:18 +00001785 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001786 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001787 def mock_run_git(*args, **_kwargs):
1788 if args[0] == ['for-each-ref',
1789 '--format=%(refname:short) %(upstream:short)',
1790 'refs/heads']:
1791 # Create a local branch dependency tree that looks like this:
1792 # test1 -> test2 -> test3 -> test4 -> test5
1793 # -> test3.1
1794 # test6 -> test0
1795 branch_deps = [
1796 'test2 test1', # test1 -> test2
1797 'test3 test2', # test2 -> test3
1798 'test3.1 test2', # test2 -> test3.1
1799 'test4 test3', # test3 -> test4
1800 'test5 test4', # test4 -> test5
1801 'test6 test0', # test0 -> test6
1802 'test7', # test7
1803 ]
1804 return '\n'.join(branch_deps)
1805 self.mock(git_cl, 'RunGit', mock_run_git)
1806
1807 class RecordCalls:
1808 times_called = 0
1809 record_calls = RecordCalls()
1810 def mock_CMDupload(*args, **_kwargs):
1811 record_calls.times_called += 1
1812 return 0
1813 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1814
1815 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001816 (('ask_for_data', 'This command will checkout all dependent branches '
1817 'and run "git cl upload". Press Enter to continue, '
1818 'or Ctrl+C to abort'), ''),
1819 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001820
1821 class MockChangelist():
1822 def __init__(self):
1823 pass
1824 def GetBranch(self):
1825 return 'test1'
1826 def GetIssue(self):
1827 return '123'
1828 def GetPatchset(self):
1829 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001830 def IsGerrit(self):
1831 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001832
1833 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1834 # CMDupload should have been called 5 times because of 5 dependent branches.
1835 self.assertEquals(5, record_calls.times_called)
1836 self.assertEquals(0, ret)
1837
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001838 def test_gerrit_change_id(self):
1839 self.calls = [
1840 ((['git', 'write-tree'], ),
1841 'hashtree'),
1842 ((['git', 'rev-parse', 'HEAD~0'], ),
1843 'branch-parent'),
1844 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1845 'A B <a@b.org> 1456848326 +0100'),
1846 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1847 'C D <c@d.org> 1456858326 +0100'),
1848 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1849 'hashchange'),
1850 ]
1851 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1852 self.assertEqual(change_id, 'Ihashchange')
1853
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001854 def test_desecription_append_footer(self):
1855 for init_desc, footer_line, expected_desc in [
1856 # Use unique desc first lines for easy test failure identification.
1857 ('foo', 'R=one', 'foo\n\nR=one'),
1858 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1859 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1860 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1861 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1862 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1863 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1864 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1865 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1866 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1867 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1868 ]:
1869 desc = git_cl.ChangeDescription(init_desc)
1870 desc.append_footer(footer_line)
1871 self.assertEqual(desc.description, expected_desc)
1872
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001873 def test_update_reviewers(self):
1874 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001875 ('foo', [], [],
1876 'foo'),
1877 ('foo\nR=xx', [], [],
1878 'foo\nR=xx'),
1879 ('foo\nTBR=xx', [], [],
1880 'foo\nTBR=xx'),
1881 ('foo', ['a@c'], [],
1882 'foo\n\nR=a@c'),
1883 ('foo\nR=xx', ['a@c'], [],
1884 'foo\n\nR=a@c, xx'),
1885 ('foo\nTBR=xx', ['a@c'], [],
1886 'foo\n\nR=a@c\nTBR=xx'),
1887 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1888 'foo\n\nR=a@c, yy\nTBR=xx'),
1889 ('foo\nBUG=', ['a@c'], [],
1890 'foo\nBUG=\nR=a@c'),
1891 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1892 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1893 ('foo', ['a@c', 'b@c'], [],
1894 'foo\n\nR=a@c, b@c'),
1895 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1896 'foo\nBar\n\nR=c@c\nBUG='),
1897 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1898 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001899 # Same as the line before, but full of whitespaces.
1900 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001901 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001902 'foo\nBar\n\nR=c@c\n BUG =',
1903 ),
1904 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001905 ('foo BUG=allo R=joe ', ['c@c'], [],
1906 'foo BUG=allo R=joe\n\nR=c@c'),
1907 # Redundant TBRs get promoted to Rs
1908 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1909 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001910 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001911 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001912 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001913 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001914 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001915 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001916 actual.append(obj.description)
1917 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001918
wittman@chromium.org455dc922015-01-26 20:15:50 +00001919 def test_get_target_ref(self):
1920 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001921 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001922 self.assertEqual(None, git_cl.GetTargetRef(None,
1923 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001924 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001925
wittman@chromium.org455dc922015-01-26 20:15:50 +00001926 # Check default target refs for branches.
1927 self.assertEqual('refs/heads/master',
1928 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001929 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001930 self.assertEqual('refs/heads/master',
1931 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001932 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001933 self.assertEqual('refs/heads/master',
1934 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001935 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001936 self.assertEqual('refs/branch-heads/123',
1937 git_cl.GetTargetRef('origin',
1938 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001939 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001940 self.assertEqual('refs/diff/test',
1941 git_cl.GetTargetRef('origin',
1942 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001943 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001944 self.assertEqual('refs/heads/chrome/m42',
1945 git_cl.GetTargetRef('origin',
1946 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001947 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001948
1949 # Check target refs for user-specified target branch.
1950 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1951 'refs/remotes/branch-heads/123'):
1952 self.assertEqual('refs/branch-heads/123',
1953 git_cl.GetTargetRef('origin',
1954 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001955 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001956 for branch in ('origin/master', 'remotes/origin/master',
1957 'refs/remotes/origin/master'):
1958 self.assertEqual('refs/heads/master',
1959 git_cl.GetTargetRef('origin',
1960 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001961 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001962 for branch in ('master', 'heads/master', 'refs/heads/master'):
1963 self.assertEqual('refs/heads/master',
1964 git_cl.GetTargetRef('origin',
1965 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001966 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001967
wychen@chromium.orga872e752015-04-28 23:42:18 +00001968 def test_patch_when_dirty(self):
1969 # Patch when local tree is dirty
1970 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1971 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1972
1973 def test_diff_when_dirty(self):
1974 # Do 'git cl diff' when local tree is dirty
1975 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1976 self.assertNotEqual(git_cl.main(['diff']), 0)
1977
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001978 @staticmethod
1979 def _get_gerrit_codereview_server_calls(branch, value=None,
1980 git_short_host='host',
1981 detect_branch=True):
1982 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1983
1984 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1985 """
1986 calls = []
1987 if detect_branch:
1988 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1989 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1990 CERR1 if value is None else value))
1991 if value is None:
1992 calls += [
1993 ((['git', 'config', 'branch.' + branch + '.merge'],),
1994 'refs/heads' + branch),
1995 ((['git', 'config', 'branch.' + branch + '.remote'],),
1996 'origin'),
1997 ((['git', 'config', 'remote.origin.url'],),
1998 'https://%s.googlesource.com/my/repo' % git_short_host),
1999 ]
2000 return calls
2001
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002002 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002003 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002004 detect_gerrit_server=True,
2005 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002006 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002007 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2008 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002009 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002010 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002011 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2012
tandriidf09a462016-08-18 16:23:55 -07002013 if new_branch:
2014 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2015 else:
2016 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002017
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002018 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002019 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002020 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002021 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002022 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2023 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2024 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2025 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002026 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002027 if default_codereview == 'gerrit':
2028 if not force_codereview:
2029 self.calls += [
2030 ((['git', 'config', 'gerrit.host'],), 'true'),
2031 ]
2032 if detect_gerrit_server:
2033 self.calls += self._get_gerrit_codereview_server_calls(
2034 'master', git_short_host=git_short_host,
2035 detect_branch=not new_branch and force_codereview)
2036 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002037
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002038 elif default_codereview == 'rietveld':
2039 self.calls += [
2040 ((['git', 'config', 'gerrit.host'],), CERR1),
2041 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2042 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2043 ]
2044 actual_codereview = 'rietveld'
2045
2046 if actual_codereview == 'rietveld':
2047 self.calls += [
2048 ((['git', 'rev-parse', '--show-cdup'],), ''),
2049 ]
2050 if not default_codereview:
2051 self.calls += [
2052 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2053 ]
2054 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002055 self.calls += [
2056 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002057 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002058 {
2059 'current_revision': '7777777777',
2060 'revisions': {
2061 '1111111111': {
2062 '_number': 1,
2063 'fetch': {'http': {
2064 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2065 'ref': 'refs/changes/56/123456/1',
2066 }},
2067 },
2068 '7777777777': {
2069 '_number': 7,
2070 'fetch': {'http': {
2071 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2072 'ref': 'refs/changes/56/123456/7',
2073 }},
2074 },
2075 },
2076 }),
2077 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002078
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002079 def _common_patch_rietveld_successful(self, **kwargs):
2080 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002081 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002082 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002083 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002084 ((['git', 'config', 'branch.master.rietveldserver',
2085 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002086 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002087 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002088 ((['git', 'commit', '-m',
2089 'Description\n\n' +
2090 'patch from issue 123456 at patchset 60001 ' +
2091 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002092 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002093
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002094 def test_patch_rietveld_default(self):
2095 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002096 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2097
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002098 def test_patch_rietveld_successful_new_branch(self):
2099 self._common_patch_rietveld_successful(default_codereview='rietveld',
2100 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002101 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2102
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002103 def test_patch_rietveld_guess_by_url(self):
2104 self._common_patch_rietveld_successful(
2105 default_codereview=None, # It doesn't matter.
2106 actual_codereview='rietveld')
2107 self.assertEqual(git_cl.main(
2108 ['patch', 'https://codereview.example.com/123456']), 0)
2109
2110 def test_patch_rietveld_conflict(self):
2111 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002112 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002113 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002114
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002115 def test_patch_gerrit_default(self):
2116 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002117 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002118 self.calls += [
2119 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2120 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002121 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002122 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002123 ((['git', 'config', 'branch.master.gerritserver',
2124 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002125 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002126 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002127 ]
2128 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2129
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002130 def test_patch_gerrit_force(self):
2131 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002132 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002133 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002134 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002135 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002136 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002137 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002138 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002139 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002140 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002141 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002142 ]
2143 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2144
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002145 def test_patch_gerrit_guess_by_url(self):
2146 self._patch_common(
2147 default_codereview=None, # It doesn't matter what's default.
2148 actual_codereview='gerrit',
2149 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002150 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002151 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152 'refs/changes/56/123456/1'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002153 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002154 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002155 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002156 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002157 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002158 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002159 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002160 ]
2161 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002162 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002163
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002164 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2165 self._patch_common(
2166 default_codereview=None, # It doesn't matter what's default.
2167 actual_codereview='gerrit',
2168 git_short_host='else', detect_gerrit_server=False)
2169 self.calls += [
2170 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2171 'refs/changes/56/123456/1'],), ''),
2172 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2173 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2174 ''),
2175 ((['git', 'config', 'branch.master.gerritserver',
2176 'https://else-review.googlesource.com'],), ''),
2177 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2178 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2179 ]
2180 self.assertEqual(git_cl.main(
2181 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2182
2183 def test_patch_gerrit_conflict(self):
2184 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002185 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002186 self.calls += [
2187 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002188 'refs/changes/56/123456/7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002189 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2190 ''),
2191 ((['git', 'config', 'branch.master.gerritserver',
2192 'https://chromium-review.googlesource.com'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002193 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002194 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2195 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2196 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 ]
2198 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002199 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002200
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002201 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002202 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002203 raise git_cl.gerrit_util.GerritError(404, '')
2204 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2205
tandriic2405f52016-10-10 08:13:15 -07002206 self.calls = [
2207 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2208 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2209 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2210 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2211 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2212 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002213 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2214 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2215 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2216 ((['git', 'config', 'remote.origin.url'],),
2217 'https://chromium.googlesource.com/my/repo'),
2218 ((['DieWithError',
2219 'change 123456 at https://chromium-review.googlesource.com does not '
2220 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002221 ]
2222 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002223 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002224
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002225 def _checkout_calls(self):
2226 return [
2227 ((['git', 'config', '--local', '--get-regexp',
2228 'branch\\..*\\.rietveldissue'], ),
2229 ('branch.retrying.rietveldissue 1111111111\n'
2230 'branch.some-fix.rietveldissue 2222222222\n')),
2231 ((['git', 'config', '--local', '--get-regexp',
2232 'branch\\..*\\.gerritissue'], ),
2233 ('branch.ger-branch.gerritissue 123456\n'
2234 'branch.gbranch654.gerritissue 654321\n')),
2235 ]
2236
2237 def test_checkout_gerrit(self):
2238 """Tests git cl checkout <issue>."""
2239 self.calls = self._checkout_calls()
2240 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2241 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2242
2243 def test_checkout_rietveld(self):
2244 """Tests git cl checkout <issue>."""
2245 self.calls = self._checkout_calls()
2246 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2247 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2248
2249 def test_checkout_not_found(self):
2250 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002251 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002252 self.calls = self._checkout_calls()
2253 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2254
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002255 def test_checkout_no_branch_issues(self):
2256 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002257 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002258 self.calls = [
2259 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002260 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002261 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002262 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002263 ]
2264 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2265
tandrii@chromium.org28253532016-04-14 13:46:56 +00002266 def _test_gerrit_ensure_authenticated_common(self, auth,
2267 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002268 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2269 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2270 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002271 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002272 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002273 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002274 cl.branch = 'master'
2275 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002276 cl.lookedup_issue = True
2277 return cl
2278
2279 def test_gerrit_ensure_authenticated_missing(self):
2280 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002281 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002282 })
2283 self.calls.append(
2284 ((['DieWithError',
2285 'Credentials for the following hosts are required:\n'
2286 ' chromium-review.googlesource.com\n'
2287 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002288 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002289 'https://chromium-review.googlesource.com/new-password'],), ''),)
2290 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2291
2292 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002293 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002294 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002295 'chromium.googlesource.com':
2296 ('git-one.example.com', None, 'secret1'),
2297 'chromium-review.googlesource.com':
2298 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002299 })
2300 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002301 (('ask_for_data', 'If you know what you are doing '
2302 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002303 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2304
2305 def test_gerrit_ensure_authenticated_ok(self):
2306 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002307 'chromium.googlesource.com':
2308 ('git-same.example.com', None, 'secret'),
2309 'chromium-review.googlesource.com':
2310 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002311 })
2312 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2313
tandrii@chromium.org28253532016-04-14 13:46:56 +00002314 def test_gerrit_ensure_authenticated_skipped(self):
2315 cl = self._test_gerrit_ensure_authenticated_common(
2316 auth={}, skip_auth_check=True)
2317 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2318
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002319 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002320 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2321 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002322 self.calls = [
2323 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002324 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002325 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2326 ((['git', 'config', 'rietveld.server'],), ''),
2327 ((['git', 'config', 'rietveld.server'],), ''),
2328 ((['git', 'config', 'branch.feature.rietveldserver'],),
2329 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002330 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002331 ]
2332 self.assertEqual(0, git_cl.main(['set-commit']))
2333
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002334 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002335 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002336 lambda h, i, labels, notify=None:
2337 self._mocked_call(['SetReview', h, i, labels, notify]))
2338
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002339 self.calls = [
2340 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002341 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2342 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002343 ((['git', 'config', 'branch.feature.gerritserver'],),
2344 'https://chromium-review.googlesource.com'),
2345 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002346 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002347 ]
tandriid9e5ce52016-07-13 02:32:59 -07002348
2349 def test_cmd_set_commit_gerrit_clear(self):
2350 self._cmd_set_commit_gerrit_common(0)
2351 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2352
2353 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002354 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002355 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2356
tandriid9e5ce52016-07-13 02:32:59 -07002357 def test_cmd_set_commit_gerrit(self):
2358 self._cmd_set_commit_gerrit_common(2)
2359 self.assertEqual(0, git_cl.main(['set-commit']))
2360
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002361 def test_description_display(self):
2362 out = StringIO.StringIO()
2363 self.mock(git_cl.sys, 'stdout', out)
2364
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002365 self.mock(git_cl, 'Changelist', ChangelistMock)
2366 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002367
2368 self.assertEqual(0, git_cl.main(['description', '-d']))
2369 self.assertEqual('foo\n', out.getvalue())
2370
2371 def test_description_rietveld(self):
2372 out = StringIO.StringIO()
2373 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002374 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002375
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002376 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002377 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002378 self.assertEqual('foobar\n', out.getvalue())
2379
iannucci3c972b92016-08-17 13:24:10 -07002380 def test_StatusFieldOverrideIssueMissingArgs(self):
2381 out = StringIO.StringIO()
2382 self.mock(git_cl.sys, 'stderr', out)
2383
2384 try:
2385 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2386 except SystemExit as ex:
2387 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002388 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002389
2390 out = StringIO.StringIO()
2391 self.mock(git_cl.sys, 'stderr', out)
2392
2393 try:
2394 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2395 except SystemExit as ex:
2396 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002397 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002398
2399 def test_StatusFieldOverrideIssue(self):
2400 out = StringIO.StringIO()
2401 self.mock(git_cl.sys, 'stdout', out)
2402
2403 def assertIssue(cl_self, *_args):
2404 self.assertEquals(cl_self.issue, 1)
2405 return 'foobar'
2406
2407 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2408 self.calls = [
2409 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2410 ((['git', 'config', 'rietveld.server'],), ''),
2411 ((['git', 'config', 'rietveld.server'],), ''),
2412 ]
iannuccie53c9352016-08-17 14:40:40 -07002413 self.assertEqual(
2414 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2415 0)
iannucci3c972b92016-08-17 13:24:10 -07002416 self.assertEqual(out.getvalue(), 'foobar\n')
2417
iannuccie53c9352016-08-17 14:40:40 -07002418 def test_SetCloseOverrideIssue(self):
2419 def assertIssue(cl_self, *_args):
2420 self.assertEquals(cl_self.issue, 1)
2421 return 'foobar'
2422
2423 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2424 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2425 self.calls = [
2426 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2427 ((['git', 'config', 'rietveld.server'],), ''),
2428 ((['git', 'config', 'rietveld.server'],), ''),
2429 ]
2430 self.assertEqual(
2431 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2432
2433 def test_SetCommitOverrideIssue(self):
2434 def assertIssue(cl_self, *_args):
2435 self.assertEquals(cl_self.issue, 1)
2436 return 'foobar'
2437
2438 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2439 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2440 self.calls = [
2441 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2442 ((['git', 'config', 'rietveld.server'],), ''),
2443 ((['git', 'config', 'rietveld.server'],), ''),
2444 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2445 ((['git', 'config', 'rietveld.server'],), ''),
2446 ((['git', 'config', 'rietveld.server'],), ''),
2447 ]
2448 self.assertEqual(
2449 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2450
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002451 def test_description_gerrit(self):
2452 out = StringIO.StringIO()
2453 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002454 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002455 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002456 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2457 {
2458 'current_revision': 'sha1',
2459 'revisions': {'sha1': {
2460 'commit': {'message': 'foobar'},
2461 }},
2462 }),
2463 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002464 self.assertEqual(0, git_cl.main([
2465 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2466 self.assertEqual('foobar\n', out.getvalue())
2467
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002468 def test_description_set_raw(self):
2469 out = StringIO.StringIO()
2470 self.mock(git_cl.sys, 'stdout', out)
2471
2472 self.mock(git_cl, 'Changelist', ChangelistMock)
2473 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2474
2475 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2476 self.assertEqual('hihi', ChangelistMock.desc)
2477
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002478 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002479 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002480
2481 def RunEditor(desc, _, **kwargs):
2482 self.assertEquals(
2483 '# Enter a description of the change.\n'
2484 '# This will be displayed on the codereview site.\n'
2485 '# The first line will also be used as the subject of the review.\n'
2486 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002487 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002488 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002489 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002490 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002491 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002492
dsansomee2d6fd92016-09-08 00:10:47 -07002493 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002494 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002495
2496 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2497 self.mock(git_cl.Changelist, 'GetDescription',
2498 lambda *args: current_desc)
2499 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2500 UpdateDescriptionRemote)
2501 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2502
2503 self.calls = [
2504 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002505 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002506 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2507 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002508 ((['git', 'config', 'core.editor'],), 'vi'),
2509 ]
2510 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2511
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002512 def test_description_set_stdin(self):
2513 out = StringIO.StringIO()
2514 self.mock(git_cl.sys, 'stdout', out)
2515
2516 self.mock(git_cl, 'Changelist', ChangelistMock)
2517 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2518
2519 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2520 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2521
kmarshall3bff56b2016-06-06 18:31:47 -07002522 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002523 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2524
kmarshall3bff56b2016-06-06 18:31:47 -07002525 self.calls = \
2526 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2527 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002528 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002529 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2530 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002531 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2532 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2533 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002534 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2535 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2536 ((['git', 'branch', '-D', 'foo'],), '')]
2537
kmarshall3bff56b2016-06-06 18:31:47 -07002538 self.mock(git_cl, 'get_cl_statuses',
2539 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002540 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2541 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2542 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002543
2544 self.assertEqual(0, git_cl.main(['archive', '-f']))
2545
2546 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002547 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002548 self.calls = \
2549 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2550 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002551 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002552 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2553 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002554 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2555
kmarshall9249e012016-08-23 12:02:16 -07002556 self.mock(git_cl, 'get_cl_statuses',
2557 lambda branches, fine_grained, max_processes:
2558 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2559
2560 self.assertEqual(1, git_cl.main(['archive', '-f']))
2561
2562 def test_archive_dry_run(self):
2563 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2564
2565 self.calls = \
2566 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2567 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2568 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2569 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2570 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2571 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2572 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2573 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2574 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002575
2576 self.mock(git_cl, 'get_cl_statuses',
2577 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002578 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2579 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2580 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002581
kmarshall9249e012016-08-23 12:02:16 -07002582 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2583
2584 def test_archive_no_tags(self):
2585 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2586
2587 self.calls = \
2588 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2589 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2590 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2591 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2592 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2593 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2594 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2595 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2596 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2597 ((['git', 'branch', '-D', 'foo'],), '')]
2598
2599 self.mock(git_cl, 'get_cl_statuses',
2600 lambda branches, fine_grained, max_processes:
2601 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2602 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2603 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2604
2605 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002606
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002607 def test_cmd_issue_erase_existing(self):
2608 out = StringIO.StringIO()
2609 self.mock(git_cl.sys, 'stdout', out)
2610 self.calls = [
2611 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002612 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2613 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002614 # Let this command raise exception (retcode=1) - it should be ignored.
2615 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002616 CERR1),
2617 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2618 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002619 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2620 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2621 ''),
2622 ]
2623 self.assertEqual(0, git_cl.main(['issue', '0']))
2624
phajdan.jre328cf92016-08-22 04:12:17 -07002625 def test_cmd_issue_json(self):
2626 out = StringIO.StringIO()
2627 self.mock(git_cl.sys, 'stdout', out)
2628 self.calls = [
2629 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002630 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002631 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2632 ((['git', 'config', 'rietveld.server'],),
2633 'https://codereview.chromium.org'),
2634 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2635 (('write_json', 'output.json',
2636 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2637 ''),
2638 ]
2639 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2640
tandriide281ae2016-10-12 06:02:30 -07002641 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002642 self.mock(git_cl.Changelist, 'GetChange',
2643 lambda _, *a: (
2644 self._mocked_call(['GetChange']+list(a))))
2645 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2646 lambda *_, **__: (
2647 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002648 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2649 lambda _, s: self._mocked_call(['SetCQState', s]))
2650 self.calls = [
2651 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002652 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002653 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2654 ((['git', 'config', 'rietveld.server'],),
2655 'https://codereview.chromium.org'),
2656 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2657 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2658 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2659 ((['get_or_create_merge_base', 'feature', 'feature'],),
2660 'fake_ancestor_sha'),
2661 ((['GetChange', 'fake_ancestor_sha', None], ),
2662 git_cl.presubmit_support.GitChange(
2663 '', '', '', '', '', '', '', '')),
2664 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2665 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002666 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2667 ]
2668 out = StringIO.StringIO()
2669 self.mock(git_cl.sys, 'stdout', out)
2670 self.assertEqual(0, git_cl.main(['try']))
2671 self.assertEqual(
2672 out.getvalue(),
2673 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2674
tandrii8c5a3532016-11-04 07:52:02 -07002675 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2676 self.mock(git_cl.Changelist, 'GetChange',
2677 lambda _, *a: (
2678 self._mocked_call(['GetChange']+list(a))))
2679 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2680 lambda *_, **__: (
2681 self._mocked_call(['DoGetTryMasters'])))
2682 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2683 lambda _, s: self._mocked_call(['SetCQState', s]))
2684
tandrii8c5a3532016-11-04 07:52:02 -07002685 self.calls = [
2686 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2687 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2688 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2689 ((['git', 'config', 'branch.feature.gerritserver'],),
2690 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002691 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2692 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2693 'project': 'depot_tools',
2694 'status': 'OPEN',
2695 'owner': {'email': 'owner@e.mail'},
2696 'revisions': {
2697 'deadbeaf': {
2698 '_number': 6,
2699 },
2700 'beeeeeef': {
2701 '_number': 7,
2702 'fetch': {'http': {
2703 'url': 'https://chromium.googlesource.com/depot_tools',
2704 'ref': 'refs/changes/56/123456/7'
2705 }},
2706 },
2707 },
2708 }),
tandrii8c5a3532016-11-04 07:52:02 -07002709 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2710 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2711 ((['get_or_create_merge_base', 'feature', 'feature'],),
2712 'fake_ancestor_sha'),
2713 ((['GetChange', 'fake_ancestor_sha', None], ),
2714 git_cl.presubmit_support.GitChange(
2715 '', '', '', '', '', '', '', '')),
2716 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2717 ((['DoGetTryMasters'], ), None),
2718 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2719 ]
2720 out = StringIO.StringIO()
2721 self.mock(git_cl.sys, 'stdout', out)
2722 self.assertEqual(0, git_cl.main(['try']))
2723 self.assertEqual(
2724 out.getvalue(),
2725 'scheduled CQ Dry Run on '
2726 'https://chromium-review.googlesource.com/123456\n')
2727
2728 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2729 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2730 lambda _: {
2731 'owner_email': 'owner@e.mail',
2732 'private': False,
2733 'closed': False,
2734 'project': 'depot_tools',
2735 'patchsets': [20001],
2736 })
tandriide281ae2016-10-12 06:02:30 -07002737 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2738 self.calls = [
2739 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2740 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2741 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2742 ((['git', 'config', 'rietveld.server'],),
2743 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002744 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002745 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002746 ]
2747
2748 def _buildbucket_retry(*_, **kw):
2749 # self.maxDiff = 10000
2750 body = json.loads(kw['body'])
2751 self.assertEqual(len(body['builds']), 1)
2752 build = body['builds'][0]
2753 params = json.loads(build.pop('parameters_json'))
2754 self.assertEqual(params, {
2755 u'builder_name': u'win',
2756 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2757 u'revision': None}],
2758 u'properties': {
2759 u'category': u'git_cl_try',
2760 u'issue': 123,
2761 u'key': u'val',
2762 u'json': [{u'a': 1}, None],
2763 u'master': u'tryserver.chromium',
2764 u'patch_project': u'depot_tools',
2765 u'patch_storage': u'rietveld',
2766 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002767 u'rietveld': u'https://codereview.chromium.org',
2768 }
2769 })
2770 self.assertEqual(build, {
2771 u'bucket': u'master.tryserver.chromium',
2772 u'client_operation_id': u'uuid4',
2773 u'tags': [u'builder:win',
2774 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002775 u'user_agent:git_cl_try',
2776 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002777 })
2778
2779 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2780
2781 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2782 self.assertEqual(0, git_cl.main([
2783 'try', '-m', 'tryserver.chromium', '-b', 'win',
2784 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2785 self.assertRegexpMatches(
2786 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002787 'Tried jobs on:\nBucket: master.tryserver.chromium')
2788
tandrii8c5a3532016-11-04 07:52:02 -07002789 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2790 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2791 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2792
tandrii8c5a3532016-11-04 07:52:02 -07002793 self.calls = [
2794 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2795 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2796 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2797 ((['git', 'config', 'branch.feature.gerritserver'],),
2798 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002799 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002800 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002801 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002802 'status': 'OPEN',
2803 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002804 'revisions': {
2805 'deadbeaf': {
2806 '_number': 6,
2807 },
2808 'beeeeeef': {
2809 '_number': 7,
2810 'fetch': {'http': {
2811 'url': 'https://chromium.googlesource.com/depot_tools',
2812 'ref': 'refs/changes/56/123456/7'
2813 }},
2814 },
2815 },
2816 }),
2817 ]
2818
2819 def _buildbucket_retry(*_, **kw):
2820 # self.maxDiff = 10000
2821 body = json.loads(kw['body'])
2822 self.assertEqual(len(body['builds']), 1)
2823 build = body['builds'][0]
2824 params = json.loads(build.pop('parameters_json'))
2825 self.assertEqual(params, {
2826 u'builder_name': u'win',
2827 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2828 u'revision': None}],
2829 u'properties': {
2830 u'category': u'git_cl_try',
2831 u'key': u'val',
2832 u'json': [{u'a': 1}, None],
2833 u'master': u'tryserver.chromium',
2834
2835 u'patch_gerrit_url':
2836 u'https://chromium-review.googlesource.com',
2837 u'patch_issue': 123456,
2838 u'patch_project': u'depot_tools',
2839 u'patch_ref': u'refs/changes/56/123456/7',
2840 u'patch_repository_url':
2841 u'https://chromium.googlesource.com/depot_tools',
2842 u'patch_set': 7,
2843 u'patch_storage': u'gerrit',
2844 }
2845 })
2846 self.assertEqual(build, {
2847 u'bucket': u'master.tryserver.chromium',
2848 u'client_operation_id': u'uuid4',
2849 u'tags': [
2850 u'builder:win',
2851 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2852 u'user_agent:git_cl_try',
2853 u'master:tryserver.chromium'],
2854 })
2855
2856 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2857
2858 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2859 self.assertEqual(0, git_cl.main([
2860 'try', '-m', 'tryserver.chromium', '-b', 'win',
2861 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2862 self.assertRegexpMatches(
2863 git_cl.sys.stdout.getvalue(),
2864 'Tried jobs on:\nBucket: master.tryserver.chromium')
2865
borenet6c0efe62016-10-19 08:13:29 -07002866 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002867 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2868 lambda _: {
2869 'owner_email': 'owner@e.mail',
2870 'private': False,
2871 'closed': False,
2872 'project': 'depot_tools',
2873 'patchsets': [20001],
2874 })
borenet6c0efe62016-10-19 08:13:29 -07002875 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2876 self.calls = [
2877 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2878 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2879 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2880 ((['git', 'config', 'rietveld.server'],),
2881 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002882 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002883 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002884 ]
2885
2886 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002887 body = json.loads(kw['body'])
2888 self.assertEqual(len(body['builds']), 1)
2889 build = body['builds'][0]
2890 params = json.loads(build.pop('parameters_json'))
2891 self.assertEqual(params, {
2892 u'builder_name': u'win',
2893 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2894 u'revision': None}],
2895 u'properties': {
2896 u'category': u'git_cl_try',
2897 u'issue': 123,
2898 u'patch_project': u'depot_tools',
2899 u'patch_storage': u'rietveld',
2900 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002901 u'rietveld': u'https://codereview.chromium.org',
2902 }
2903 })
2904 self.assertEqual(build, {
2905 u'bucket': u'test.bucket',
2906 u'client_operation_id': u'uuid4',
2907 u'tags': [u'builder:win',
2908 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2909 u'user_agent:git_cl_try'],
2910 })
2911
2912 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2913
2914 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2915 self.assertEqual(0, git_cl.main([
2916 'try', '-B', 'test.bucket', '-b', 'win']))
2917 self.assertRegexpMatches(
2918 git_cl.sys.stdout.getvalue(),
2919 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002920
qyearsley123a4682016-10-26 09:12:17 -07002921 def test_git_cl_try_bots_on_multiple_masters(self):
2922 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2923 self.calls = [
2924 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2925 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2926 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2927 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002928 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002929 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2930 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2931 ]
2932
2933 def _buildbucket_retry(*_, **kw):
2934 body = json.loads(kw['body'])
2935 self.assertEqual(len(body['builds']), 2)
2936
2937 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2938 self.assertEqual(first_build_params['builder_name'], 'builder1')
2939 self.assertEqual(first_build_params['properties']['master'], 'master1')
2940
2941 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2942 self.assertEqual(first_build_params['builder_name'], 'builder2')
2943 self.assertEqual(first_build_params['properties']['master'], 'master2')
2944
2945 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2946
2947 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2948 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2949
2950 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2951 self.assertEqual(
2952 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2953 self.assertEqual(
2954 git_cl.sys.stdout.getvalue(),
2955 'Tried jobs on:\n'
2956 'Bucket: master.master1\n'
2957 ' builder1: []\n'
2958 'Bucket: master.master2\n'
2959 ' builder2: []\n'
2960 'To see results here, run: git cl try-results\n'
2961 'To see results in browser, run: git cl web\n')
2962
tandrii16e0b4e2016-06-07 10:34:28 -07002963 def _common_GerritCommitMsgHookCheck(self):
2964 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2965 self.mock(git_cl.os.path, 'abspath',
2966 lambda path: self._mocked_call(['abspath', path]))
2967 self.mock(git_cl.os.path, 'exists',
2968 lambda path: self._mocked_call(['exists', path]))
2969 self.mock(git_cl.gclient_utils, 'FileRead',
2970 lambda path: self._mocked_call(['FileRead', path]))
2971 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2972 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2973 self.calls = [
2974 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2975 ((['abspath', '../'],), '/abs/git_repo_root'),
2976 ]
2977 return git_cl.Changelist(codereview='gerrit', issue=123)
2978
2979 def test_GerritCommitMsgHookCheck_custom_hook(self):
2980 cl = self._common_GerritCommitMsgHookCheck()
2981 self.calls += [
2982 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2983 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2984 '#!/bin/sh\necho "custom hook"')
2985 ]
2986 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2987
2988 def test_GerritCommitMsgHookCheck_not_exists(self):
2989 cl = self._common_GerritCommitMsgHookCheck()
2990 self.calls += [
2991 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2992 ]
2993 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2994
2995 def test_GerritCommitMsgHookCheck(self):
2996 cl = self._common_GerritCommitMsgHookCheck()
2997 self.calls += [
2998 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2999 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3000 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003001 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003002 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3003 ''),
3004 ]
3005 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3006
tandriic4344b52016-08-29 06:04:54 -07003007 def test_GerritCmdLand(self):
3008 self.calls += [
3009 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3010 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3011 'deadbeaf'),
3012 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3013 ((['git', 'config', 'branch.feature.gerritserver'],),
3014 'chromium-review.googlesource.com'),
3015 ]
3016 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3017 cl._codereview_impl._GetChangeDetail = lambda _: {
3018 'labels': {},
3019 'current_revision': 'deadbeaf',
3020 }
agable32978d92016-11-01 12:55:02 -07003021 cl._codereview_impl._GetChangeCommit = lambda: {
3022 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003023 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003024 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3025 }
tandriic4344b52016-08-29 06:04:54 -07003026 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003027 out = StringIO.StringIO()
3028 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003029 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003030 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07003031 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003032
tandrii221ab252016-10-06 08:12:04 -07003033 BUILDBUCKET_BUILDS_MAP = {
3034 '9000': {
3035 'id': '9000',
3036 'status': 'STARTED',
3037 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3038 'result_details_json': '{"properties": {}}',
3039 'bucket': 'master.x.y',
3040 'created_by': 'user:someone@chromium.org',
3041 'created_ts': '147200002222000',
3042 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3043 },
3044 '8000': {
3045 'id': '8000',
3046 'status': 'COMPLETED',
3047 'result': 'FAILURE',
3048 'failure_reason': 'BUILD_FAILURE',
3049 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3050 'result_details_json': '{"properties": {}}',
3051 'bucket': 'master.x.y',
3052 'created_by': 'user:someone@chromium.org',
3053 'created_ts': '147200001111000',
3054 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3055 },
3056 }
3057
3058 def test_write_try_results_json(self):
3059 expected_output = [
3060 {
3061 'buildbucket_id': '8000',
3062 'bucket': 'master.x.y',
3063 'builder_name': 'my-builder',
3064 'status': 'COMPLETED',
3065 'result': 'FAILURE',
3066 'failure_reason': 'BUILD_FAILURE',
3067 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3068 },
3069 {
3070 'buildbucket_id': '9000',
3071 'bucket': 'master.x.y',
3072 'builder_name': 'my-builder',
3073 'status': 'STARTED',
3074 'result': None,
3075 'failure_reason': None,
3076 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3077 }
3078 ]
3079 self.calls = [(('write_json', 'output.json', expected_output), '')]
3080 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3081
tandrii45b2a582016-10-11 03:14:16 -07003082 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003083 out = StringIO.StringIO()
3084 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003085 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3086 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003087 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3088 self._mocked_call(['get_authenticator_for_host', host]))
3089 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3090 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003091
3092 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3093 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003094 self.calls += [
3095 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3096 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3097 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3098 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3099 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3100 ((['git', 'config', 'branch.feature.rietveldserver'],),
3101 'codereview.example.com'),
3102 ((['get_authenticator_for_host', 'codereview.example.com'],),
3103 AuthenticatorMock()),
3104 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3105
3106 def test_fetch_try_jobs_none_rietveld(self):
3107 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003108 # Simulate that user isn't logged in.
3109 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003110 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003111 self.assertRegexpMatches(sys.stdout.getvalue(),
3112 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003113 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3114
3115 def test_fetch_try_jobs_some_rietveld(self):
3116 self._setup_fetch_try_jobs_rietveld({
3117 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3118 })
3119 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003120 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3121 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3122 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3123
3124 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3125 self._setup_fetch_try_jobs(most_recent_patchset=13)
3126 self.calls += [
3127 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3128 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3129 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003130 # TODO(tandrii): Uncomment the below if we decide to support checking
3131 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003132 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003133 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003134 ((['git', 'config', 'branch.feature.gerritserver'],),
3135 'https://x-review.googlesource.com'),
3136 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3137 AuthenticatorMock()),
3138 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3139
3140 def test_fetch_try_jobs_none_gerrit(self):
3141 self._setup_fetch_try_jobs_gerrit({})
3142 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003143 # TODO(tandrii): Uncomment the below if we decide to support checking
3144 # patchsets for Gerrit.
3145 # self.assertRegexpMatches(
3146 # sys.stdout.getvalue(),
3147 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003148 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3149
3150 def test_fetch_try_jobs_some_gerrit(self):
3151 self._setup_fetch_try_jobs_gerrit({
3152 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3153 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003154 # TODO(tandrii): Uncomment the below if we decide to support checking
3155 # patchsets for Gerrit.
3156 # self.calls.remove(
3157 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003158 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3159
3160 # ... and doesn't result in warning.
3161 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3162 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003163 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3164 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3165
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003166 def _mock_gerrit_changes_for_detail_cache(self):
3167 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003168
3169 def test_gerrit_change_detail_cache_normalize(self):
3170 self._mock_gerrit_changes_for_detail_cache()
3171 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003172 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003173 ]
3174 cl = git_cl.Changelist(codereview='gerrit')
3175 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3176 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3177 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3178 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3179
3180 def test_gerrit_change_detail_cache_simple(self):
3181 self._mock_gerrit_changes_for_detail_cache()
3182 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003183 (('GetChangeDetail', 'host', '1', []), 'a'),
3184 (('GetChangeDetail', 'host', '2', []), 'b'),
3185 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003186 ]
3187 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3188 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3189 self.assertEqual(cl._GetChangeDetail(), 'a')
3190 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003191 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003192 self.assertEqual(cl._GetChangeDetail(), 'a')
3193 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3194
3195 def test_gerrit_change_detail_cache_options(self):
3196 self._mock_gerrit_changes_for_detail_cache()
3197 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003198 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3199 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3200 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3201 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003202 ]
3203 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3204 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3205 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3206 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3207 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3208 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3209 self.assertEqual(cl._GetChangeDetail(), 'cab')
3210
3211 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3212 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3213 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3214 self.assertEqual(cl._GetChangeDetail(), 'cab')
3215
3216 # Finally, no_cache should invalidate all caches for given change.
3217 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3218 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3219
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003220 def test_gerrit_description_caching(self):
3221 def gen_detail(rev, desc):
3222 return {
3223 'current_revision': rev,
3224 'revisions': {rev: {'commit': {'message': desc}}}
3225 }
3226 self.calls = [
3227 (('GetChangeDetail', 'host', '1',
3228 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3229 gen_detail('rev1', 'desc1')),
3230 (('GetChangeDetail', 'host', '1',
3231 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3232 gen_detail('rev2', 'desc2')),
3233 ]
3234
3235 self._mock_gerrit_changes_for_detail_cache()
3236 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3237 self.assertEqual(cl.GetDescription(), 'desc1')
3238 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3239 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003240
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003241 def test_print_current_creds(self):
3242 class CookiesAuthenticatorMock(object):
3243 def __init__(self):
3244 self.gitcookies = {
3245 'host.googlesource.com': ('user', 'pass'),
3246 'host-review.googlesource.com': ('user', 'pass'),
3247 }
3248 self.netrc = self
3249 self.netrc.hosts = {
3250 'github.com': ('user2', None, 'pass2'),
3251 'host2.googlesource.com': ('user3', None, 'pass'),
3252 }
3253 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3254 CookiesAuthenticatorMock)
3255 self.mock(sys, 'stdout', StringIO.StringIO())
3256 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3257 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3258 ' Host\t User\t Which file',
3259 '============================\t=====\t===========',
3260 'host-review.googlesource.com\t user\t.gitcookies',
3261 ' host.googlesource.com\t user\t.gitcookies',
3262 ' host2.googlesource.com\tuser3\t .netrc',
3263 ])
3264 sys.stdout.buf = ''
3265 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3266 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3267 ' Host\tUser\t Which file',
3268 '============================\t====\t===========',
3269 'host-review.googlesource.com\tuser\t.gitcookies',
3270 ' host.googlesource.com\tuser\t.gitcookies',
3271 ])
3272
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003273 def _common_creds_check_mocks(self):
3274 def exists_mock(path):
3275 dirname = os.path.dirname(path)
3276 if dirname == os.path.expanduser('~'):
3277 dirname = '~'
3278 base = os.path.basename(path)
3279 if base in ('.netrc', '.gitcookies'):
3280 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3281 # git cl also checks for existence other files not relevant to this test.
3282 return None
3283 self.mock(os.path, 'exists', exists_mock)
3284 self.mock(sys, 'stdout', StringIO.StringIO())
3285
3286 def test_creds_check_gitcookies_not_configured(self):
3287 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003288 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003289 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003290 self.calls = [
3291 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3292 (('os.path.exists', '~/.netrc'), True),
3293 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3294 'or Ctrl+C to abort'), ''),
3295 ((['git', 'config', '--global', 'http.cookiefile',
3296 os.path.expanduser('~/.gitcookies')], ), ''),
3297 ]
3298 self.assertEqual(0, git_cl.main(['creds-check']))
3299 self.assertRegexpMatches(
3300 sys.stdout.getvalue(),
3301 '^You seem to be using outdated .netrc for git credentials:')
3302 self.assertRegexpMatches(
3303 sys.stdout.getvalue(),
3304 '\nConfigured git to use .gitcookies from')
3305
3306 def test_creds_check_gitcookies_configured_custom_broken(self):
3307 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003308 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003309 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003310 self.calls = [
3311 ((['git', 'config', '--global', 'http.cookiefile'],),
3312 '/custom/.gitcookies'),
3313 (('os.path.exists', '/custom/.gitcookies'), False),
3314 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3315 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3316 ((['git', 'config', '--global', 'http.cookiefile',
3317 os.path.expanduser('~/.gitcookies')], ), ''),
3318 ]
3319 self.assertEqual(0, git_cl.main(['creds-check']))
3320 self.assertRegexpMatches(
3321 sys.stdout.getvalue(),
3322 'WARNING: you have configured custom path to .gitcookies: ')
3323 self.assertRegexpMatches(
3324 sys.stdout.getvalue(),
3325 'However, your configured .gitcookies file is missing.')
3326
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003327 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003328 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3329 lambda _, message: self._mocked_call('AddComment', message))
3330 self.calls = [
3331 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3332 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3333 (('AddComment', 'msg'), ''),
3334 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003335 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3336 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003337
3338 def test_git_cl_comment_add_gerrit(self):
3339 self.mock(git_cl.gerrit_util, 'SetReview',
3340 lambda host, change, msg:
3341 self._mocked_call('SetReview', host, change, msg))
3342 self.calls = [
3343 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3344 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3345 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3346 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3347 'origin/master'),
3348 ((['git', 'config', 'remote.origin.url'],),
3349 'https://chromium.googlesource.com/infra/infra'),
3350 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3351 ]
3352 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3353 '-a', 'msg']))
3354
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003355 def test_git_cl_comments_fetch_rietveld(self):
3356 self.mock(sys, 'stdout', StringIO.StringIO())
3357 self.calls = [
3358 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3359 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3360 ] * 2
3361 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3362 'messages': [
3363 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3364 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3365 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3366 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3367 # Intentionally wrong order here.
3368 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3369 'disapproval': False, 'approval': False,
3370 'sender': 'owner@example.com'},
3371 ],
3372 'owner_email': 'owner@example.com',
3373 })
3374 expected_comments_summary = [
3375 git_cl._CommentSummary(
3376 message='lgtm',
3377 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3378 disapproval=False, approval=True, sender='r@example.com'),
3379 git_cl._CommentSummary(
3380 message='not lgtm',
3381 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3382 disapproval=True, approval=False, sender='r2@example.com'),
3383 # Note: same order as in whatever Rietveld returns.
3384 git_cl._CommentSummary(
3385 message='PTAL',
3386 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3387 disapproval=False, approval=False, sender='owner@example.com'),
3388 ]
3389 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3390 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3391
3392 with git_cl.gclient_utils.temporary_directory() as tempdir:
3393 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3394 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3395 '-j', out_file]))
3396 with open(out_file) as f:
3397 read = json.load(f)
3398 self.assertEqual(len(read), 3)
3399 self.assertEqual(read[0], {
3400 'date': '2000-03-13 20:49:34.515270',
3401 'message': 'PTAL',
3402 'approval': False,
3403 'disapproval': False,
3404 'sender': 'owner@example.com'})
3405 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3406 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3407
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003408 def test_git_cl_comments_fetch_gerrit(self):
3409 self.mock(sys, 'stdout', StringIO.StringIO())
3410 self.calls = [
3411 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3412 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3413 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3414 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3415 'origin/master'),
3416 ((['git', 'config', 'remote.origin.url'],),
3417 'https://chromium.googlesource.com/infra/infra'),
3418 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3419 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3420 'owner': {'email': 'owner@example.com'},
3421 'messages': [
3422 {
3423 u'_revision_number': 1,
3424 u'author': {
3425 u'_account_id': 1111084,
3426 u'email': u'commit-bot@chromium.org',
3427 u'name': u'Commit Bot'
3428 },
3429 u'date': u'2017-03-15 20:08:45.000000000',
3430 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3431 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3432 u'tag': u'autogenerated:cq:dry-run'
3433 },
3434 {
3435 u'_revision_number': 2,
3436 u'author': {
3437 u'_account_id': 11151243,
3438 u'email': u'owner@example.com',
3439 u'name': u'owner'
3440 },
3441 u'date': u'2017-03-16 20:00:41.000000000',
3442 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3443 u'message': u'PTAL',
3444 },
3445 {
3446 u'_revision_number': 2,
3447 u'author': {
3448 u'_account_id': 148512 ,
3449 u'email': u'reviewer@example.com',
3450 u'name': u'reviewer'
3451 },
3452 u'date': u'2017-03-17 05:19:37.500000000',
3453 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3454 u'message': u'Patch Set 2: Code-Review+1',
3455 },
3456 ]
3457 })
3458 ] * 2
3459 expected_comments_summary = [
3460 git_cl._CommentSummary(
3461 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3462 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3463 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3464 git_cl._CommentSummary(
3465 message=u'PTAL',
3466 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3467 disapproval=False, approval=False, sender=u'owner@example.com'),
3468 git_cl._CommentSummary(
3469 message=u'Patch Set 2: Code-Review+1',
3470 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3471 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3472 ]
3473 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3474 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3475
3476 with git_cl.gclient_utils.temporary_directory() as tempdir:
3477 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3478 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3479 '-j', out_file]))
3480 with open(out_file) as f:
3481 read = json.load(f)
3482 self.assertEqual(len(read), 3)
3483 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3484 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3485 self.assertEqual(read[2], {
3486 u'date': u'2017-03-17 05:19:37.500000',
3487 u'message': u'Patch Set 2: Code-Review+1',
3488 u'approval': False,
3489 u'disapproval': False,
3490 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003491
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003492if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003493 logging.basicConfig(
3494 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003495 unittest.main()