blob: 1876087def446cc37a1406fe0907ad85eb62e033 [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):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000703 return (cls._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
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000707 def _upload_no_rev_calls(cls, similarity, find_copies):
708 return (cls._git_base_calls(similarity, find_copies) +
709 cls._git_upload_no_rev_calls())
710
711 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000712 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000713 if similarity is None:
714 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700715 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700716 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000717 else:
tandrii33a46ff2016-08-23 05:53:40 -0700718 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700719 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000720
721 if find_copies is None:
722 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700723 find_copies_call = ((['git', 'config', '--bool',
724 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000725 else:
tandrii5d48c322016-08-18 16:19:37 -0700726 val = str(find_copies).lower()
727 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000728 'branch.master.git-find-copies', val],), '')
729
730 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000731 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800732 '-l100000', '-C'+similarity,
733 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000734 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000735 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000736 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000737
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000738 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000739 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000740 similarity_call,
741 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
742 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000743 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000744 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700745 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
746 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000747 ((['git', 'config', 'rietveld.server'],),
748 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000749 ((['git', 'config', 'branch.master.merge'],), 'master'),
750 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000751 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000752 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000753 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ((['git', 'rev-parse', '--show-cdup'],), ''),
755 ((['git', 'rev-parse', 'HEAD'],), '12345'),
756 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000757 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000758 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700759 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000760 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000761 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000762 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000763 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000764 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000765 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000766 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000767 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700768 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000769 ]
770
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000771 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000772 def _git_upload_no_rev_calls(cls):
773 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000774 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000775 ]
776
777 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000778 def _git_upload_calls(cls, private):
779 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000780 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000781 private_call = []
782 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000783 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000784 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000786
maruel@chromium.orga3353652011-11-30 14:26:57 +0000787 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000789 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800791 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000792 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700793 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000795 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000796 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700797 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000798 ] + cls._git_post_upload_calls()
799
800 @classmethod
801 def _git_post_upload_calls(cls):
802 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000803 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
804 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
805 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000806 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000807 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000808 ]
809
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000810 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000811 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000812 fake_ancestor = 'fake_ancestor'
813 fake_cl = 'fake_cl_for_patch'
814 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000815 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000816 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000817 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000818 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000819 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000820 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000821 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700823 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000824 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000825 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000826 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000827 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000828 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000829 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000830 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000831 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000832 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000833 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000834 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000835
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000836 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700837 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000839 return [
840 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000841 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000842 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000843 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700844 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000845 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000846 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100847 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000848 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000849 ]
850
851 def _run_reviewer_test(
852 self,
853 upload_args,
854 expected_description,
855 returned_description,
856 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000857 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700858 private=False,
859 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000860 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000861 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000862 try:
863 similarity = upload_args[upload_args.index('--similarity')+1]
864 except ValueError:
865 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000866
867 if '--find-copies' in upload_args:
868 find_copies = True
869 elif '--no-find-copies' in upload_args:
870 find_copies = False
871 else:
872 find_copies = None
873
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000874 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700875 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000876
877 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000878
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000879 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000880 self.assertEquals(
881 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000882 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000883 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000884 '#--------------------This line is 72 characters long'
885 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000886 expected_description,
887 desc)
888 return returned_description
889 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000890
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000891 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000892 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700893 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000894 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000895 return 1, 2
896 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000897
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000898 git_cl.main(['upload'] + upload_args)
899
900 def test_no_reviewer(self):
901 self._run_reviewer_test(
902 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000903 'desc\n\nBUG=',
904 '# Blah blah comment.\ndesc\n\nBUG=',
905 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000906 [])
907
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000908 def test_keep_similarity(self):
909 self._run_reviewer_test(
910 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000911 'desc\n\nBUG=',
912 '# Blah blah comment.\ndesc\n\nBUG=',
913 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000914 [])
915
iannucci@chromium.org79540052012-10-19 23:15:26 +0000916 def test_keep_find_copies(self):
917 self._run_reviewer_test(
918 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000919 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000920 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000921 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000922 [])
923
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000924 def test_private(self):
925 self._run_reviewer_test(
926 ['--private'],
927 'desc\n\nBUG=',
928 '# Blah blah comment.\ndesc\n\nBUG=\n',
929 'desc\n\nBUG=',
930 [])
931
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000932 def test_reviewers_cmd_line(self):
933 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000934 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000935 self._run_reviewer_test(
936 ['-r' 'foo@example.com'],
937 description,
938 '\n%s\n' % description,
939 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000940 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000941
942 def test_reviewer_tbr_overriden(self):
943 # Reviewer is overriden with TBR
944 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000945 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000946 self._run_reviewer_test(
947 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000948 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000949 description.strip('\n'),
950 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000951 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000952
953 def test_reviewer_multiple(self):
954 # Handles multiple R= or TBR= lines.
955 description = (
bradnelsond975b302016-10-23 12:20:23 -0700956 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
957 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000958 self._run_reviewer_test(
959 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000960 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000961 description,
962 description,
bradnelsond975b302016-10-23 12:20:23 -0700963 ['--reviewers=another@example.com,reviewer@example.com'],
964 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000965
maruel@chromium.orga3353652011-11-30 14:26:57 +0000966 def test_reviewer_send_mail(self):
967 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000968 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000969 self._run_reviewer_test(
970 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000971 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000972 description.strip('\n'),
973 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000974 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000975
976 def test_reviewer_send_mail_no_rev(self):
977 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000978 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700979 self.calls = self._upload_no_rev_calls(None, None) + [
980 ((['DieWithError', 'Must specify reviewers to send email.'],),
981 SystemExitMock())
982 ]
983
984 def RunEditor(desc, _, **kwargs):
985 return desc
986 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
987 self.mock(sys, 'stdout', stdout)
988 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000989 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700990 self.assertEqual(
991 'Using 50% similarity for rename/copy detection. Override with '
992 '--similarity.\n',
993 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000994
tandriif9aefb72016-07-01 09:06:51 -0700995 def test_bug_on_cmd(self):
996 self._run_reviewer_test(
997 ['--bug=500658,proj:123'],
998 'desc\n\nBUG=500658\nBUG=proj:123',
999 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1000 'desc\n\nBUG=500658\nBUG=proj:1234',
1001 [])
1002
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001003 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1004 parent_msg=None,
1005 new_msg=None,
1006 fail_after_parent_msg=False,
1007 fail_cherry_pick=False,
1008 fail_push_count=0,
1009 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001010 if debug:
1011 # Very useful due to finally clause in git cl land raising exceptions and
1012 # shadowing real cause of failure.
1013 self.mock(git_cl, '_IS_BEING_TESTED', True)
1014 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001015 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001016
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001017 if git_numberer_enabled:
1018 # Special mocks to check validity of timestamp.
1019 original_git_amend_head = git_cl._git_amend_head
1020 def _git_amend_head_mock(msg, tstamp):
1021 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1022 return original_git_amend_head(msg, tstamp)
1023 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1024
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001025 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1026 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001027 self.mock(RietveldMock, 'update_description', staticmethod(
1028 lambda i, d: self._mocked_call(['update_description', i, d])))
1029 self.mock(RietveldMock, 'add_comment', staticmethod(
1030 lambda i, c: self._mocked_call(['add_comment', i, c])))
1031 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001032 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1033 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1034 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1035 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1036 CERR1),
1037 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1038 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001039 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001040 ((['git', 'config', 'rietveld.server'],),
1041 'https://codereview.chromium.org'),
1042 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1043 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1044 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1045 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001046 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1047 ''), # No commits to rebase, according to local view of origin.
1048 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1049 'fake_ancestor_sha'),
1050 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1051 ((['git', 'rev-parse', '--show-cdup'],), ''),
1052 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1053 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1054 'fake_ancestor_sha...', '.'],),
1055 'M\tfile1.cpp'),
1056 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1057 ((['git', 'config', 'branch.feature.rietveldserver'],),
1058 'https://codereview.chromium.org'),
1059 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1060 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1061 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1062 'fake_ancestor_sha', 'feature'],),
1063 # This command just prints smth like this:
1064 # file1.cpp | 53 ++++++--
1065 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1066 ''),
1067 ((['git', 'show-ref', '--quiet', '--verify',
1068 'refs/heads/git-cl-commit'],),
1069 ''), # 0 return code means branch exists.
1070 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1071 ((['git', 'show-ref', '--quiet', '--verify',
1072 'refs/heads/git-cl-cherry-pick'],),
1073 CERR1), # This means git-cl-cherry-pick branch does not exist.
1074 ((['git', 'rev-parse', '--show-cdup'],), ''),
1075 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1076 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1077 ((['git', 'commit', '-m',
1078 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001079 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001080 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1081 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1082 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001083 repo_url),
1084
1085 ((['git', 'config', 'remote.origin.url'],), repo_url),
1086 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1087 git_numberer_enabled),
1088
1089 # Auto-rebase init.
1090 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1091 ]
1092 # Auto-rebase loops.
1093 for attempt in xrange(fail_push_count + 1):
1094 self.calls += [
1095 # Auto-rebase loop start.
1096 ((['git', 'retry', 'fetch', 'origin',
1097 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1098 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1099 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1100 # different in each loop iteration for truly realistic test.
1101 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1102 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1103 callError(1, 'failed to cherry pick') if fail_cherry_pick
1104 else ''),
1105 ]
1106 if fail_cherry_pick:
1107 return
1108
1109 if git_numberer_enabled:
1110 assert parent_msg
1111 self.calls += [
1112 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1113 parent_msg),
1114 ]
1115 if fail_after_parent_msg:
1116 return
1117 assert new_msg
1118 self.calls += [
1119 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1120 '1480022355'), # Committer's unix timestamp.
1121 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1122 '1480024000'),
1123 ((['git_amend_head committer timestamp', 1480024000],), ''),
1124 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1125 ]
1126 self.calls += [
1127 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1128 CERR1 if attempt < fail_push_count else ''),
1129 ]
1130 # End of autorebase + push.
1131
1132 self.calls += [
1133 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1134 ]
1135 if git_numberer_enabled:
1136 self.calls += [
1137 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1138 ]
1139
1140 # Cleanup calls.
1141 self.calls += [
1142 ((['git', 'checkout', '-q', 'feature'],), ''),
1143 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1144 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001145 ]
1146
1147 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001148 self._land_rietveld_calls(
1149 repo_url='https://chromium.googlesource.com/infra/infra',
1150 git_numberer_enabled=False,
1151 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001152 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001153 ((['git', 'config', 'rietveld.viewvc-url'],),
1154 'https://chromium.googlesource.com/infra/infra/+/'),
1155 ((['update_description', 123,
1156 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001157 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001158 ''),
1159 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001160 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001161 ]
1162 git_cl.main(['land'])
1163
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001164 def test_land_rietveld_fail_cherry_pick(self):
1165 self._land_rietveld_calls(
1166 repo_url='https://chromium.googlesource.com/infra/infra',
1167 git_numberer_enabled=False,
1168 fail_cherry_pick=True,
1169 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001170 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001171 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1172 'U path/file1\n'
1173 'U file2.cpp\n'),
1174 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001175 ((['git', 'checkout', '-q', 'feature'],), ''),
1176 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001177 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1178 ]
1179 git_cl.main(['land'])
1180
1181 def test_land_rietveld_git_numberer_fail_1_push(self):
1182 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1183
1184 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1185 self._land_rietveld_calls(
1186 repo_url='https://chromium.googlesource.com/chromium/src',
1187 git_numberer_enabled=True,
1188 parent_msg=('This is parent commit.\n'
1189 '\n'
1190 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1191 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1192 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1193 '\n'
1194 'Review-Url: https://codereview.chromium.org/123 .\n'
1195 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1196 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1197 fail_push_count=fail_push_count,
1198 debug=False)
1199
1200 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001201 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001202 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001203 ((['update_description', 123,
1204 'Issue: 123\n\nR=john@chromium.org\n'
1205 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001206 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001207 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1208 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1209 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001210 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001211 ''),
1212 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001213 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001214 ]
1215 git_cl.main(['land'])
1216
1217 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001218 self._land_rietveld_calls(
1219 repo_url='https://chromium.googlesource.com/v8/v8',
1220 git_numberer_enabled=True,
1221 parent_msg='This is parent commit with no footer.',
1222 fail_after_parent_msg=True,
1223 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001224 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001225 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001226 ((['git', 'checkout', '-q', 'feature'],), ''),
1227 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001228 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001229 ]
1230 with self.assertRaises(ValueError) as cm:
1231 git_cl.main(['land'])
1232 self.assertEqual(cm.exception.message,
1233 'Unable to infer commit position from footers')
1234
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001235 def test_git_numberer_not_whitelisted_repo(self):
1236 self.calls = []
1237 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001238 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1239 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001240 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001241
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001242 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001243 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1244 self.calls = [
1245 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001246 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001247 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001248 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001249 remote_url='https://chromium.googlesource.com/chromium/src',
1250 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001251 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001252
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001253 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001254 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001255 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001256 def fake_temporary_directory(**kwargs):
1257 yield tempdir
1258 self.mock(git_cl.gclient_utils, 'temporary_directory',
1259 fake_temporary_directory)
1260 self._test_GitNumbererState_valid_configs_inner(tempdir)
1261
1262 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001263 self.calls = [
1264 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001265 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001266 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1267 '''
1268 [plugin "git-numberer"]
1269 validate-enabled-refglob = refs/else/*
1270 validate-enabled-refglob = refs/heads/*
1271 validate-disabled-refglob = refs/heads/disabled
1272 validate-disabled-refglob = refs/branch-heads/*
1273 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001274 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1275 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001276 'refs/else/*\n'
1277 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001278 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1279 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001280 'refs/heads/disabled\n'
1281 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001282 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001283
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001284 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001285 remote_url='https://chromium.googlesource.com/chromium/src',
1286 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001287 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001288
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001289 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001290 remote_url='https://chromium.googlesource.com/chromium/src',
1291 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001292 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001293
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001294 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001295 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001296 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001297 remote_url='https://chromium.googlesource.com/chromium/src',
1298 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001299 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001300
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001301 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001302 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001303 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001304 if skip_auth_check:
1305 return [((cmd, ), 'true')]
1306
tandrii5d48c322016-08-18 16:19:37 -07001307 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001308 if issue:
1309 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001310 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001311 ])
1312 calls.extend([
1313 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1314 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1315 ((['git', 'config', 'remote.origin.url'],),
1316 'https://chromium.googlesource.com/my/repo'),
1317 ((['git', 'config', 'remote.origin.url'],),
1318 'https://chromium.googlesource.com/my/repo'),
1319 ])
1320 return calls
1321
1322 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001323 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001324 fetched_status=None, other_cl_owner=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001325 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001326 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001327 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001328 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001329 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001330 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1331 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001332 ]
1333 calls += cls._is_gerrit_calls(True)
1334 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001335 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001336 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1337 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001338 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001339 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001340 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001341 ((['get_or_create_merge_base', 'master',
1342 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001343 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001344 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001345 ]
1346 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1347
1348 if issue:
1349 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001350 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001351 '123456',
1352 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001353 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001354 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001355 'change_id': '123456789',
1356 'current_revision': 'sha1_of_current_revision',
1357 'revisions': { 'sha1_of_current_revision': {
1358 'commit': {'message': fetched_description},
1359 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001360 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001361 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001362 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001363 if fetched_status == 'ABANDONED':
1364 calls += [
1365 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1366 '123456 has been abandoned, new uploads are not '
1367 'allowed'), SystemExitMock()),
1368 ]
1369 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001370 if other_cl_owner:
1371 calls += [
1372 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1373 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001374
1375 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1376 get_remote_branch=False)
1377 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001378 ((['git', 'rev-parse', '--show-cdup'],), ''),
1379 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001380
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001381 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001382 'diff', '--name-status', '--no-renames', '-r',
1383 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001384 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001385 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001386 ]
1387
1388 if not issue:
1389 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001390 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001391 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001392 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001393 ]
1394
1395 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001396 ((['git', 'config', 'user.email'],), 'me@example.com'),
1397 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001398 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1399 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001400 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001401 ]
1402 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001403
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001404 @classmethod
1405 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001406 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001407 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001408 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001409 post_amend_description=None, issue=None, cc=None,
1410 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001411 if post_amend_description is None:
1412 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001413 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001414 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001415
tandriia60502f2016-06-20 02:01:53 -07001416 if squash_mode == 'default':
1417 calls.extend([
1418 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1419 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1420 ])
1421 elif squash_mode in ('override_squash', 'override_nosquash'):
1422 calls.extend([
1423 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1424 'true' if squash_mode == 'override_squash' else 'false'),
1425 ])
1426 else:
1427 assert squash_mode in ('squash', 'nosquash')
1428
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001429 # If issue is given, then description is fetched from Gerrit instead.
1430 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001431 calls += [
1432 ((['git', 'log', '--pretty=format:%s\n\n%b',
1433 'fake_ancestor_sha..HEAD'],),
1434 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001435 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001436 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001437 else:
1438 if not title:
1439 calls += [
1440 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001441 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001442 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001443 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001444 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001445 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001446 # DownloadGerritHook(False)
1447 ((False, ),
1448 ''),
1449 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001450 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001451 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001452 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001453 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001454 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001455 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001456 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001457 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001458 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001459 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001460 if not issue:
1461 # Prompting to edit description on first upload.
1462 calls += [
1463 ((['git', 'config', 'core.editor'],), ''),
1464 ((['RunEditor'],), description),
1465 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001466 ref_to_push = 'abcdef0123456789'
1467 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001468 ((['git', 'config', 'branch.master.merge'],),
1469 'refs/heads/master'),
1470 ((['git', 'config', 'branch.master.remote'],),
1471 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001472 ((['get_or_create_merge_base', 'master',
1473 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001474 'origin/master'),
1475 ((['git', 'rev-parse', 'HEAD:'],),
1476 '0123456789abcdef'),
1477 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001478 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001479 ref_to_push),
1480 ]
1481 else:
1482 ref_to_push = 'HEAD'
1483
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001484 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001485 ((['git', 'rev-list',
1486 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001487 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001488
Aaron Gable9b713dd2016-12-14 16:04:21 -08001489 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001490 if ref_suffix:
1491 ref_suffix += ',m=' + title
1492 else:
1493 ref_suffix = '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001494
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001495 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1496 if ref_suffix:
1497 ref_suffix += ',' + notify_suffix
1498 else:
1499 ref_suffix = '%' + notify_suffix
1500
1501 if reviewers:
1502 ref_suffix += ',' + ','.join('r=%s' % email
1503 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001504
1505 if git_mirror is None:
1506 calls += [
1507 ((['git', 'config', 'remote.origin.url'],),
1508 'https://chromium.googlesource.com/yyy/zzz'),
1509 ]
1510 else:
1511 calls += [
1512 ((['git', 'config', 'remote.origin.url'],),
1513 '/cache/this-dir-exists'),
1514 (('os.path.isdir', '/cache/this-dir-exists'),
1515 True),
1516 # Runs in /cache/this-dir-exists.
1517 ((['git', 'config', 'remote.origin.url'],),
1518 'https://chromium.googlesource.com/yyy/zzz'),
1519 ]
1520
ukai@chromium.orge8077812012-02-03 03:41:46 +00001521 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001522 ((['git', 'push',
1523 'https://chromium.googlesource.com/yyy/zzz',
1524 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001525 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001526 'remote: Processing changes: (\)\n'
1527 'remote: Processing changes: (|)\n'
1528 'remote: Processing changes: (/)\n'
1529 'remote: Processing changes: (-)\n'
1530 'remote: Processing changes: new: 1 (/)\n'
1531 'remote: Processing changes: new: 1, done\n'
1532 'remote:\n'
1533 'remote: New Changes:\n'
1534 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1535 'remote:\n'
1536 'To https://chromium.googlesource.com/yyy/zzz\n'
1537 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001538 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001539 if squash:
1540 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001541 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001542 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001543 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001544 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001545 ((['git', 'config', 'branch.master.gerritsquashhash',
1546 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001547 ]
tandrii88189772016-09-29 04:29:57 -07001548 calls += [
1549 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001550 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001551 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001552 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001553 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001554 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001555 return calls
1556
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001557 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001558 self,
1559 upload_args,
1560 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001561 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001562 squash=True,
1563 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001564 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001565 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001566 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001567 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001568 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001569 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001570 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001571 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001572 fetched_status=None,
1573 other_cl_owner=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001574 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001575 if squash_mode is None:
1576 if '--no-squash' in upload_args:
1577 squash_mode = 'nosquash'
1578 elif '--squash' in upload_args:
1579 squash_mode = 'squash'
1580 else:
1581 squash_mode = 'default'
1582
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001583 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001584 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001585 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001586 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001587 CookiesAuthenticatorMockFactory(
1588 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001589 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1590 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001591 self.mock(git_cl.gclient_utils, 'RunEditor',
1592 lambda *_, **__: self._mocked_call(['RunEditor']))
1593 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1594
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001595 original_os_path_isdir = os.path.isdir
1596 def selective_os_path_isdir_mock(path):
1597 if path == '/cache/this-dir-exists':
1598 return self._mocked_call('os.path.isdir', path)
1599 return original_os_path_isdir(path)
1600 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1601
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001602 self.calls = self._gerrit_base_calls(
1603 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001604 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001605 fetched_status=fetched_status,
1606 other_cl_owner=other_cl_owner)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001607 if fetched_status != 'ABANDONED':
1608 self.calls += self._gerrit_upload_calls(
1609 description, reviewers, squash,
1610 squash_mode=squash_mode,
1611 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001612 ref_suffix=ref_suffix, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001613 post_amend_description=post_amend_description,
1614 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001615 # Uncomment when debugging.
1616 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001617 git_cl.main(['upload'] + upload_args)
1618
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001619 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001620 self._run_gerrit_upload_test(
1621 ['--no-squash'],
1622 'desc\n\nBUG=\n',
1623 [],
1624 squash=False,
1625 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1626
1627 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001628 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001629 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001630 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001631 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001632 [],
tandriia60502f2016-06-20 02:01:53 -07001633 squash=False,
1634 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001635 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001636
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001637 def test_gerrit_no_reviewer(self):
1638 self._run_gerrit_upload_test(
1639 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001640 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001641 [],
1642 squash=False,
1643 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001644
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001645 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001646 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1647 self._run_gerrit_upload_test(
1648 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1649 'desc\n\nBUG=\n\nChange-Id: I123456789',
1650 squash=False,
1651 squash_mode='override_nosquash',
1652 title='Dont_put_bad_chars')
1653 self.assertIn(
1654 'WARNING: Patchset title may only contain alphanumeric chars '
1655 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1656 'Cleaned up title: Dont put bad chars\n',
1657 git_cl.sys.stdout.getvalue())
1658
ukai@chromium.orge8077812012-02-03 03:41:46 +00001659 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001660 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001661 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001662 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001663 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001664 squash=False,
1665 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001666 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001667
1668 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001669 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001670 [],
bradnelsond975b302016-10-23 12:20:23 -07001671 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1672 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001673 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001674 ['reviewer@example.com', 'another@example.com'],
1675 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001676 squash_mode='override_nosquash',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001677 ref_suffix='%l=Code-Review+1',
bradnelsond975b302016-10-23 12:20:23 -07001678 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001679
1680 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001681 self._run_gerrit_upload_test(
1682 [],
1683 'desc\nBUG=\n\nChange-Id: 123456789',
1684 [],
1685 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001686
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001687 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001688 self._run_gerrit_upload_test(
1689 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001690 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001691 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001692 squash=True,
1693 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001694
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001695 def test_gerrit_upload_squash_first_with_mirror(self):
1696 self._run_gerrit_upload_test(
1697 ['--squash'],
1698 'desc\nBUG=\n\nChange-Id: 123456789',
1699 [],
1700 squash=True,
1701 expected_upstream_ref='origin/master',
1702 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1703
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001704 def test_gerrit_upload_squash_reupload(self):
1705 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001706 self._run_gerrit_upload_test(
1707 ['--squash'],
1708 description,
1709 [],
1710 squash=True,
1711 expected_upstream_ref='origin/master',
1712 issue=123456)
1713
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001714 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1715 self.mock(git_cl, 'DieWithError',
1716 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1717 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1718 with self.assertRaises(SystemExitMock):
1719 self._run_gerrit_upload_test(
1720 ['--squash'],
1721 description,
1722 [],
1723 squash=True,
1724 expected_upstream_ref='origin/master',
1725 issue=123456,
1726 fetched_status='ABANDONED')
1727
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001728 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1729 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1730 lambda *_, **__: {'email': 'yet-another@example.com'})
1731 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1732 self._run_gerrit_upload_test(
1733 ['--squash'],
1734 description,
1735 [],
1736 squash=True,
1737 expected_upstream_ref='origin/master',
1738 issue=123456,
1739 other_cl_owner='other@example.com')
1740 self.assertIn(
1741 'WARNING: change 123456 is owned by other@example.com, but you '
1742 'authenticate to Gerrit as yet-another@example.com.\n'
1743 'Uploading may fail due to lack of permissions',
1744 git_cl.sys.stdout.getvalue())
1745
rmistry@google.com2dd99862015-06-22 12:22:18 +00001746 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001747 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001748 def mock_run_git(*args, **_kwargs):
1749 if args[0] == ['for-each-ref',
1750 '--format=%(refname:short) %(upstream:short)',
1751 'refs/heads']:
1752 # Create a local branch dependency tree that looks like this:
1753 # test1 -> test2 -> test3 -> test4 -> test5
1754 # -> test3.1
1755 # test6 -> test0
1756 branch_deps = [
1757 'test2 test1', # test1 -> test2
1758 'test3 test2', # test2 -> test3
1759 'test3.1 test2', # test2 -> test3.1
1760 'test4 test3', # test3 -> test4
1761 'test5 test4', # test4 -> test5
1762 'test6 test0', # test0 -> test6
1763 'test7', # test7
1764 ]
1765 return '\n'.join(branch_deps)
1766 self.mock(git_cl, 'RunGit', mock_run_git)
1767
1768 class RecordCalls:
1769 times_called = 0
1770 record_calls = RecordCalls()
1771 def mock_CMDupload(*args, **_kwargs):
1772 record_calls.times_called += 1
1773 return 0
1774 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1775
1776 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001777 (('ask_for_data', 'This command will checkout all dependent branches '
1778 'and run "git cl upload". Press Enter to continue, '
1779 'or Ctrl+C to abort'), ''),
1780 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001781
1782 class MockChangelist():
1783 def __init__(self):
1784 pass
1785 def GetBranch(self):
1786 return 'test1'
1787 def GetIssue(self):
1788 return '123'
1789 def GetPatchset(self):
1790 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001791 def IsGerrit(self):
1792 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001793
1794 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1795 # CMDupload should have been called 5 times because of 5 dependent branches.
1796 self.assertEquals(5, record_calls.times_called)
1797 self.assertEquals(0, ret)
1798
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001799 def test_gerrit_change_id(self):
1800 self.calls = [
1801 ((['git', 'write-tree'], ),
1802 'hashtree'),
1803 ((['git', 'rev-parse', 'HEAD~0'], ),
1804 'branch-parent'),
1805 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1806 'A B <a@b.org> 1456848326 +0100'),
1807 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1808 'C D <c@d.org> 1456858326 +0100'),
1809 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1810 'hashchange'),
1811 ]
1812 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1813 self.assertEqual(change_id, 'Ihashchange')
1814
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001815 def test_desecription_append_footer(self):
1816 for init_desc, footer_line, expected_desc in [
1817 # Use unique desc first lines for easy test failure identification.
1818 ('foo', 'R=one', 'foo\n\nR=one'),
1819 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1820 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1821 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1822 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1823 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1824 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1825 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1826 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1827 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1828 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1829 ]:
1830 desc = git_cl.ChangeDescription(init_desc)
1831 desc.append_footer(footer_line)
1832 self.assertEqual(desc.description, expected_desc)
1833
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001834 def test_update_reviewers(self):
1835 data = [
1836 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001837 ('foo\nR=xx', [], 'foo\nR=xx'),
1838 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001839 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001840 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1841 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1842 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001843 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001844 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001845 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001846 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1847 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1848 # Same as the line before, but full of whitespaces.
1849 (
1850 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1851 'foo\nBar\n\nR=c@c\n BUG =',
1852 ),
1853 # Whitespaces aren't interpreted as new lines.
1854 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001855 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001856 expected = [i[2] for i in data]
1857 actual = []
1858 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001859 obj = git_cl.ChangeDescription(orig)
1860 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001861 actual.append(obj.description)
1862 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001863
wittman@chromium.org455dc922015-01-26 20:15:50 +00001864 def test_get_target_ref(self):
1865 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001866 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001867 self.assertEqual(None, git_cl.GetTargetRef(None,
1868 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001869 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001870
wittman@chromium.org455dc922015-01-26 20:15:50 +00001871 # Check default target refs for branches.
1872 self.assertEqual('refs/heads/master',
1873 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001874 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001875 self.assertEqual('refs/heads/master',
1876 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001877 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001878 self.assertEqual('refs/heads/master',
1879 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001880 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001881 self.assertEqual('refs/branch-heads/123',
1882 git_cl.GetTargetRef('origin',
1883 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001884 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001885 self.assertEqual('refs/diff/test',
1886 git_cl.GetTargetRef('origin',
1887 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001888 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001889 self.assertEqual('refs/heads/chrome/m42',
1890 git_cl.GetTargetRef('origin',
1891 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001892 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001893
1894 # Check target refs for user-specified target branch.
1895 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1896 'refs/remotes/branch-heads/123'):
1897 self.assertEqual('refs/branch-heads/123',
1898 git_cl.GetTargetRef('origin',
1899 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001900 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001901 for branch in ('origin/master', 'remotes/origin/master',
1902 'refs/remotes/origin/master'):
1903 self.assertEqual('refs/heads/master',
1904 git_cl.GetTargetRef('origin',
1905 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001906 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001907 for branch in ('master', 'heads/master', 'refs/heads/master'):
1908 self.assertEqual('refs/heads/master',
1909 git_cl.GetTargetRef('origin',
1910 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001911 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001912
wychen@chromium.orga872e752015-04-28 23:42:18 +00001913 def test_patch_when_dirty(self):
1914 # Patch when local tree is dirty
1915 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1916 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1917
1918 def test_diff_when_dirty(self):
1919 # Do 'git cl diff' when local tree is dirty
1920 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1921 self.assertNotEqual(git_cl.main(['diff']), 0)
1922
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001923 @staticmethod
1924 def _get_gerrit_codereview_server_calls(branch, value=None,
1925 git_short_host='host',
1926 detect_branch=True):
1927 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1928
1929 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1930 """
1931 calls = []
1932 if detect_branch:
1933 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1934 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1935 CERR1 if value is None else value))
1936 if value is None:
1937 calls += [
1938 ((['git', 'config', 'branch.' + branch + '.merge'],),
1939 'refs/heads' + branch),
1940 ((['git', 'config', 'branch.' + branch + '.remote'],),
1941 'origin'),
1942 ((['git', 'config', 'remote.origin.url'],),
1943 'https://%s.googlesource.com/my/repo' % git_short_host),
1944 ]
1945 return calls
1946
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001947 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001948 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001949 detect_gerrit_server=True,
1950 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001951 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001952 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1953 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001954 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001955 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001956 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1957
tandriidf09a462016-08-18 16:23:55 -07001958 if new_branch:
1959 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1960 else:
1961 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001962
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001963 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001964 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001965 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001966 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001967 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1968 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1969 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1970 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001971 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001972 if default_codereview == 'gerrit':
1973 if not force_codereview:
1974 self.calls += [
1975 ((['git', 'config', 'gerrit.host'],), 'true'),
1976 ]
1977 if detect_gerrit_server:
1978 self.calls += self._get_gerrit_codereview_server_calls(
1979 'master', git_short_host=git_short_host,
1980 detect_branch=not new_branch and force_codereview)
1981 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001982
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001983 elif default_codereview == 'rietveld':
1984 self.calls += [
1985 ((['git', 'config', 'gerrit.host'],), CERR1),
1986 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1987 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
1988 ]
1989 actual_codereview = 'rietveld'
1990
1991 if actual_codereview == 'rietveld':
1992 self.calls += [
1993 ((['git', 'rev-parse', '--show-cdup'],), ''),
1994 ]
1995 if not default_codereview:
1996 self.calls += [
1997 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1998 ]
1999 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002000 self.calls += [
2001 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002002 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002003 {
2004 'current_revision': '7777777777',
2005 'revisions': {
2006 '1111111111': {
2007 '_number': 1,
2008 'fetch': {'http': {
2009 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2010 'ref': 'refs/changes/56/123456/1',
2011 }},
2012 },
2013 '7777777777': {
2014 '_number': 7,
2015 'fetch': {'http': {
2016 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2017 'ref': 'refs/changes/56/123456/7',
2018 }},
2019 },
2020 },
2021 }),
2022 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002023
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002024 def _common_patch_rietveld_successful(self, **kwargs):
2025 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002026 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002027 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002028 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002029 ((['git', 'config', 'branch.master.rietveldserver',
2030 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002031 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002032 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002033 ((['git', 'commit', '-m',
2034 'Description\n\n' +
2035 'patch from issue 123456 at patchset 60001 ' +
2036 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002037 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002038
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002039 def test_patch_rietveld_default(self):
2040 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002041 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2042
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002043 def test_patch_rietveld_successful_new_branch(self):
2044 self._common_patch_rietveld_successful(default_codereview='rietveld',
2045 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002046 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2047
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002048 def test_patch_rietveld_guess_by_url(self):
2049 self._common_patch_rietveld_successful(
2050 default_codereview=None, # It doesn't matter.
2051 actual_codereview='rietveld')
2052 self.assertEqual(git_cl.main(
2053 ['patch', 'https://codereview.example.com/123456']), 0)
2054
2055 def test_patch_rietveld_conflict(self):
2056 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002057 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002058 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002059
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002060 def test_patch_gerrit_default(self):
2061 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002062 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002063 self.calls += [
2064 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2065 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002066 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002067 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002068 ((['git', 'config', 'branch.master.gerritserver',
2069 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002070 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002071 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002072 ]
2073 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2074
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002075 def test_patch_gerrit_force(self):
2076 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002077 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002078 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002079 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002080 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002081 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002082 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002083 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002084 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002085 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002086 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002087 ]
2088 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2089
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002090 def test_patch_gerrit_guess_by_url(self):
2091 self._patch_common(
2092 default_codereview=None, # It doesn't matter what's default.
2093 actual_codereview='gerrit',
2094 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002095 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002096 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002097 'refs/changes/56/123456/1'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002098 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002099 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002100 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002101 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002102 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002103 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002104 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002105 ]
2106 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002107 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002108
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002109 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2110 self._patch_common(
2111 default_codereview=None, # It doesn't matter what's default.
2112 actual_codereview='gerrit',
2113 git_short_host='else', detect_gerrit_server=False)
2114 self.calls += [
2115 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2116 'refs/changes/56/123456/1'],), ''),
2117 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2118 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2119 ''),
2120 ((['git', 'config', 'branch.master.gerritserver',
2121 'https://else-review.googlesource.com'],), ''),
2122 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2123 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2124 ]
2125 self.assertEqual(git_cl.main(
2126 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2127
2128 def test_patch_gerrit_conflict(self):
2129 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002130 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002131 self.calls += [
2132 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002133 'refs/changes/56/123456/7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002134 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2135 ''),
2136 ((['git', 'config', 'branch.master.gerritserver',
2137 'https://chromium-review.googlesource.com'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002138 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002139 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2140 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2141 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002142 ]
2143 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002144 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002145
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002146 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002147 def notExists(_issue, *_, **kwargs):
2148 self.assertFalse(kwargs['ignore_404'])
2149 raise git_cl.gerrit_util.GerritError(404, '')
2150 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2151
tandriic2405f52016-10-10 08:13:15 -07002152 self.calls = [
2153 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2154 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2155 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2156 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2157 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2158 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002159 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2160 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2161 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2162 ((['git', 'config', 'remote.origin.url'],),
2163 'https://chromium.googlesource.com/my/repo'),
2164 ((['DieWithError',
2165 'change 123456 at https://chromium-review.googlesource.com does not '
2166 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002167 ]
2168 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002169 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002170
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002171 def _checkout_calls(self):
2172 return [
2173 ((['git', 'config', '--local', '--get-regexp',
2174 'branch\\..*\\.rietveldissue'], ),
2175 ('branch.retrying.rietveldissue 1111111111\n'
2176 'branch.some-fix.rietveldissue 2222222222\n')),
2177 ((['git', 'config', '--local', '--get-regexp',
2178 'branch\\..*\\.gerritissue'], ),
2179 ('branch.ger-branch.gerritissue 123456\n'
2180 'branch.gbranch654.gerritissue 654321\n')),
2181 ]
2182
2183 def test_checkout_gerrit(self):
2184 """Tests git cl checkout <issue>."""
2185 self.calls = self._checkout_calls()
2186 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2187 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2188
2189 def test_checkout_rietveld(self):
2190 """Tests git cl checkout <issue>."""
2191 self.calls = self._checkout_calls()
2192 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2193 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2194
2195 def test_checkout_not_found(self):
2196 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002197 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002198 self.calls = self._checkout_calls()
2199 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2200
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002201 def test_checkout_no_branch_issues(self):
2202 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002203 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002204 self.calls = [
2205 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002206 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002207 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002208 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002209 ]
2210 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2211
tandrii@chromium.org28253532016-04-14 13:46:56 +00002212 def _test_gerrit_ensure_authenticated_common(self, auth,
2213 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002214 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2215 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2216 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002217 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002218 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002219 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002220 cl.branch = 'master'
2221 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002222 cl.lookedup_issue = True
2223 return cl
2224
2225 def test_gerrit_ensure_authenticated_missing(self):
2226 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002227 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002228 })
2229 self.calls.append(
2230 ((['DieWithError',
2231 'Credentials for the following hosts are required:\n'
2232 ' chromium-review.googlesource.com\n'
2233 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002234 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002235 'https://chromium-review.googlesource.com/new-password'],), ''),)
2236 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2237
2238 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002239 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002240 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002241 'chromium.googlesource.com':
2242 ('git-one.example.com', None, 'secret1'),
2243 'chromium-review.googlesource.com':
2244 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002245 })
2246 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002247 (('ask_for_data', 'If you know what you are doing '
2248 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002249 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2250
2251 def test_gerrit_ensure_authenticated_ok(self):
2252 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002253 'chromium.googlesource.com':
2254 ('git-same.example.com', None, 'secret'),
2255 'chromium-review.googlesource.com':
2256 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002257 })
2258 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2259
tandrii@chromium.org28253532016-04-14 13:46:56 +00002260 def test_gerrit_ensure_authenticated_skipped(self):
2261 cl = self._test_gerrit_ensure_authenticated_common(
2262 auth={}, skip_auth_check=True)
2263 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2264
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002265 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002266 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2267 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002268 self.calls = [
2269 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002270 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002271 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2272 ((['git', 'config', 'rietveld.server'],), ''),
2273 ((['git', 'config', 'rietveld.server'],), ''),
2274 ((['git', 'config', 'branch.feature.rietveldserver'],),
2275 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002276 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002277 ]
2278 self.assertEqual(0, git_cl.main(['set-commit']))
2279
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002280 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002281 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002282 lambda h, i, labels, notify=None:
2283 self._mocked_call(['SetReview', h, i, labels, notify]))
2284
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002285 self.calls = [
2286 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002287 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2288 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002289 ((['git', 'config', 'branch.feature.gerritserver'],),
2290 'https://chromium-review.googlesource.com'),
2291 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002292 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002293 ]
tandriid9e5ce52016-07-13 02:32:59 -07002294
2295 def test_cmd_set_commit_gerrit_clear(self):
2296 self._cmd_set_commit_gerrit_common(0)
2297 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2298
2299 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002300 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002301 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2302
tandriid9e5ce52016-07-13 02:32:59 -07002303 def test_cmd_set_commit_gerrit(self):
2304 self._cmd_set_commit_gerrit_common(2)
2305 self.assertEqual(0, git_cl.main(['set-commit']))
2306
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002307 def test_description_display(self):
2308 out = StringIO.StringIO()
2309 self.mock(git_cl.sys, 'stdout', out)
2310
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002311 self.mock(git_cl, 'Changelist', ChangelistMock)
2312 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002313
2314 self.assertEqual(0, git_cl.main(['description', '-d']))
2315 self.assertEqual('foo\n', out.getvalue())
2316
2317 def test_description_rietveld(self):
2318 out = StringIO.StringIO()
2319 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002320 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002321
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002322 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002323 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002324 self.assertEqual('foobar\n', out.getvalue())
2325
iannucci3c972b92016-08-17 13:24:10 -07002326 def test_StatusFieldOverrideIssueMissingArgs(self):
2327 out = StringIO.StringIO()
2328 self.mock(git_cl.sys, 'stderr', out)
2329
2330 try:
2331 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2332 except SystemExit as ex:
2333 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002334 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002335
2336 out = StringIO.StringIO()
2337 self.mock(git_cl.sys, 'stderr', out)
2338
2339 try:
2340 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2341 except SystemExit as ex:
2342 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002343 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002344
2345 def test_StatusFieldOverrideIssue(self):
2346 out = StringIO.StringIO()
2347 self.mock(git_cl.sys, 'stdout', out)
2348
2349 def assertIssue(cl_self, *_args):
2350 self.assertEquals(cl_self.issue, 1)
2351 return 'foobar'
2352
2353 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2354 self.calls = [
2355 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2356 ((['git', 'config', 'rietveld.server'],), ''),
2357 ((['git', 'config', 'rietveld.server'],), ''),
2358 ]
iannuccie53c9352016-08-17 14:40:40 -07002359 self.assertEqual(
2360 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2361 0)
iannucci3c972b92016-08-17 13:24:10 -07002362 self.assertEqual(out.getvalue(), 'foobar\n')
2363
iannuccie53c9352016-08-17 14:40:40 -07002364 def test_SetCloseOverrideIssue(self):
2365 def assertIssue(cl_self, *_args):
2366 self.assertEquals(cl_self.issue, 1)
2367 return 'foobar'
2368
2369 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2370 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2371 self.calls = [
2372 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2373 ((['git', 'config', 'rietveld.server'],), ''),
2374 ((['git', 'config', 'rietveld.server'],), ''),
2375 ]
2376 self.assertEqual(
2377 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2378
2379 def test_SetCommitOverrideIssue(self):
2380 def assertIssue(cl_self, *_args):
2381 self.assertEquals(cl_self.issue, 1)
2382 return 'foobar'
2383
2384 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2385 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2386 self.calls = [
2387 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2388 ((['git', 'config', 'rietveld.server'],), ''),
2389 ((['git', 'config', 'rietveld.server'],), ''),
2390 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2391 ((['git', 'config', 'rietveld.server'],), ''),
2392 ((['git', 'config', 'rietveld.server'],), ''),
2393 ]
2394 self.assertEqual(
2395 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2396
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002397 def test_description_gerrit(self):
2398 out = StringIO.StringIO()
2399 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002400 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002401 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002402 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2403 {
2404 'current_revision': 'sha1',
2405 'revisions': {'sha1': {
2406 'commit': {'message': 'foobar'},
2407 }},
2408 }),
2409 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002410 self.assertEqual(0, git_cl.main([
2411 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2412 self.assertEqual('foobar\n', out.getvalue())
2413
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002414 def test_description_set_raw(self):
2415 out = StringIO.StringIO()
2416 self.mock(git_cl.sys, 'stdout', out)
2417
2418 self.mock(git_cl, 'Changelist', ChangelistMock)
2419 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2420
2421 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2422 self.assertEqual('hihi', ChangelistMock.desc)
2423
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002424 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002425 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002426
2427 def RunEditor(desc, _, **kwargs):
2428 self.assertEquals(
2429 '# Enter a description of the change.\n'
2430 '# This will be displayed on the codereview site.\n'
2431 '# The first line will also be used as the subject of the review.\n'
2432 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002433 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002434 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002435 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002436 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002437 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002438
dsansomee2d6fd92016-09-08 00:10:47 -07002439 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002440 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002441
2442 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2443 self.mock(git_cl.Changelist, 'GetDescription',
2444 lambda *args: current_desc)
2445 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2446 UpdateDescriptionRemote)
2447 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2448
2449 self.calls = [
2450 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002451 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002452 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2453 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002454 ((['git', 'config', 'core.editor'],), 'vi'),
2455 ]
2456 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2457
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002458 def test_description_set_stdin(self):
2459 out = StringIO.StringIO()
2460 self.mock(git_cl.sys, 'stdout', out)
2461
2462 self.mock(git_cl, 'Changelist', ChangelistMock)
2463 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2464
2465 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2466 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2467
kmarshall3bff56b2016-06-06 18:31:47 -07002468 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002469 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2470
kmarshall3bff56b2016-06-06 18:31:47 -07002471 self.calls = \
2472 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2473 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002474 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002475 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2476 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002477 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2478 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2479 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002480 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2481 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2482 ((['git', 'branch', '-D', 'foo'],), '')]
2483
kmarshall3bff56b2016-06-06 18:31:47 -07002484 self.mock(git_cl, 'get_cl_statuses',
2485 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002486 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2487 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2488 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002489
2490 self.assertEqual(0, git_cl.main(['archive', '-f']))
2491
2492 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002493 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002494 self.calls = \
2495 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2496 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002497 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002498 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2499 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002500 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2501
kmarshall9249e012016-08-23 12:02:16 -07002502 self.mock(git_cl, 'get_cl_statuses',
2503 lambda branches, fine_grained, max_processes:
2504 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2505
2506 self.assertEqual(1, git_cl.main(['archive', '-f']))
2507
2508 def test_archive_dry_run(self):
2509 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2510
2511 self.calls = \
2512 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2513 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2514 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2515 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2516 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2517 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2518 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2519 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2520 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002521
2522 self.mock(git_cl, 'get_cl_statuses',
2523 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002524 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2525 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2526 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002527
kmarshall9249e012016-08-23 12:02:16 -07002528 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2529
2530 def test_archive_no_tags(self):
2531 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2532
2533 self.calls = \
2534 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2535 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2536 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2537 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2538 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2539 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2540 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2541 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2542 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2543 ((['git', 'branch', '-D', 'foo'],), '')]
2544
2545 self.mock(git_cl, 'get_cl_statuses',
2546 lambda branches, fine_grained, max_processes:
2547 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2548 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2549 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2550
2551 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002552
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002553 def test_cmd_issue_erase_existing(self):
2554 out = StringIO.StringIO()
2555 self.mock(git_cl.sys, 'stdout', out)
2556 self.calls = [
2557 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002558 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2559 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002560 # Let this command raise exception (retcode=1) - it should be ignored.
2561 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002562 CERR1),
2563 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2564 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002565 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2566 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2567 ''),
2568 ]
2569 self.assertEqual(0, git_cl.main(['issue', '0']))
2570
phajdan.jre328cf92016-08-22 04:12:17 -07002571 def test_cmd_issue_json(self):
2572 out = StringIO.StringIO()
2573 self.mock(git_cl.sys, 'stdout', out)
2574 self.calls = [
2575 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002576 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002577 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2578 ((['git', 'config', 'rietveld.server'],),
2579 'https://codereview.chromium.org'),
2580 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2581 (('write_json', 'output.json',
2582 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2583 ''),
2584 ]
2585 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2586
tandriide281ae2016-10-12 06:02:30 -07002587 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002588 self.mock(git_cl.Changelist, 'GetChange',
2589 lambda _, *a: (
2590 self._mocked_call(['GetChange']+list(a))))
2591 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2592 lambda *_, **__: (
2593 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002594 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2595 lambda _, s: self._mocked_call(['SetCQState', s]))
2596 self.calls = [
2597 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002598 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002599 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2600 ((['git', 'config', 'rietveld.server'],),
2601 'https://codereview.chromium.org'),
2602 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2603 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2604 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2605 ((['get_or_create_merge_base', 'feature', 'feature'],),
2606 'fake_ancestor_sha'),
2607 ((['GetChange', 'fake_ancestor_sha', None], ),
2608 git_cl.presubmit_support.GitChange(
2609 '', '', '', '', '', '', '', '')),
2610 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2611 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002612 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2613 ]
2614 out = StringIO.StringIO()
2615 self.mock(git_cl.sys, 'stdout', out)
2616 self.assertEqual(0, git_cl.main(['try']))
2617 self.assertEqual(
2618 out.getvalue(),
2619 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2620
tandrii8c5a3532016-11-04 07:52:02 -07002621 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2622 self.mock(git_cl.Changelist, 'GetChange',
2623 lambda _, *a: (
2624 self._mocked_call(['GetChange']+list(a))))
2625 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2626 lambda *_, **__: (
2627 self._mocked_call(['DoGetTryMasters'])))
2628 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2629 lambda _, s: self._mocked_call(['SetCQState', s]))
2630
tandrii8c5a3532016-11-04 07:52:02 -07002631 self.calls = [
2632 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2633 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2634 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2635 ((['git', 'config', 'branch.feature.gerritserver'],),
2636 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002637 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2638 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2639 'project': 'depot_tools',
2640 'status': 'OPEN',
2641 'owner': {'email': 'owner@e.mail'},
2642 'revisions': {
2643 'deadbeaf': {
2644 '_number': 6,
2645 },
2646 'beeeeeef': {
2647 '_number': 7,
2648 'fetch': {'http': {
2649 'url': 'https://chromium.googlesource.com/depot_tools',
2650 'ref': 'refs/changes/56/123456/7'
2651 }},
2652 },
2653 },
2654 }),
tandrii8c5a3532016-11-04 07:52:02 -07002655 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2656 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2657 ((['get_or_create_merge_base', 'feature', 'feature'],),
2658 'fake_ancestor_sha'),
2659 ((['GetChange', 'fake_ancestor_sha', None], ),
2660 git_cl.presubmit_support.GitChange(
2661 '', '', '', '', '', '', '', '')),
2662 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2663 ((['DoGetTryMasters'], ), None),
2664 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2665 ]
2666 out = StringIO.StringIO()
2667 self.mock(git_cl.sys, 'stdout', out)
2668 self.assertEqual(0, git_cl.main(['try']))
2669 self.assertEqual(
2670 out.getvalue(),
2671 'scheduled CQ Dry Run on '
2672 'https://chromium-review.googlesource.com/123456\n')
2673
2674 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2675 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2676 lambda _: {
2677 'owner_email': 'owner@e.mail',
2678 'private': False,
2679 'closed': False,
2680 'project': 'depot_tools',
2681 'patchsets': [20001],
2682 })
tandriide281ae2016-10-12 06:02:30 -07002683 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2684 self.calls = [
2685 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2686 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2687 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2688 ((['git', 'config', 'rietveld.server'],),
2689 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002690 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002691 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002692 ]
2693
2694 def _buildbucket_retry(*_, **kw):
2695 # self.maxDiff = 10000
2696 body = json.loads(kw['body'])
2697 self.assertEqual(len(body['builds']), 1)
2698 build = body['builds'][0]
2699 params = json.loads(build.pop('parameters_json'))
2700 self.assertEqual(params, {
2701 u'builder_name': u'win',
2702 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2703 u'revision': None}],
2704 u'properties': {
2705 u'category': u'git_cl_try',
2706 u'issue': 123,
2707 u'key': u'val',
2708 u'json': [{u'a': 1}, None],
2709 u'master': u'tryserver.chromium',
2710 u'patch_project': u'depot_tools',
2711 u'patch_storage': u'rietveld',
2712 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002713 u'rietveld': u'https://codereview.chromium.org',
2714 }
2715 })
2716 self.assertEqual(build, {
2717 u'bucket': u'master.tryserver.chromium',
2718 u'client_operation_id': u'uuid4',
2719 u'tags': [u'builder:win',
2720 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002721 u'user_agent:git_cl_try',
2722 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002723 })
2724
2725 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2726
2727 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2728 self.assertEqual(0, git_cl.main([
2729 'try', '-m', 'tryserver.chromium', '-b', 'win',
2730 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2731 self.assertRegexpMatches(
2732 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002733 'Tried jobs on:\nBucket: master.tryserver.chromium')
2734
tandrii8c5a3532016-11-04 07:52:02 -07002735 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2736 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2737 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2738
tandrii8c5a3532016-11-04 07:52:02 -07002739 self.calls = [
2740 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2741 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2742 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2743 ((['git', 'config', 'branch.feature.gerritserver'],),
2744 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002745 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002746 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002747 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002748 'status': 'OPEN',
2749 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002750 'revisions': {
2751 'deadbeaf': {
2752 '_number': 6,
2753 },
2754 'beeeeeef': {
2755 '_number': 7,
2756 'fetch': {'http': {
2757 'url': 'https://chromium.googlesource.com/depot_tools',
2758 'ref': 'refs/changes/56/123456/7'
2759 }},
2760 },
2761 },
2762 }),
2763 ]
2764
2765 def _buildbucket_retry(*_, **kw):
2766 # self.maxDiff = 10000
2767 body = json.loads(kw['body'])
2768 self.assertEqual(len(body['builds']), 1)
2769 build = body['builds'][0]
2770 params = json.loads(build.pop('parameters_json'))
2771 self.assertEqual(params, {
2772 u'builder_name': u'win',
2773 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2774 u'revision': None}],
2775 u'properties': {
2776 u'category': u'git_cl_try',
2777 u'key': u'val',
2778 u'json': [{u'a': 1}, None],
2779 u'master': u'tryserver.chromium',
2780
2781 u'patch_gerrit_url':
2782 u'https://chromium-review.googlesource.com',
2783 u'patch_issue': 123456,
2784 u'patch_project': u'depot_tools',
2785 u'patch_ref': u'refs/changes/56/123456/7',
2786 u'patch_repository_url':
2787 u'https://chromium.googlesource.com/depot_tools',
2788 u'patch_set': 7,
2789 u'patch_storage': u'gerrit',
2790 }
2791 })
2792 self.assertEqual(build, {
2793 u'bucket': u'master.tryserver.chromium',
2794 u'client_operation_id': u'uuid4',
2795 u'tags': [
2796 u'builder:win',
2797 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2798 u'user_agent:git_cl_try',
2799 u'master:tryserver.chromium'],
2800 })
2801
2802 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2803
2804 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2805 self.assertEqual(0, git_cl.main([
2806 'try', '-m', 'tryserver.chromium', '-b', 'win',
2807 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2808 self.assertRegexpMatches(
2809 git_cl.sys.stdout.getvalue(),
2810 'Tried jobs on:\nBucket: master.tryserver.chromium')
2811
borenet6c0efe62016-10-19 08:13:29 -07002812 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002813 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2814 lambda _: {
2815 'owner_email': 'owner@e.mail',
2816 'private': False,
2817 'closed': False,
2818 'project': 'depot_tools',
2819 'patchsets': [20001],
2820 })
borenet6c0efe62016-10-19 08:13:29 -07002821 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2822 self.calls = [
2823 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2824 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2825 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2826 ((['git', 'config', 'rietveld.server'],),
2827 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002828 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002829 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002830 ]
2831
2832 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002833 body = json.loads(kw['body'])
2834 self.assertEqual(len(body['builds']), 1)
2835 build = body['builds'][0]
2836 params = json.loads(build.pop('parameters_json'))
2837 self.assertEqual(params, {
2838 u'builder_name': u'win',
2839 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2840 u'revision': None}],
2841 u'properties': {
2842 u'category': u'git_cl_try',
2843 u'issue': 123,
2844 u'patch_project': u'depot_tools',
2845 u'patch_storage': u'rietveld',
2846 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002847 u'rietveld': u'https://codereview.chromium.org',
2848 }
2849 })
2850 self.assertEqual(build, {
2851 u'bucket': u'test.bucket',
2852 u'client_operation_id': u'uuid4',
2853 u'tags': [u'builder:win',
2854 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2855 u'user_agent:git_cl_try'],
2856 })
2857
2858 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2859
2860 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2861 self.assertEqual(0, git_cl.main([
2862 'try', '-B', 'test.bucket', '-b', 'win']))
2863 self.assertRegexpMatches(
2864 git_cl.sys.stdout.getvalue(),
2865 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002866
qyearsley123a4682016-10-26 09:12:17 -07002867 def test_git_cl_try_bots_on_multiple_masters(self):
2868 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2869 self.calls = [
2870 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2871 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2872 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2873 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002874 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002875 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2876 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2877 ]
2878
2879 def _buildbucket_retry(*_, **kw):
2880 body = json.loads(kw['body'])
2881 self.assertEqual(len(body['builds']), 2)
2882
2883 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2884 self.assertEqual(first_build_params['builder_name'], 'builder1')
2885 self.assertEqual(first_build_params['properties']['master'], 'master1')
2886
2887 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2888 self.assertEqual(first_build_params['builder_name'], 'builder2')
2889 self.assertEqual(first_build_params['properties']['master'], 'master2')
2890
2891 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2892
2893 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2894 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2895
2896 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2897 self.assertEqual(
2898 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2899 self.assertEqual(
2900 git_cl.sys.stdout.getvalue(),
2901 'Tried jobs on:\n'
2902 'Bucket: master.master1\n'
2903 ' builder1: []\n'
2904 'Bucket: master.master2\n'
2905 ' builder2: []\n'
2906 'To see results here, run: git cl try-results\n'
2907 'To see results in browser, run: git cl web\n')
2908
tandrii16e0b4e2016-06-07 10:34:28 -07002909 def _common_GerritCommitMsgHookCheck(self):
2910 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2911 self.mock(git_cl.os.path, 'abspath',
2912 lambda path: self._mocked_call(['abspath', path]))
2913 self.mock(git_cl.os.path, 'exists',
2914 lambda path: self._mocked_call(['exists', path]))
2915 self.mock(git_cl.gclient_utils, 'FileRead',
2916 lambda path: self._mocked_call(['FileRead', path]))
2917 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2918 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2919 self.calls = [
2920 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2921 ((['abspath', '../'],), '/abs/git_repo_root'),
2922 ]
2923 return git_cl.Changelist(codereview='gerrit', issue=123)
2924
2925 def test_GerritCommitMsgHookCheck_custom_hook(self):
2926 cl = self._common_GerritCommitMsgHookCheck()
2927 self.calls += [
2928 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2929 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2930 '#!/bin/sh\necho "custom hook"')
2931 ]
2932 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2933
2934 def test_GerritCommitMsgHookCheck_not_exists(self):
2935 cl = self._common_GerritCommitMsgHookCheck()
2936 self.calls += [
2937 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2938 ]
2939 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2940
2941 def test_GerritCommitMsgHookCheck(self):
2942 cl = self._common_GerritCommitMsgHookCheck()
2943 self.calls += [
2944 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2945 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2946 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002947 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002948 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2949 ''),
2950 ]
2951 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2952
tandriic4344b52016-08-29 06:04:54 -07002953 def test_GerritCmdLand(self):
2954 self.calls += [
2955 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2956 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2957 'deadbeaf'),
2958 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2959 ((['git', 'config', 'branch.feature.gerritserver'],),
2960 'chromium-review.googlesource.com'),
2961 ]
2962 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2963 cl._codereview_impl._GetChangeDetail = lambda _: {
2964 'labels': {},
2965 'current_revision': 'deadbeaf',
2966 }
agable32978d92016-11-01 12:55:02 -07002967 cl._codereview_impl._GetChangeCommit = lambda: {
2968 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002969 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002970 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2971 }
tandriic4344b52016-08-29 06:04:54 -07002972 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002973 out = StringIO.StringIO()
2974 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002975 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002976 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002977 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002978
tandrii221ab252016-10-06 08:12:04 -07002979 BUILDBUCKET_BUILDS_MAP = {
2980 '9000': {
2981 'id': '9000',
2982 'status': 'STARTED',
2983 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2984 'result_details_json': '{"properties": {}}',
2985 'bucket': 'master.x.y',
2986 'created_by': 'user:someone@chromium.org',
2987 'created_ts': '147200002222000',
2988 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2989 },
2990 '8000': {
2991 'id': '8000',
2992 'status': 'COMPLETED',
2993 'result': 'FAILURE',
2994 'failure_reason': 'BUILD_FAILURE',
2995 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2996 'result_details_json': '{"properties": {}}',
2997 'bucket': 'master.x.y',
2998 'created_by': 'user:someone@chromium.org',
2999 'created_ts': '147200001111000',
3000 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3001 },
3002 }
3003
3004 def test_write_try_results_json(self):
3005 expected_output = [
3006 {
3007 'buildbucket_id': '8000',
3008 'bucket': 'master.x.y',
3009 'builder_name': 'my-builder',
3010 'status': 'COMPLETED',
3011 'result': 'FAILURE',
3012 'failure_reason': 'BUILD_FAILURE',
3013 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3014 },
3015 {
3016 'buildbucket_id': '9000',
3017 'bucket': 'master.x.y',
3018 'builder_name': 'my-builder',
3019 'status': 'STARTED',
3020 'result': None,
3021 'failure_reason': None,
3022 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3023 }
3024 ]
3025 self.calls = [(('write_json', 'output.json', expected_output), '')]
3026 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3027
tandrii45b2a582016-10-11 03:14:16 -07003028 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003029 out = StringIO.StringIO()
3030 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003031 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3032 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003033 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3034 self._mocked_call(['get_authenticator_for_host', host]))
3035 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3036 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003037
3038 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3039 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003040 self.calls += [
3041 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3042 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3043 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3044 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3045 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3046 ((['git', 'config', 'branch.feature.rietveldserver'],),
3047 'codereview.example.com'),
3048 ((['get_authenticator_for_host', 'codereview.example.com'],),
3049 AuthenticatorMock()),
3050 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3051
3052 def test_fetch_try_jobs_none_rietveld(self):
3053 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003054 # Simulate that user isn't logged in.
3055 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003056 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003057 self.assertRegexpMatches(sys.stdout.getvalue(),
3058 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003059 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3060
3061 def test_fetch_try_jobs_some_rietveld(self):
3062 self._setup_fetch_try_jobs_rietveld({
3063 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3064 })
3065 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003066 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3067 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3068 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3069
3070 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3071 self._setup_fetch_try_jobs(most_recent_patchset=13)
3072 self.calls += [
3073 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3074 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3075 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003076 # TODO(tandrii): Uncomment the below if we decide to support checking
3077 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003078 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003079 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003080 ((['git', 'config', 'branch.feature.gerritserver'],),
3081 'https://x-review.googlesource.com'),
3082 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3083 AuthenticatorMock()),
3084 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3085
3086 def test_fetch_try_jobs_none_gerrit(self):
3087 self._setup_fetch_try_jobs_gerrit({})
3088 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003089 # TODO(tandrii): Uncomment the below if we decide to support checking
3090 # patchsets for Gerrit.
3091 # self.assertRegexpMatches(
3092 # sys.stdout.getvalue(),
3093 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003094 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3095
3096 def test_fetch_try_jobs_some_gerrit(self):
3097 self._setup_fetch_try_jobs_gerrit({
3098 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3099 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003100 # TODO(tandrii): Uncomment the below if we decide to support checking
3101 # patchsets for Gerrit.
3102 # self.calls.remove(
3103 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003104 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3105
3106 # ... and doesn't result in warning.
3107 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3108 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003109 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3110 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3111
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003112 def _mock_gerrit_changes_for_detail_cache(self):
3113 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003114
3115 def test_gerrit_change_detail_cache_normalize(self):
3116 self._mock_gerrit_changes_for_detail_cache()
3117 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003118 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003119 ]
3120 cl = git_cl.Changelist(codereview='gerrit')
3121 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3122 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3123 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3124 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3125
3126 def test_gerrit_change_detail_cache_simple(self):
3127 self._mock_gerrit_changes_for_detail_cache()
3128 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003129 (('GetChangeDetail', 'host', '1', []), 'a'),
3130 (('GetChangeDetail', 'host', '2', []), 'b'),
3131 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003132 ]
3133 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3134 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3135 self.assertEqual(cl._GetChangeDetail(), 'a')
3136 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003137 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003138 self.assertEqual(cl._GetChangeDetail(), 'a')
3139 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3140
3141 def test_gerrit_change_detail_cache_options(self):
3142 self._mock_gerrit_changes_for_detail_cache()
3143 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003144 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3145 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3146 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3147 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003148 ]
3149 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3150 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3151 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3152 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3153 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3154 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3155 self.assertEqual(cl._GetChangeDetail(), 'cab')
3156
3157 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3158 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3159 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3160 self.assertEqual(cl._GetChangeDetail(), 'cab')
3161
3162 # Finally, no_cache should invalidate all caches for given change.
3163 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3164 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3165
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003166 def test_gerrit_description_caching(self):
3167 def gen_detail(rev, desc):
3168 return {
3169 'current_revision': rev,
3170 'revisions': {rev: {'commit': {'message': desc}}}
3171 }
3172 self.calls = [
3173 (('GetChangeDetail', 'host', '1',
3174 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3175 gen_detail('rev1', 'desc1')),
3176 (('GetChangeDetail', 'host', '1',
3177 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3178 gen_detail('rev2', 'desc2')),
3179 ]
3180
3181 self._mock_gerrit_changes_for_detail_cache()
3182 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3183 self.assertEqual(cl.GetDescription(), 'desc1')
3184 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3185 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003186
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003187 def test_print_current_creds(self):
3188 class CookiesAuthenticatorMock(object):
3189 def __init__(self):
3190 self.gitcookies = {
3191 'host.googlesource.com': ('user', 'pass'),
3192 'host-review.googlesource.com': ('user', 'pass'),
3193 }
3194 self.netrc = self
3195 self.netrc.hosts = {
3196 'github.com': ('user2', None, 'pass2'),
3197 'host2.googlesource.com': ('user3', None, 'pass'),
3198 }
3199 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3200 CookiesAuthenticatorMock)
3201 self.mock(sys, 'stdout', StringIO.StringIO())
3202 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3203 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3204 ' Host\t User\t Which file',
3205 '============================\t=====\t===========',
3206 'host-review.googlesource.com\t user\t.gitcookies',
3207 ' host.googlesource.com\t user\t.gitcookies',
3208 ' host2.googlesource.com\tuser3\t .netrc',
3209 ])
3210 sys.stdout.buf = ''
3211 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3212 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3213 ' Host\tUser\t Which file',
3214 '============================\t====\t===========',
3215 'host-review.googlesource.com\tuser\t.gitcookies',
3216 ' host.googlesource.com\tuser\t.gitcookies',
3217 ])
3218
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003219 def _common_creds_check_mocks(self):
3220 def exists_mock(path):
3221 dirname = os.path.dirname(path)
3222 if dirname == os.path.expanduser('~'):
3223 dirname = '~'
3224 base = os.path.basename(path)
3225 if base in ('.netrc', '.gitcookies'):
3226 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3227 # git cl also checks for existence other files not relevant to this test.
3228 return None
3229 self.mock(os.path, 'exists', exists_mock)
3230 self.mock(sys, 'stdout', StringIO.StringIO())
3231
3232 def test_creds_check_gitcookies_not_configured(self):
3233 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003234 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003235 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003236 self.calls = [
3237 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3238 (('os.path.exists', '~/.netrc'), True),
3239 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3240 'or Ctrl+C to abort'), ''),
3241 ((['git', 'config', '--global', 'http.cookiefile',
3242 os.path.expanduser('~/.gitcookies')], ), ''),
3243 ]
3244 self.assertEqual(0, git_cl.main(['creds-check']))
3245 self.assertRegexpMatches(
3246 sys.stdout.getvalue(),
3247 '^You seem to be using outdated .netrc for git credentials:')
3248 self.assertRegexpMatches(
3249 sys.stdout.getvalue(),
3250 '\nConfigured git to use .gitcookies from')
3251
3252 def test_creds_check_gitcookies_configured_custom_broken(self):
3253 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003254 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003255 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003256 self.calls = [
3257 ((['git', 'config', '--global', 'http.cookiefile'],),
3258 '/custom/.gitcookies'),
3259 (('os.path.exists', '/custom/.gitcookies'), False),
3260 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3261 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3262 ((['git', 'config', '--global', 'http.cookiefile',
3263 os.path.expanduser('~/.gitcookies')], ), ''),
3264 ]
3265 self.assertEqual(0, git_cl.main(['creds-check']))
3266 self.assertRegexpMatches(
3267 sys.stdout.getvalue(),
3268 'WARNING: you have configured custom path to .gitcookies: ')
3269 self.assertRegexpMatches(
3270 sys.stdout.getvalue(),
3271 'However, your configured .gitcookies file is missing.')
3272
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003273 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003274 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3275 lambda _, message: self._mocked_call('AddComment', message))
3276 self.calls = [
3277 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3278 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3279 (('AddComment', 'msg'), ''),
3280 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003281 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3282 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003283
3284 def test_git_cl_comment_add_gerrit(self):
3285 self.mock(git_cl.gerrit_util, 'SetReview',
3286 lambda host, change, msg:
3287 self._mocked_call('SetReview', host, change, msg))
3288 self.calls = [
3289 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3290 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3291 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3292 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3293 'origin/master'),
3294 ((['git', 'config', 'remote.origin.url'],),
3295 'https://chromium.googlesource.com/infra/infra'),
3296 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3297 ]
3298 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3299 '-a', 'msg']))
3300
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003301 def test_git_cl_comments_fetch_rietveld(self):
3302 self.mock(sys, 'stdout', StringIO.StringIO())
3303 self.calls = [
3304 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3305 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3306 ] * 2
3307 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3308 'messages': [
3309 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3310 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3311 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3312 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3313 # Intentionally wrong order here.
3314 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3315 'disapproval': False, 'approval': False,
3316 'sender': 'owner@example.com'},
3317 ],
3318 'owner_email': 'owner@example.com',
3319 })
3320 expected_comments_summary = [
3321 git_cl._CommentSummary(
3322 message='lgtm',
3323 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3324 disapproval=False, approval=True, sender='r@example.com'),
3325 git_cl._CommentSummary(
3326 message='not lgtm',
3327 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3328 disapproval=True, approval=False, sender='r2@example.com'),
3329 # Note: same order as in whatever Rietveld returns.
3330 git_cl._CommentSummary(
3331 message='PTAL',
3332 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3333 disapproval=False, approval=False, sender='owner@example.com'),
3334 ]
3335 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3336 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3337
3338 with git_cl.gclient_utils.temporary_directory() as tempdir:
3339 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3340 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3341 '-j', out_file]))
3342 with open(out_file) as f:
3343 read = json.load(f)
3344 self.assertEqual(len(read), 3)
3345 self.assertEqual(read[0], {
3346 'date': '2000-03-13 20:49:34.515270',
3347 'message': 'PTAL',
3348 'approval': False,
3349 'disapproval': False,
3350 'sender': 'owner@example.com'})
3351 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3352 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3353
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003354 def test_git_cl_comments_fetch_gerrit(self):
3355 self.mock(sys, 'stdout', StringIO.StringIO())
3356 self.calls = [
3357 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3358 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3359 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3360 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3361 'origin/master'),
3362 ((['git', 'config', 'remote.origin.url'],),
3363 'https://chromium.googlesource.com/infra/infra'),
3364 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3365 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3366 'owner': {'email': 'owner@example.com'},
3367 'messages': [
3368 {
3369 u'_revision_number': 1,
3370 u'author': {
3371 u'_account_id': 1111084,
3372 u'email': u'commit-bot@chromium.org',
3373 u'name': u'Commit Bot'
3374 },
3375 u'date': u'2017-03-15 20:08:45.000000000',
3376 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3377 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3378 u'tag': u'autogenerated:cq:dry-run'
3379 },
3380 {
3381 u'_revision_number': 2,
3382 u'author': {
3383 u'_account_id': 11151243,
3384 u'email': u'owner@example.com',
3385 u'name': u'owner'
3386 },
3387 u'date': u'2017-03-16 20:00:41.000000000',
3388 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3389 u'message': u'PTAL',
3390 },
3391 {
3392 u'_revision_number': 2,
3393 u'author': {
3394 u'_account_id': 148512 ,
3395 u'email': u'reviewer@example.com',
3396 u'name': u'reviewer'
3397 },
3398 u'date': u'2017-03-17 05:19:37.500000000',
3399 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3400 u'message': u'Patch Set 2: Code-Review+1',
3401 },
3402 ]
3403 })
3404 ] * 2
3405 expected_comments_summary = [
3406 git_cl._CommentSummary(
3407 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3408 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3409 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3410 git_cl._CommentSummary(
3411 message=u'PTAL',
3412 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3413 disapproval=False, approval=False, sender=u'owner@example.com'),
3414 git_cl._CommentSummary(
3415 message=u'Patch Set 2: Code-Review+1',
3416 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3417 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3418 ]
3419 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3420 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3421
3422 with git_cl.gclient_utils.temporary_directory() as tempdir:
3423 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3424 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3425 '-j', out_file]))
3426 with open(out_file) as f:
3427 read = json.load(f)
3428 self.assertEqual(len(read), 3)
3429 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3430 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3431 self.assertEqual(read[2], {
3432 u'date': u'2017-03-17 05:19:37.500000',
3433 u'message': u'Patch Set 2: Code-Review+1',
3434 u'approval': False,
3435 u'disapproval': False,
3436 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003437
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003438if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003439 logging.basicConfig(
3440 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003441 unittest.main()