blob: 7b96d95e8ac1a8f7248a06c96fa19f64ac23f07e [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,
71 'sender': 'john@chromium.org',
72 },
73 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010074 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000075 }
76
iannuccie53c9352016-08-17 14:40:40 -070077 @staticmethod
78 def close_issue(_issue):
79 return 'Closed'
80
skobes6468b902016-10-24 08:45:10 -070081 @staticmethod
82 def get_patch(issue, patchset):
83 return 'patch set from issue %s patchset %s' % (issue, patchset)
84
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010085 @staticmethod
86 def update_description(_issue, _description):
87 return 'Updated'
88
89 @staticmethod
90 def add_comment(_issue, _comment):
91 return 'Commented'
92
93
94
skobes6468b902016-10-24 08:45:10 -070095
96class GitCheckoutMock(object):
97 def __init__(self, *args, **kwargs):
98 pass
99
100 @staticmethod
101 def reset():
102 GitCheckoutMock.conflict = False
103
104 def apply_patch(self, p):
105 if GitCheckoutMock.conflict:
106 raise Exception('failed')
107
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000108
109class WatchlistsMock(object):
110 def __init__(self, _):
111 pass
112 @staticmethod
113 def GetWatchersForPaths(_):
114 return ['joe@example.com']
115
116
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000117class CodereviewSettingsFileMock(object):
118 def __init__(self):
119 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800120 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000121 def read(self):
122 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000123 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000124
125
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000126class AuthenticatorMock(object):
127 def __init__(self, *_args):
128 pass
129 def has_cached_credentials(self):
130 return True
tandrii221ab252016-10-06 08:12:04 -0700131 def authorize(self, http):
132 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000133
134
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000135def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
136 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
137
138 Usage:
139 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
140 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
141
142 OR
143 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
144 CookiesAuthenticatorMockFactory(cookie='cookie'))
145 """
146 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800147 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000148 # Intentionally not calling super() because it reads actual cookie files.
149 pass
150 @classmethod
151 def get_gitcookies_path(cls):
152 return '~/.gitcookies'
153 @classmethod
154 def get_netrc_path(cls):
155 return '~/.netrc'
156 def get_auth_header(self, host):
157 if same_cookie:
158 return same_cookie
159 return (hosts_with_creds or {}).get(host)
160 return CookiesAuthenticatorMock
161
kmarshall9249e012016-08-23 12:02:16 -0700162class MockChangelistWithBranchAndIssue():
163 def __init__(self, branch, issue):
164 self.branch = branch
165 self.issue = issue
166 def GetBranch(self):
167 return self.branch
168 def GetIssue(self):
169 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000170
tandriic2405f52016-10-10 08:13:15 -0700171
172class SystemExitMock(Exception):
173 pass
174
175
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000176class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100177 def test_get_description(self):
178 cl = git_cl.Changelist(issue=1, codereview='rietveld',
179 codereview_host='host')
180 cl.description = 'x'
181 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800182 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100183 self.assertEquals(cl.GetDescription(), 'x')
184 self.assertEquals(cl.GetDescription(force=True), 'y')
185 self.assertEquals(cl.GetDescription(), 'y')
186
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000187 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
188 parsed = urlparse.urlparse(url)
189 result = func(parsed)
190 if fail:
191 self.assertIsNone(result)
192 return None
193 self.assertIsNotNone(result)
194 self.assertEqual(result.issue, issue)
195 self.assertEqual(result.patchset, patchset)
196 self.assertEqual(result.hostname, hostname)
197 return result
198
199 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700200 def test(url, issue=None, patchset=None, hostname=None, fail=None):
201 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000202 git_cl._RietveldChangelistImpl.ParseIssueURL,
203 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000204
205 test('http://codereview.chromium.org/123',
206 123, None, 'codereview.chromium.org')
207 test('https://codereview.chromium.org/123',
208 123, None, 'codereview.chromium.org')
209 test('https://codereview.chromium.org/123/',
210 123, None, 'codereview.chromium.org')
211 test('https://codereview.chromium.org/123/whatever',
212 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700213 test('https://codereview.chromium.org/123/#ps20001',
214 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000215 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700216 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000217 # This looks like bad Gerrit, but is actually valid Rietveld.
218 test('https://chrome-review.source.com/123/4/',
219 123, None, 'chrome-review.source.com')
220
221 test('https://codereview.chromium.org/deadbeaf', fail=True)
222 test('https://codereview.chromium.org/api/123', fail=True)
223 test('bad://codereview.chromium.org/123', fail=True)
224 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
225
226 def test_ParseIssueURL_gerrit(self):
227 def test(url, issue=None, patchset=None, hostname=None, fail=None):
228 self._test_ParseIssueUrl(
229 git_cl._GerritChangelistImpl.ParseIssueURL,
230 url, issue, patchset, hostname, fail)
231
232 test('http://chrome-review.source.com/c/123',
233 123, None, 'chrome-review.source.com')
234 test('https://chrome-review.source.com/c/123/',
235 123, None, 'chrome-review.source.com')
236 test('https://chrome-review.source.com/c/123/4',
237 123, 4, 'chrome-review.source.com')
238 test('https://chrome-review.source.com/#/c/123/4',
239 123, 4, 'chrome-review.source.com')
240 test('https://chrome-review.source.com/c/123/4',
241 123, 4, 'chrome-review.source.com')
242 test('https://chrome-review.source.com/123',
243 123, None, 'chrome-review.source.com')
244 test('https://chrome-review.source.com/123/4',
245 123, 4, 'chrome-review.source.com')
246
247 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
248 test('https://chrome-review.source.com/c/abc/', fail=True)
249 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
250
251 def test_ParseIssueNumberArgument(self):
252 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
253 result = git_cl.ParseIssueNumberArgument(arg)
254 self.assertIsNotNone(result)
255 if fail:
256 self.assertFalse(result.valid)
257 else:
258 self.assertEqual(result.issue, issue)
259 self.assertEqual(result.patchset, patchset)
260 self.assertEqual(result.hostname, hostname)
261
262 test('123', 123)
263 test('', fail=True)
264 test('abc', fail=True)
265 test('123/1', fail=True)
266 test('123a', fail=True)
267 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
268 # Rietveld.
269 test('https://codereview.source.com/123',
270 123, None, 'codereview.source.com')
271 test('https://codereview.source.com/www123', fail=True)
272 # Gerrrit.
273 test('https://chrome-review.source.com/c/123/4',
274 123, 4, 'chrome-review.source.com')
275 test('https://chrome-review.source.com/bad/123/4', fail=True)
276
tandriif9aefb72016-07-01 09:06:51 -0700277 def test_get_bug_line_values(self):
278 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
279 self.assertEqual(f('', ''), [])
280 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
281 self.assertEqual(f('v8', '456'), ['v8:456'])
282 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
283 # Not nice, but not worth carying.
284 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
285 ['v8:456', 'chromium:123', 'v8:123'])
286
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100287 def _test_git_number(self, parent_msg, dest_ref, child_msg,
288 parent_hash='parenthash'):
289 desc = git_cl.ChangeDescription(child_msg)
290 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
291 return desc.description
292
293 def assertEqualByLine(self, actual, expected):
294 self.assertEqual(actual.splitlines(), expected.splitlines())
295
296 def test_git_number_bad_parent(self):
297 with self.assertRaises(ValueError):
298 self._test_git_number('Parent', 'refs/heads/master', 'Child')
299
300 def test_git_number_bad_parent_footer(self):
301 with self.assertRaises(AssertionError):
302 self._test_git_number(
303 'Parent\n'
304 '\n'
305 'Cr-Commit-Position: wrong',
306 'refs/heads/master', 'Child')
307
308 def test_git_number_bad_lineage_ignored(self):
309 actual = self._test_git_number(
310 'Parent\n'
311 '\n'
312 'Cr-Commit-Position: refs/heads/master@{#1}\n'
313 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
314 'refs/heads/master', 'Child')
315 self.assertEqualByLine(
316 actual,
317 'Child\n'
318 '\n'
319 'Cr-Commit-Position: refs/heads/master@{#2}\n'
320 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
321
322 def test_git_number_same_branch(self):
323 actual = self._test_git_number(
324 'Parent\n'
325 '\n'
326 'Cr-Commit-Position: refs/heads/master@{#12}',
327 dest_ref='refs/heads/master',
328 child_msg='Child')
329 self.assertEqualByLine(
330 actual,
331 'Child\n'
332 '\n'
333 'Cr-Commit-Position: refs/heads/master@{#13}')
334
335 def test_git_number_same_branch_with_originals(self):
336 actual = self._test_git_number(
337 'Parent\n'
338 '\n'
339 'Cr-Commit-Position: refs/heads/master@{#12}',
340 dest_ref='refs/heads/master',
341 child_msg='Child\n'
342 '\n'
343 'Some users are smart and insert their own footers\n'
344 '\n'
345 'Cr-Whatever: value\n'
346 'Cr-Commit-Position: refs/copy/paste@{#22}')
347 self.assertEqualByLine(
348 actual,
349 'Child\n'
350 '\n'
351 'Some users are smart and insert their own footers\n'
352 '\n'
353 'Cr-Original-Whatever: value\n'
354 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
355 'Cr-Commit-Position: refs/heads/master@{#13}')
356
357 def test_git_number_new_branch(self):
358 actual = self._test_git_number(
359 'Parent\n'
360 '\n'
361 'Cr-Commit-Position: refs/heads/master@{#12}',
362 dest_ref='refs/heads/branch',
363 child_msg='Child')
364 self.assertEqualByLine(
365 actual,
366 'Child\n'
367 '\n'
368 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
369 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
370
371 def test_git_number_lineage(self):
372 actual = self._test_git_number(
373 'Parent\n'
374 '\n'
375 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
376 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
377 dest_ref='refs/heads/branch',
378 child_msg='Child')
379 self.assertEqualByLine(
380 actual,
381 'Child\n'
382 '\n'
383 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
384 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
385
386 def test_git_number_moooooooore_lineage(self):
387 actual = self._test_git_number(
388 'Parent\n'
389 '\n'
390 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
391 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
392 dest_ref='refs/heads/mooore',
393 child_msg='Child')
394 self.assertEqualByLine(
395 actual,
396 'Child\n'
397 '\n'
398 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
399 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
400 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
401
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100402 def test_git_number_ever_moooooooore_lineage(self):
403 self.maxDiff = 10000
404 actual = self._test_git_number(
405 'CQ commit on fresh new branch + numbering.\n'
406 '\n'
407 'NOTRY=True\n'
408 'NOPRESUBMIT=True\n'
409 'BUG=\n'
410 '\n'
411 'Review-Url: https://codereview.chromium.org/2577703003\n'
412 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
413 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
414 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
415 dest_ref='refs/heads/gnumb-test/cl',
416 child_msg='git cl on fresh new branch + numbering.\n'
417 '\n'
418 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
419 self.assertEqualByLine(
420 actual,
421 'git cl on fresh new branch + numbering.\n'
422 '\n'
423 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
424 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
425 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
426 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
427 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100428
429 def test_git_number_cherry_pick(self):
430 actual = self._test_git_number(
431 'Parent\n'
432 '\n'
433 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
434 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
435 dest_ref='refs/heads/branch',
436 child_msg='Child, which is cherry-pick from master\n'
437 '\n'
438 'Cr-Commit-Position: refs/heads/master@{#100}\n'
439 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
440 self.assertEqualByLine(
441 actual,
442 'Child, which is cherry-pick from master\n'
443 '\n'
444 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
445 '\n'
446 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
447 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
448 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
449
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000450
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100451class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100452 def setUp(self):
453 super(GitCookiesCheckerTest, self).setUp()
454 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100455 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100456
457 def mock_hosts_creds(self, subhost_identity_pairs):
458 def ensure_googlesource(h):
459 if not h.endswith(self.c._GOOGLESOURCE):
460 assert not h.endswith('.')
461 return h + '.' + self.c._GOOGLESOURCE
462 return h
463 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
464 for h, i in subhost_identity_pairs]
465
466 def test_analysis_nothing(self):
467 self.c._all_hosts = []
468 self.assertFalse(self.c.has_generic_host())
469 self.assertEqual(set(), self.c.get_conflicting_hosts())
470 self.assertEqual(set(), self.c.get_duplicated_hosts())
471 self.assertEqual(set(), self.c.get_partially_configured_hosts())
472 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
473
474 def test_analysis(self):
475 self.mock_hosts_creds([
476 ('.googlesource.com', 'git-example.chromium.org'),
477
478 ('chromium', 'git-example.google.com'),
479 ('chromium-review', 'git-example.google.com'),
480 ('chrome-internal', 'git-example.chromium.org'),
481 ('chrome-internal-review', 'git-example.chromium.org'),
482 ('conflict', 'git-example.google.com'),
483 ('conflict-review', 'git-example.chromium.org'),
484 ('dup', 'git-example.google.com'),
485 ('dup', 'git-example.google.com'),
486 ('dup-review', 'git-example.google.com'),
487 ('partial', 'git-example.google.com'),
488 ])
489 self.assertTrue(self.c.has_generic_host())
490 self.assertEqual(set(['conflict.googlesource.com']),
491 self.c.get_conflicting_hosts())
492 self.assertEqual(set(['dup.googlesource.com']),
493 self.c.get_duplicated_hosts())
494 self.assertEqual(set(['partial.googlesource.com']),
495 self.c.get_partially_configured_hosts())
496 self.assertEqual(set(['chromium.googlesource.com',
497 'chrome-internal.googlesource.com']),
498 self.c.get_hosts_with_wrong_identities())
499
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100500 def test_report_no_problems(self):
501 self.test_analysis_nothing()
502 self.mock(sys, 'stdout', StringIO.StringIO())
503 self.assertFalse(self.c.find_and_report_problems())
504 self.assertEqual(sys.stdout.getvalue(), '')
505
506 def test_report(self):
507 self.test_analysis()
508 self.mock(sys, 'stdout', StringIO.StringIO())
509 self.assertTrue(self.c.find_and_report_problems())
510 with open(os.path.join(os.path.dirname(__file__),
511 'git_cl_creds_check_report.txt')) as f:
512 expected = f.read()
513 def by_line(text):
514 return [l.rstrip() for l in text.rstrip().splitlines()]
515 self.assertEqual(by_line(sys.stdout.getvalue()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100516
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000517class TestGitCl(TestCase):
518 def setUp(self):
519 super(TestGitCl, self).setUp()
520 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700521 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000522 self.mock(subprocess2, 'call', self._mocked_call)
523 self.mock(subprocess2, 'check_call', self._mocked_call)
524 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700525 self.mock(subprocess2, 'communicate',
526 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000527 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000528 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000529 self.mock(git_common, 'get_or_create_merge_base',
530 lambda *a: (
531 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000532 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000533 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100534 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
535 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700536 self.mock(git_cl, 'write_json', lambda path, contents:
537 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000538 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000539 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000540 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700541 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
542 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000543 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000544 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000545 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100546 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
547 lambda *args, **kwargs: self._mocked_call(
548 'GetChangeDetail', *args, **kwargs))
549 self.mock(git_cl.gerrit_util, 'AddReviewers',
550 lambda h, i, add, is_reviewer, notify: self._mocked_call(
551 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000552 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
553 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700554 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100555 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000556 # It's important to reset settings to not have inter-tests interference.
557 git_cl.settings = None
558
559 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000560 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100561 self.assertEquals([], self.calls)
562 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000563 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100564 raise
565 # Sadly, has_failed() returns True if this OR any other tests before this
566 # one have failed.
567 git_cl.logging.exception(
568 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
569 'There are un-consumed self.calls after this test has finished.\n'
570 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700571 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100572 '\n'
573 'If you are already running just this single test, then **first** '
574 'fix the problem whose exception is emitted below by unittest '
575 'runner.\n'
576 '\n'
577 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700578 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100579 'and follow instructions above.\n' +
580 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000581 finally:
582 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000583
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000584 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000585 self.assertTrue(
586 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700587 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000588 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000589 expected_args, result = top
590
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000591 # Also logs otherwise it could get caught in a try/finally and be hard to
592 # diagnose.
593 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700594 N = 5
595 prior_calls = '\n '.join(
596 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
597 for i, c in enumerate(self._calls_done[-N:]))
598 following_calls = '\n '.join(
599 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
600 for i, c in enumerate(self.calls[:N]))
601 extended_msg = (
602 'A few prior calls:\n %s\n\n'
603 'This (expected):\n @%d: %r\n'
604 'This (actual):\n @%d: %r\n\n'
605 'A few following expected calls:\n %s' %
606 (prior_calls, len(self._calls_done), expected_args,
607 len(self._calls_done), args, following_calls))
608 git_cl.logging.error(extended_msg)
609
tandrii99a72f22016-08-17 14:33:24 -0700610 self.fail('@%d\n'
611 ' Expected: %r\n'
612 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700613 len(self._calls_done), expected_args, args))
614
615 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700616 if isinstance(result, Exception):
617 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000618 return result
619
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100620 def test_ask_for_explicit_yes_true(self):
621 self.calls = [
622 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
623 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
624 ]
625 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
626
627 def test_ask_for_explicit_yes_true(self):
628 self.calls = [
629 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
630 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
631 ]
632 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
633
tandrii48df5812016-10-17 03:55:37 -0700634 def test_LoadCodereviewSettingsFromFile_gerrit(self):
635 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
636 self.calls = [
637 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
638 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
639 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
640 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
641 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
642 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700643 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
644 CERR1),
645 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700646 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
647 CERR1),
648 ((['git', 'config', 'gerrit.host', 'true'],), ''),
649 ]
650 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
651
maruel@chromium.orga3353652011-11-30 14:26:57 +0000652 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000653 def _is_gerrit_calls(cls, gerrit=False):
654 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
655 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
656
657 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000658 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000659 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000660 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000661
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000662 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000663 def _upload_no_rev_calls(cls, similarity, find_copies):
664 return (cls._git_base_calls(similarity, find_copies) +
665 cls._git_upload_no_rev_calls())
666
667 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000668 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000669 if similarity is None:
670 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700671 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700672 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000673 else:
tandrii33a46ff2016-08-23 05:53:40 -0700674 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700675 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000676
677 if find_copies is None:
678 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700679 find_copies_call = ((['git', 'config', '--bool',
680 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000681 else:
tandrii5d48c322016-08-18 16:19:37 -0700682 val = str(find_copies).lower()
683 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000684 'branch.master.git-find-copies', val],), '')
685
686 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000687 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800688 '-l100000', '-C'+similarity,
689 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000690 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000691 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000692 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000693
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000695 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000696 similarity_call,
697 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
698 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000699 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000700 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700701 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
702 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000703 ((['git', 'config', 'rietveld.server'],),
704 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000705 ((['git', 'config', 'branch.master.merge'],), 'master'),
706 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000707 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000708 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000709 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000710 ((['git', 'rev-parse', '--show-cdup'],), ''),
711 ((['git', 'rev-parse', 'HEAD'],), '12345'),
712 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000713 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000714 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700715 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000716 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000717 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000718 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000719 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000720 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000721 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000722 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000723 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700724 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000725 ]
726
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000727 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000728 def _git_upload_no_rev_calls(cls):
729 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000730 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000731 ]
732
733 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000734 def _git_upload_calls(cls, private):
735 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000736 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000737 private_call = []
738 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000739 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000740 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000741 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000742
maruel@chromium.orga3353652011-11-30 14:26:57 +0000743 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000744 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000745 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000746 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800747 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000748 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700749 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000750 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000751 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000752 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700753 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000754 ] + cls._git_post_upload_calls()
755
756 @classmethod
757 def _git_post_upload_calls(cls):
758 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000759 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
760 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
761 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000762 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000763 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000764 ]
765
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000766 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000767 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000768 fake_ancestor = 'fake_ancestor'
769 fake_cl = 'fake_cl_for_patch'
770 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000771 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000772 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000773 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000774 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000775 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000776 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000777 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000778 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700779 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000780 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000781 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000782 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000783 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000784 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000786 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000787 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000789 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000790 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000791
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000792 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700793 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000794 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000795 return [
796 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000797 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000798 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000799 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700800 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000801 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000802 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100803 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000804 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000805 ]
806
807 def _run_reviewer_test(
808 self,
809 upload_args,
810 expected_description,
811 returned_description,
812 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000813 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700814 private=False,
815 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000816 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000817 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000818 try:
819 similarity = upload_args[upload_args.index('--similarity')+1]
820 except ValueError:
821 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000822
823 if '--find-copies' in upload_args:
824 find_copies = True
825 elif '--no-find-copies' in upload_args:
826 find_copies = False
827 else:
828 find_copies = None
829
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000830 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700831 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000832
833 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000834
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000835 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000836 self.assertEquals(
837 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000838 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000839 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000840 '#--------------------This line is 72 characters long'
841 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000842 expected_description,
843 desc)
844 return returned_description
845 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000846
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000847 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000848 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700849 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000850 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000851 return 1, 2
852 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000853
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000854 git_cl.main(['upload'] + upload_args)
855
856 def test_no_reviewer(self):
857 self._run_reviewer_test(
858 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000859 'desc\n\nBUG=',
860 '# Blah blah comment.\ndesc\n\nBUG=',
861 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000862 [])
863
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000864 def test_keep_similarity(self):
865 self._run_reviewer_test(
866 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000867 'desc\n\nBUG=',
868 '# Blah blah comment.\ndesc\n\nBUG=',
869 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000870 [])
871
iannucci@chromium.org79540052012-10-19 23:15:26 +0000872 def test_keep_find_copies(self):
873 self._run_reviewer_test(
874 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000875 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000876 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000877 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000878 [])
879
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000880 def test_private(self):
881 self._run_reviewer_test(
882 ['--private'],
883 'desc\n\nBUG=',
884 '# Blah blah comment.\ndesc\n\nBUG=\n',
885 'desc\n\nBUG=',
886 [])
887
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000888 def test_reviewers_cmd_line(self):
889 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000890 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000891 self._run_reviewer_test(
892 ['-r' 'foo@example.com'],
893 description,
894 '\n%s\n' % description,
895 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000896 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897
898 def test_reviewer_tbr_overriden(self):
899 # Reviewer is overriden with TBR
900 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000901 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000902 self._run_reviewer_test(
903 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000904 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000905 description.strip('\n'),
906 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000907 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000908
909 def test_reviewer_multiple(self):
910 # Handles multiple R= or TBR= lines.
911 description = (
bradnelsond975b302016-10-23 12:20:23 -0700912 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
913 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000914 self._run_reviewer_test(
915 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000916 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000917 description,
918 description,
bradnelsond975b302016-10-23 12:20:23 -0700919 ['--reviewers=another@example.com,reviewer@example.com'],
920 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000921
maruel@chromium.orga3353652011-11-30 14:26:57 +0000922 def test_reviewer_send_mail(self):
923 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000924 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000925 self._run_reviewer_test(
926 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000927 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000928 description.strip('\n'),
929 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000930 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000931
932 def test_reviewer_send_mail_no_rev(self):
933 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000934 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700935 self.calls = self._upload_no_rev_calls(None, None) + [
936 ((['DieWithError', 'Must specify reviewers to send email.'],),
937 SystemExitMock())
938 ]
939
940 def RunEditor(desc, _, **kwargs):
941 return desc
942 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
943 self.mock(sys, 'stdout', stdout)
944 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000945 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700946 self.assertEqual(
947 'Using 50% similarity for rename/copy detection. Override with '
948 '--similarity.\n',
949 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000950
tandriif9aefb72016-07-01 09:06:51 -0700951 def test_bug_on_cmd(self):
952 self._run_reviewer_test(
953 ['--bug=500658,proj:123'],
954 'desc\n\nBUG=500658\nBUG=proj:123',
955 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
956 'desc\n\nBUG=500658\nBUG=proj:1234',
957 [])
958
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100959 def _land_rietveld_common(self, debug=False):
960 if debug:
961 # Very useful due to finally clause in git cl land raising exceptions and
962 # shadowing real cause of failure.
963 self.mock(git_cl, '_IS_BEING_TESTED', True)
964 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100965 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100966
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100967 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
968 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100969 self.mock(RietveldMock, 'update_description', staticmethod(
970 lambda i, d: self._mocked_call(['update_description', i, d])))
971 self.mock(RietveldMock, 'add_comment', staticmethod(
972 lambda i, c: self._mocked_call(['add_comment', i, c])))
973 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100974 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
975 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
976 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
977 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
978 CERR1),
979 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
980 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800981 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100982 ((['git', 'config', 'rietveld.server'],),
983 'https://codereview.chromium.org'),
984 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
985 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
986 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
987 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100988 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
989 ''), # No commits to rebase, according to local view of origin.
990 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
991 'fake_ancestor_sha'),
992 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
993 ((['git', 'rev-parse', '--show-cdup'],), ''),
994 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
995 ((['git', 'diff', '--name-status', '--no-renames', '-r',
996 'fake_ancestor_sha...', '.'],),
997 'M\tfile1.cpp'),
998 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
999 ((['git', 'config', 'branch.feature.rietveldserver'],),
1000 'https://codereview.chromium.org'),
1001 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1002 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1003 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1004 'fake_ancestor_sha', 'feature'],),
1005 # This command just prints smth like this:
1006 # file1.cpp | 53 ++++++--
1007 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1008 ''),
1009 ((['git', 'show-ref', '--quiet', '--verify',
1010 'refs/heads/git-cl-commit'],),
1011 ''), # 0 return code means branch exists.
1012 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1013 ((['git', 'show-ref', '--quiet', '--verify',
1014 'refs/heads/git-cl-cherry-pick'],),
1015 CERR1), # This means git-cl-cherry-pick branch does not exist.
1016 ((['git', 'rev-parse', '--show-cdup'],), ''),
1017 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1018 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1019 ((['git', 'commit', '-m',
1020 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001021 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001022 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1023 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1024 ((['git', 'config', '--get', 'remote.origin.url'],),
1025 'https://chromium.googlesource.com/infra/infra'),
1026 ]
1027
1028 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001029 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001030 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001031 ((['git', 'config', 'remote.origin.url'],),
1032 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001033 (('_is_git_numberer_enabled',
1034 'https://chromium.googlesource.com/infra/infra',
1035 'refs/heads/master'),
1036 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001037 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1038 ''),
1039 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1040 ((['git', 'checkout', '-q', 'feature'],), ''),
1041 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1042 ((['git', 'config', 'rietveld.viewvc-url'],),
1043 'https://chromium.googlesource.com/infra/infra/+/'),
1044 ((['update_description', 123,
1045 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1046 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1047 ''),
1048 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1049 'fake_sha_rebased (presubmit successful).'],), ''),
1050 ]
1051 git_cl.main(['land'])
1052
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001053 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001054 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001055
1056 # Special mocks to check validity of timestamp.
1057 original_git_amend_head = git_cl._git_amend_head
1058 def _git_amend_head_mock(msg, tstamp):
1059 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1060 return original_git_amend_head(msg, tstamp)
1061 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1062
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001063 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001064 ((['git', 'config', 'remote.origin.url'],),
1065 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001066 (('_is_git_numberer_enabled',
1067 'https://chromium.googlesource.com/chromium/src',
1068 'refs/heads/master'),
1069 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001070 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1071 'This is parent commit.\n'
1072 '\n'
1073 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1074 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001075 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1076 '1480022355'), # Committer's unix timestamp.
1077 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1078 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001079
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001080 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001081 ((['git', 'commit', '--amend', '-m',
1082 'Issue: 123\n\nR=john@chromium.org\n'
1083 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001084 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001085 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1086 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1087
1088 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1089 ''),
1090 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1091 ((['git', 'checkout', '-q', 'feature'],), ''),
1092 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1093 ((['git', 'config', 'rietveld.viewvc-url'],),
1094 'https://chromium.googlesource.com/infra/infra/+/'),
1095 ((['update_description', 123,
1096 'Issue: 123\n\nR=john@chromium.org\n'
1097 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001098 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001099 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1100 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1101 'Committed: '
1102 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1103 ''),
1104 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1105 'fake_sha_rebased (presubmit successful).'],), ''),
1106 ]
1107 git_cl.main(['land'])
1108
1109 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001110 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001111 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001112 ((['git', 'config', 'remote.origin.url'],),
1113 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001114 (('_is_git_numberer_enabled',
1115 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1116 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001117
1118 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1119 'This is parent commit with no footer.'),
1120
1121 ((['git', 'checkout', '-q', 'feature'],), ''),
1122 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1123 ]
1124 with self.assertRaises(ValueError) as cm:
1125 git_cl.main(['land'])
1126 self.assertEqual(cm.exception.message,
1127 'Unable to infer commit position from footers')
1128
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001129 def test_git_numberer_not_whitelisted_repo(self):
1130 self.calls = []
1131 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001132 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1133 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001134 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001135
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001136 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001137 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1138 self.calls = [
1139 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001140 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001141 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001142 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001143 remote_url='https://chromium.googlesource.com/chromium/src',
1144 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001145 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001146
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001147 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001148 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001149 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001150 def fake_temporary_directory(**kwargs):
1151 yield tempdir
1152 self.mock(git_cl.gclient_utils, 'temporary_directory',
1153 fake_temporary_directory)
1154 self._test_GitNumbererState_valid_configs_inner(tempdir)
1155
1156 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001157 self.calls = [
1158 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001159 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001160 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1161 '''
1162 [plugin "git-numberer"]
1163 validate-enabled-refglob = refs/else/*
1164 validate-enabled-refglob = refs/heads/*
1165 validate-disabled-refglob = refs/heads/disabled
1166 validate-disabled-refglob = refs/branch-heads/*
1167 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001168 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1169 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001170 'refs/else/*\n'
1171 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001172 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1173 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001174 'refs/heads/disabled\n'
1175 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001176 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001177
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001178 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001179 remote_url='https://chromium.googlesource.com/chromium/src',
1180 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001181 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001182
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001183 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001184 remote_url='https://chromium.googlesource.com/chromium/src',
1185 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001186 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001187
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001188 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001189 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001190 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001191 remote_url='https://chromium.googlesource.com/chromium/src',
1192 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001193 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001194
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001195 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001196 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001197 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001198 if skip_auth_check:
1199 return [((cmd, ), 'true')]
1200
tandrii5d48c322016-08-18 16:19:37 -07001201 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001202 if issue:
1203 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001204 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001205 ])
1206 calls.extend([
1207 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1208 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1209 ((['git', 'config', 'remote.origin.url'],),
1210 'https://chromium.googlesource.com/my/repo'),
1211 ((['git', 'config', 'remote.origin.url'],),
1212 'https://chromium.googlesource.com/my/repo'),
1213 ])
1214 return calls
1215
1216 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001217 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
1218 fetched_status=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001219 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001220 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001221 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001222 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001223 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001224 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1225 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001226 ]
1227 calls += cls._is_gerrit_calls(True)
1228 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001229 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001230 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1231 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001232 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001233 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001234 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001235 ((['get_or_create_merge_base', 'master',
1236 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001237 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001238 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001239 ]
1240 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1241
1242 if issue:
1243 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001244 (('GetChangeDetail', 'chromium-review.googlesource.com',
1245 '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
1246 {
1247 'change_id': '123456789',
1248 'current_revision': 'sha1_of_current_revision',
1249 'revisions': { 'sha1_of_current_revision': {
1250 'commit': {'message': fetched_description},
1251 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001252 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001253 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001254 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001255 if fetched_status == 'ABANDONED':
1256 calls += [
1257 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1258 '123456 has been abandoned, new uploads are not '
1259 'allowed'), SystemExitMock()),
1260 ]
1261 return calls
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001262
1263 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1264 get_remote_branch=False)
1265 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001266 ((['git', 'rev-parse', '--show-cdup'],), ''),
1267 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001268
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001269 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001270 'diff', '--name-status', '--no-renames', '-r',
1271 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001272 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001273 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001274 ]
1275
1276 if not issue:
1277 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001278 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001279 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001280 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001281 ]
1282
1283 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001284 ((['git', 'config', 'user.email'],), 'me@example.com'),
1285 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001286 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1287 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001288 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001289 ]
1290 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001291
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001292 @classmethod
1293 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001294 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001295 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001296 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001297 post_amend_description=None, issue=None, cc=None,
1298 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001299 if post_amend_description is None:
1300 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001301 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001302 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001303
tandriia60502f2016-06-20 02:01:53 -07001304 if squash_mode == 'default':
1305 calls.extend([
1306 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1307 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1308 ])
1309 elif squash_mode in ('override_squash', 'override_nosquash'):
1310 calls.extend([
1311 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1312 'true' if squash_mode == 'override_squash' else 'false'),
1313 ])
1314 else:
1315 assert squash_mode in ('squash', 'nosquash')
1316
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001317 # If issue is given, then description is fetched from Gerrit instead.
1318 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001319 calls += [
1320 ((['git', 'log', '--pretty=format:%s\n\n%b',
1321 'fake_ancestor_sha..HEAD'],),
1322 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001323 if squash:
1324 title = 'Initial_upload'
1325 else:
1326 if not title:
1327 calls += [
1328 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001329 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001330 ]
1331 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001332 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001333 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001334 # DownloadGerritHook(False)
1335 ((False, ),
1336 ''),
1337 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001338 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001339 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001340 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001341 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001342 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001343 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001344 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001345 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001346 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001347 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001348 if not issue:
1349 # Prompting to edit description on first upload.
1350 calls += [
1351 ((['git', 'config', 'core.editor'],), ''),
1352 ((['RunEditor'],), description),
1353 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001354 ref_to_push = 'abcdef0123456789'
1355 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001356 ((['git', 'config', 'branch.master.merge'],),
1357 'refs/heads/master'),
1358 ((['git', 'config', 'branch.master.remote'],),
1359 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001360 ((['get_or_create_merge_base', 'master',
1361 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001362 'origin/master'),
1363 ((['git', 'rev-parse', 'HEAD:'],),
1364 '0123456789abcdef'),
1365 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001366 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001367 ref_to_push),
1368 ]
1369 else:
1370 ref_to_push = 'HEAD'
1371
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001372 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001373 ((['git', 'rev-list',
1374 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001375 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001376
Aaron Gable9b713dd2016-12-14 16:04:21 -08001377 if title:
1378 if ref_suffix:
1379 ref_suffix += ',m=' + title
1380 else:
1381 ref_suffix = '%m=' + title
1382
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001383 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1384 if ref_suffix:
1385 ref_suffix += ',' + notify_suffix
1386 else:
1387 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001388
ukai@chromium.orge8077812012-02-03 03:41:46 +00001389 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001390 ref_suffix += ',' + ','.join('r=%s' % email
1391 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001392
1393 if git_mirror is None:
1394 calls += [
1395 ((['git', 'config', 'remote.origin.url'],),
1396 'https://chromium.googlesource.com/yyy/zzz'),
1397 ]
1398 else:
1399 calls += [
1400 ((['git', 'config', 'remote.origin.url'],),
1401 '/cache/this-dir-exists'),
1402 (('os.path.isdir', '/cache/this-dir-exists'),
1403 True),
1404 # Runs in /cache/this-dir-exists.
1405 ((['git', 'config', 'remote.origin.url'],),
1406 'https://chromium.googlesource.com/yyy/zzz'),
1407 ]
1408
ukai@chromium.orge8077812012-02-03 03:41:46 +00001409 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001410 ((['git', 'push',
1411 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001412 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001413 ('remote:\n'
1414 'remote: Processing changes: (\)\n'
1415 'remote: Processing changes: (|)\n'
1416 'remote: Processing changes: (/)\n'
1417 'remote: Processing changes: (-)\n'
1418 'remote: Processing changes: new: 1 (/)\n'
1419 'remote: Processing changes: new: 1, done\n'
1420 'remote:\n'
1421 'remote: New Changes:\n'
1422 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1423 'remote:\n'
1424 'To https://chromium.googlesource.com/yyy/zzz\n'
1425 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001426 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001427 if squash:
1428 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001429 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001430 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001431 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001432 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001433 ((['git', 'config', 'branch.master.gerritsquashhash',
1434 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001435 ]
tandrii88189772016-09-29 04:29:57 -07001436 calls += [
1437 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001438 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001439 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001440 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001441 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001442 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001443 return calls
1444
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001445 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001446 self,
1447 upload_args,
1448 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001449 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001450 squash=True,
1451 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001452 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001453 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001454 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001455 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001456 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001457 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001458 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001459 git_mirror=None,
1460 fetched_status=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001461 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001462 if squash_mode is None:
1463 if '--no-squash' in upload_args:
1464 squash_mode = 'nosquash'
1465 elif '--squash' in upload_args:
1466 squash_mode = 'squash'
1467 else:
1468 squash_mode = 'default'
1469
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001470 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001471 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001472 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001473 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001474 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001475 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1476 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001477 self.mock(git_cl.gclient_utils, 'RunEditor',
1478 lambda *_, **__: self._mocked_call(['RunEditor']))
1479 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1480
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001481 original_os_path_isdir = os.path.isdir
1482 def selective_os_path_isdir_mock(path):
1483 if path == '/cache/this-dir-exists':
1484 return self._mocked_call('os.path.isdir', path)
1485 return original_os_path_isdir(path)
1486 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1487
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001488 self.calls = self._gerrit_base_calls(
1489 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001490 fetched_description=description,
1491 fetched_status=fetched_status)
1492 if fetched_status != 'ABANDONED':
1493 self.calls += self._gerrit_upload_calls(
1494 description, reviewers, squash,
1495 squash_mode=squash_mode,
1496 expected_upstream_ref=expected_upstream_ref,
1497 ref_suffix=ref_suffix, title=title, notify=notify,
1498 post_amend_description=post_amend_description,
1499 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001500 # Uncomment when debugging.
1501 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001502 git_cl.main(['upload'] + upload_args)
1503
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001504 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001505 self._run_gerrit_upload_test(
1506 ['--no-squash'],
1507 'desc\n\nBUG=\n',
1508 [],
1509 squash=False,
1510 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1511
1512 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001513 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001514 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001515 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001516 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001517 [],
tandriia60502f2016-06-20 02:01:53 -07001518 squash=False,
1519 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001520 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001521
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001522 def test_gerrit_no_reviewer(self):
1523 self._run_gerrit_upload_test(
1524 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001525 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001526 [],
1527 squash=False,
1528 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001529
tandriieefe8322016-08-17 10:12:24 -07001530 def test_gerrit_patch_bad_chars(self):
1531 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001532 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001533 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001534 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001535 squash=False,
1536 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001537 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001538 self.assertIn(
1539 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001540 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1541 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001542 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001543
ukai@chromium.orge8077812012-02-03 03:41:46 +00001544 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001545 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001546 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001547 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001548 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001549 squash=False,
1550 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001551 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001552
1553 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001554 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001555 [],
bradnelsond975b302016-10-23 12:20:23 -07001556 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1557 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001558 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001559 ['reviewer@example.com', 'another@example.com'],
1560 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001561 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001562 ref_suffix='%l=Code-Review+1',
1563 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001564
1565 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001566 self._run_gerrit_upload_test(
1567 [],
1568 'desc\nBUG=\n\nChange-Id: 123456789',
1569 [],
1570 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001571
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001572 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001573 self._run_gerrit_upload_test(
1574 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001575 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001576 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001577 squash=True,
1578 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001579
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001580 def test_gerrit_upload_squash_first_with_mirror(self):
1581 self._run_gerrit_upload_test(
1582 ['--squash'],
1583 'desc\nBUG=\n\nChange-Id: 123456789',
1584 [],
1585 squash=True,
1586 expected_upstream_ref='origin/master',
1587 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1588
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001589 def test_gerrit_upload_squash_reupload(self):
1590 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001591 self._run_gerrit_upload_test(
1592 ['--squash'],
1593 description,
1594 [],
1595 squash=True,
1596 expected_upstream_ref='origin/master',
1597 issue=123456)
1598
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001599 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1600 self.mock(git_cl, 'DieWithError',
1601 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1602 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1603 with self.assertRaises(SystemExitMock):
1604 self._run_gerrit_upload_test(
1605 ['--squash'],
1606 description,
1607 [],
1608 squash=True,
1609 expected_upstream_ref='origin/master',
1610 issue=123456,
1611 fetched_status='ABANDONED')
1612
rmistry@google.com2dd99862015-06-22 12:22:18 +00001613 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001614 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001615 def mock_run_git(*args, **_kwargs):
1616 if args[0] == ['for-each-ref',
1617 '--format=%(refname:short) %(upstream:short)',
1618 'refs/heads']:
1619 # Create a local branch dependency tree that looks like this:
1620 # test1 -> test2 -> test3 -> test4 -> test5
1621 # -> test3.1
1622 # test6 -> test0
1623 branch_deps = [
1624 'test2 test1', # test1 -> test2
1625 'test3 test2', # test2 -> test3
1626 'test3.1 test2', # test2 -> test3.1
1627 'test4 test3', # test3 -> test4
1628 'test5 test4', # test4 -> test5
1629 'test6 test0', # test0 -> test6
1630 'test7', # test7
1631 ]
1632 return '\n'.join(branch_deps)
1633 self.mock(git_cl, 'RunGit', mock_run_git)
1634
1635 class RecordCalls:
1636 times_called = 0
1637 record_calls = RecordCalls()
1638 def mock_CMDupload(*args, **_kwargs):
1639 record_calls.times_called += 1
1640 return 0
1641 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1642
1643 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001644 (('ask_for_data', 'This command will checkout all dependent branches '
1645 'and run "git cl upload". Press Enter to continue, '
1646 'or Ctrl+C to abort'), ''),
1647 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001648
1649 class MockChangelist():
1650 def __init__(self):
1651 pass
1652 def GetBranch(self):
1653 return 'test1'
1654 def GetIssue(self):
1655 return '123'
1656 def GetPatchset(self):
1657 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001658 def IsGerrit(self):
1659 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001660
1661 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1662 # CMDupload should have been called 5 times because of 5 dependent branches.
1663 self.assertEquals(5, record_calls.times_called)
1664 self.assertEquals(0, ret)
1665
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001666 def test_gerrit_change_id(self):
1667 self.calls = [
1668 ((['git', 'write-tree'], ),
1669 'hashtree'),
1670 ((['git', 'rev-parse', 'HEAD~0'], ),
1671 'branch-parent'),
1672 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1673 'A B <a@b.org> 1456848326 +0100'),
1674 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1675 'C D <c@d.org> 1456858326 +0100'),
1676 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1677 'hashchange'),
1678 ]
1679 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1680 self.assertEqual(change_id, 'Ihashchange')
1681
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001682 def test_desecription_append_footer(self):
1683 for init_desc, footer_line, expected_desc in [
1684 # Use unique desc first lines for easy test failure identification.
1685 ('foo', 'R=one', 'foo\n\nR=one'),
1686 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1687 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1688 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1689 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1690 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1691 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1692 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1693 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1694 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1695 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1696 ]:
1697 desc = git_cl.ChangeDescription(init_desc)
1698 desc.append_footer(footer_line)
1699 self.assertEqual(desc.description, expected_desc)
1700
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001701 def test_update_reviewers(self):
1702 data = [
1703 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001704 ('foo\nR=xx', [], 'foo\nR=xx'),
1705 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001706 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001707 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1708 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1709 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001710 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001711 ('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 +00001712 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001713 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1714 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1715 # Same as the line before, but full of whitespaces.
1716 (
1717 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1718 'foo\nBar\n\nR=c@c\n BUG =',
1719 ),
1720 # Whitespaces aren't interpreted as new lines.
1721 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001722 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001723 expected = [i[2] for i in data]
1724 actual = []
1725 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001726 obj = git_cl.ChangeDescription(orig)
1727 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001728 actual.append(obj.description)
1729 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001730
wittman@chromium.org455dc922015-01-26 20:15:50 +00001731 def test_get_target_ref(self):
1732 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001733 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001734 self.assertEqual(None, git_cl.GetTargetRef(None,
1735 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001736 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001737
wittman@chromium.org455dc922015-01-26 20:15:50 +00001738 # Check default target refs for branches.
1739 self.assertEqual('refs/heads/master',
1740 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001741 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001742 self.assertEqual('refs/heads/master',
1743 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001744 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001745 self.assertEqual('refs/heads/master',
1746 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001747 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001748 self.assertEqual('refs/branch-heads/123',
1749 git_cl.GetTargetRef('origin',
1750 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001751 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001752 self.assertEqual('refs/diff/test',
1753 git_cl.GetTargetRef('origin',
1754 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001755 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001756 self.assertEqual('refs/heads/chrome/m42',
1757 git_cl.GetTargetRef('origin',
1758 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001759 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001760
1761 # Check target refs for user-specified target branch.
1762 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1763 'refs/remotes/branch-heads/123'):
1764 self.assertEqual('refs/branch-heads/123',
1765 git_cl.GetTargetRef('origin',
1766 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001767 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001768 for branch in ('origin/master', 'remotes/origin/master',
1769 'refs/remotes/origin/master'):
1770 self.assertEqual('refs/heads/master',
1771 git_cl.GetTargetRef('origin',
1772 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001773 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001774 for branch in ('master', 'heads/master', 'refs/heads/master'):
1775 self.assertEqual('refs/heads/master',
1776 git_cl.GetTargetRef('origin',
1777 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001778 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001779
wychen@chromium.orga872e752015-04-28 23:42:18 +00001780 def test_patch_when_dirty(self):
1781 # Patch when local tree is dirty
1782 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1783 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1784
1785 def test_diff_when_dirty(self):
1786 # Do 'git cl diff' when local tree is dirty
1787 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1788 self.assertNotEqual(git_cl.main(['diff']), 0)
1789
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001790 @staticmethod
1791 def _get_gerrit_codereview_server_calls(branch, value=None,
1792 git_short_host='host',
1793 detect_branch=True):
1794 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1795
1796 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1797 """
1798 calls = []
1799 if detect_branch:
1800 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1801 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1802 CERR1 if value is None else value))
1803 if value is None:
1804 calls += [
1805 ((['git', 'config', 'branch.' + branch + '.merge'],),
1806 'refs/heads' + branch),
1807 ((['git', 'config', 'branch.' + branch + '.remote'],),
1808 'origin'),
1809 ((['git', 'config', 'remote.origin.url'],),
1810 'https://%s.googlesource.com/my/repo' % git_short_host),
1811 ]
1812 return calls
1813
tandriidf09a462016-08-18 16:23:55 -07001814 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001815 new_branch=False, git_short_host='host',
1816 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001817 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001818 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1819 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001820 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001821 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001822 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1823
tandriidf09a462016-08-18 16:23:55 -07001824 if new_branch:
1825 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1826 else:
1827 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001828
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001829 if not force_codereview:
1830 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001831 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001832 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001833 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1834 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001835 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001836 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001837
1838 if is_gerrit:
1839 if not force_codereview:
1840 self.calls += [
1841 ((['git', 'config', 'gerrit.host'],), 'true'),
1842 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001843 if detect_gerrit_server:
1844 self.calls += self._get_gerrit_codereview_server_calls(
1845 'master', git_short_host=git_short_host,
1846 detect_branch=not new_branch and force_codereview)
1847
1848 self.calls += [
1849 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001850 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001851 {
1852 'current_revision': '7777777777',
1853 'revisions': {
1854 '1111111111': {
1855 '_number': 1,
1856 'fetch': {'http': {
1857 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1858 'ref': 'refs/changes/56/123456/1',
1859 }},
1860 },
1861 '7777777777': {
1862 '_number': 7,
1863 'fetch': {'http': {
1864 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1865 'ref': 'refs/changes/56/123456/7',
1866 }},
1867 },
1868 },
1869 }),
1870 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001871 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001872 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001873 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001874 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001875 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001876 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001877 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001878
tandriidf09a462016-08-18 16:23:55 -07001879 def _common_patch_successful(self, new_branch=False):
1880 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001881 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001882 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001883 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001884 ((['git', 'config', 'branch.master.rietveldserver',
1885 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001886 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001887 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001888 ((['git', 'commit', '-m',
1889 'Description\n\n' +
1890 'patch from issue 123456 at patchset 60001 ' +
1891 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001892 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001893
1894 def test_patch_successful(self):
1895 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001896 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1897
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001898 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001899 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001900 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1901
wychen@chromium.orga872e752015-04-28 23:42:18 +00001902 def test_patch_conflict(self):
1903 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001904 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001905 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001906
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001907 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001908 self._patch_common(is_gerrit=True, git_short_host='chromium',
1909 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001910 self.calls += [
1911 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1912 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001913 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001914 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001915 ((['git', 'config', 'branch.master.gerritserver',
1916 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001917 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001918 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001919 ]
1920 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1921
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001922 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001923 self._patch_common(is_gerrit=True, force_codereview=True,
1924 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001925 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001926 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001927 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001928 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001929 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001930 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001931 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001932 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001933 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001934 ]
1935 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1936
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001937 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001938 self._patch_common(is_gerrit=True, git_short_host='else',
1939 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001940 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001941 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001942 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001943 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001944 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001945 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001946 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001947 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001948 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001949 ]
1950 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001951 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001952
1953 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001954 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1955 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001956 self.calls += [
1957 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1958 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001959 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1960 ''),
1961 ((['git', 'config', 'branch.master.gerritserver',
1962 'https://chromium-review.googlesource.com'],), ''),
1963 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001964 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1965 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1966 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001967 ]
1968 with self.assertRaises(SystemExitMock):
1969 git_cl.main(['patch',
1970 'https://chromium-review.googlesource.com/#/c/123456/1'])
1971
tandriic2405f52016-10-10 08:13:15 -07001972 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001973 def notExists(_issue, *_, **kwargs):
1974 self.assertFalse(kwargs['ignore_404'])
1975 raise git_cl.gerrit_util.GerritError(404, '')
1976 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1977
tandriic2405f52016-10-10 08:13:15 -07001978 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001979 self.calls = [
1980 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1981 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1982 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1983 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1984 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1985 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001986 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001987 'or you have no access to it'],), SystemExitMock()),
1988 ]
1989 with self.assertRaises(SystemExitMock):
1990 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1991
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001992 def _checkout_calls(self):
1993 return [
1994 ((['git', 'config', '--local', '--get-regexp',
1995 'branch\\..*\\.rietveldissue'], ),
1996 ('branch.retrying.rietveldissue 1111111111\n'
1997 'branch.some-fix.rietveldissue 2222222222\n')),
1998 ((['git', 'config', '--local', '--get-regexp',
1999 'branch\\..*\\.gerritissue'], ),
2000 ('branch.ger-branch.gerritissue 123456\n'
2001 'branch.gbranch654.gerritissue 654321\n')),
2002 ]
2003
2004 def test_checkout_gerrit(self):
2005 """Tests git cl checkout <issue>."""
2006 self.calls = self._checkout_calls()
2007 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2008 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2009
2010 def test_checkout_rietveld(self):
2011 """Tests git cl checkout <issue>."""
2012 self.calls = self._checkout_calls()
2013 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2014 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2015
2016 def test_checkout_not_found(self):
2017 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002018 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002019 self.calls = self._checkout_calls()
2020 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2021
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002022 def test_checkout_no_branch_issues(self):
2023 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002024 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002025 self.calls = [
2026 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002027 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002028 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002029 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002030 ]
2031 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2032
tandrii@chromium.org28253532016-04-14 13:46:56 +00002033 def _test_gerrit_ensure_authenticated_common(self, auth,
2034 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002035 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2036 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2037 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002038 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002039 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002040 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002041 cl.branch = 'master'
2042 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002043 cl.lookedup_issue = True
2044 return cl
2045
2046 def test_gerrit_ensure_authenticated_missing(self):
2047 cl = self._test_gerrit_ensure_authenticated_common(auth={
2048 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
2049 })
2050 self.calls.append(
2051 ((['DieWithError',
2052 'Credentials for the following hosts are required:\n'
2053 ' chromium-review.googlesource.com\n'
2054 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002055 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002056 'https://chromium-review.googlesource.com/new-password'],), ''),)
2057 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2058
2059 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002060 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002061 cl = self._test_gerrit_ensure_authenticated_common(auth={
2062 'chromium.googlesource.com': 'one',
2063 'chromium-review.googlesource.com': 'other',
2064 })
2065 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002066 (('ask_for_data', 'If you know what you are doing '
2067 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002068 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2069
2070 def test_gerrit_ensure_authenticated_ok(self):
2071 cl = self._test_gerrit_ensure_authenticated_common(auth={
2072 'chromium.googlesource.com': 'same',
2073 'chromium-review.googlesource.com': 'same',
2074 })
2075 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2076
tandrii@chromium.org28253532016-04-14 13:46:56 +00002077 def test_gerrit_ensure_authenticated_skipped(self):
2078 cl = self._test_gerrit_ensure_authenticated_common(
2079 auth={}, skip_auth_check=True)
2080 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2081
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002082 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002083 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2084 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002085 self.calls = [
2086 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002087 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002088 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2089 ((['git', 'config', 'rietveld.server'],), ''),
2090 ((['git', 'config', 'rietveld.server'],), ''),
2091 ((['git', 'config', 'branch.feature.rietveldserver'],),
2092 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002093 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002094 ]
2095 self.assertEqual(0, git_cl.main(['set-commit']))
2096
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002097 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002098 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002099 lambda h, i, labels, notify=None:
2100 self._mocked_call(['SetReview', h, i, labels, notify]))
2101
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002102 self.calls = [
2103 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002104 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2105 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002106 ((['git', 'config', 'branch.feature.gerritserver'],),
2107 'https://chromium-review.googlesource.com'),
2108 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002109 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002110 ]
tandriid9e5ce52016-07-13 02:32:59 -07002111
2112 def test_cmd_set_commit_gerrit_clear(self):
2113 self._cmd_set_commit_gerrit_common(0)
2114 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2115
2116 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002117 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002118 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2119
tandriid9e5ce52016-07-13 02:32:59 -07002120 def test_cmd_set_commit_gerrit(self):
2121 self._cmd_set_commit_gerrit_common(2)
2122 self.assertEqual(0, git_cl.main(['set-commit']))
2123
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002124 def test_description_display(self):
2125 out = StringIO.StringIO()
2126 self.mock(git_cl.sys, 'stdout', out)
2127
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002128 self.mock(git_cl, 'Changelist', ChangelistMock)
2129 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002130
2131 self.assertEqual(0, git_cl.main(['description', '-d']))
2132 self.assertEqual('foo\n', out.getvalue())
2133
2134 def test_description_rietveld(self):
2135 out = StringIO.StringIO()
2136 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002137 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002138
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002139 self.assertEqual(0, git_cl.main([
2140 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2141 self.assertEqual('foobar\n', out.getvalue())
2142
iannucci3c972b92016-08-17 13:24:10 -07002143 def test_StatusFieldOverrideIssueMissingArgs(self):
2144 out = StringIO.StringIO()
2145 self.mock(git_cl.sys, 'stderr', out)
2146
2147 try:
2148 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2149 except SystemExit as ex:
2150 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002151 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002152
2153 out = StringIO.StringIO()
2154 self.mock(git_cl.sys, 'stderr', out)
2155
2156 try:
2157 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2158 except SystemExit as ex:
2159 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002160 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002161
2162 def test_StatusFieldOverrideIssue(self):
2163 out = StringIO.StringIO()
2164 self.mock(git_cl.sys, 'stdout', out)
2165
2166 def assertIssue(cl_self, *_args):
2167 self.assertEquals(cl_self.issue, 1)
2168 return 'foobar'
2169
2170 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2171 self.calls = [
2172 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2173 ((['git', 'config', 'rietveld.server'],), ''),
2174 ((['git', 'config', 'rietveld.server'],), ''),
2175 ]
iannuccie53c9352016-08-17 14:40:40 -07002176 self.assertEqual(
2177 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2178 0)
iannucci3c972b92016-08-17 13:24:10 -07002179 self.assertEqual(out.getvalue(), 'foobar\n')
2180
iannuccie53c9352016-08-17 14:40:40 -07002181 def test_SetCloseOverrideIssue(self):
2182 def assertIssue(cl_self, *_args):
2183 self.assertEquals(cl_self.issue, 1)
2184 return 'foobar'
2185
2186 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2187 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2188 self.calls = [
2189 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2190 ((['git', 'config', 'rietveld.server'],), ''),
2191 ((['git', 'config', 'rietveld.server'],), ''),
2192 ]
2193 self.assertEqual(
2194 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2195
2196 def test_SetCommitOverrideIssue(self):
2197 def assertIssue(cl_self, *_args):
2198 self.assertEquals(cl_self.issue, 1)
2199 return 'foobar'
2200
2201 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2202 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2203 self.calls = [
2204 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2205 ((['git', 'config', 'rietveld.server'],), ''),
2206 ((['git', 'config', 'rietveld.server'],), ''),
2207 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2208 ((['git', 'config', 'rietveld.server'],), ''),
2209 ((['git', 'config', 'rietveld.server'],), ''),
2210 ]
2211 self.assertEqual(
2212 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2213
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002214 def test_description_gerrit(self):
2215 out = StringIO.StringIO()
2216 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002217 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002218 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002219 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2220 {
2221 'current_revision': 'sha1',
2222 'revisions': {'sha1': {
2223 'commit': {'message': 'foobar'},
2224 }},
2225 }),
2226 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002227 self.assertEqual(0, git_cl.main([
2228 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2229 self.assertEqual('foobar\n', out.getvalue())
2230
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002231 def test_description_set_raw(self):
2232 out = StringIO.StringIO()
2233 self.mock(git_cl.sys, 'stdout', out)
2234
2235 self.mock(git_cl, 'Changelist', ChangelistMock)
2236 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2237
2238 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2239 self.assertEqual('hihi', ChangelistMock.desc)
2240
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002241 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002242 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002243
2244 def RunEditor(desc, _, **kwargs):
2245 self.assertEquals(
2246 '# Enter a description of the change.\n'
2247 '# This will be displayed on the codereview site.\n'
2248 '# The first line will also be used as the subject of the review.\n'
2249 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002250 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002251 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002252 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002253 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002254 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002255
dsansomee2d6fd92016-09-08 00:10:47 -07002256 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002257 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002258
2259 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2260 self.mock(git_cl.Changelist, 'GetDescription',
2261 lambda *args: current_desc)
2262 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2263 UpdateDescriptionRemote)
2264 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2265
2266 self.calls = [
2267 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002268 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002269 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2270 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002271 ((['git', 'config', 'core.editor'],), 'vi'),
2272 ]
2273 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2274
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002275 def test_description_set_stdin(self):
2276 out = StringIO.StringIO()
2277 self.mock(git_cl.sys, 'stdout', out)
2278
2279 self.mock(git_cl, 'Changelist', ChangelistMock)
2280 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2281
2282 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2283 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2284
kmarshall3bff56b2016-06-06 18:31:47 -07002285 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002286 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2287
kmarshall3bff56b2016-06-06 18:31:47 -07002288 self.calls = \
2289 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2290 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002291 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002292 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2293 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002294 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2295 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2296 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002297 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2298 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2299 ((['git', 'branch', '-D', 'foo'],), '')]
2300
kmarshall3bff56b2016-06-06 18:31:47 -07002301 self.mock(git_cl, 'get_cl_statuses',
2302 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002303 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2304 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2305 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002306
2307 self.assertEqual(0, git_cl.main(['archive', '-f']))
2308
2309 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002310 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002311 self.calls = \
2312 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2313 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002314 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002315 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2316 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002317 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2318
kmarshall9249e012016-08-23 12:02:16 -07002319 self.mock(git_cl, 'get_cl_statuses',
2320 lambda branches, fine_grained, max_processes:
2321 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2322
2323 self.assertEqual(1, git_cl.main(['archive', '-f']))
2324
2325 def test_archive_dry_run(self):
2326 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2327
2328 self.calls = \
2329 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2330 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2331 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2332 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2333 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2334 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2335 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2336 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2337 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002338
2339 self.mock(git_cl, 'get_cl_statuses',
2340 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002341 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2342 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2343 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002344
kmarshall9249e012016-08-23 12:02:16 -07002345 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2346
2347 def test_archive_no_tags(self):
2348 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2349
2350 self.calls = \
2351 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2352 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2353 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2354 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2355 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2356 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2357 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2358 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2359 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2360 ((['git', 'branch', '-D', 'foo'],), '')]
2361
2362 self.mock(git_cl, 'get_cl_statuses',
2363 lambda branches, fine_grained, max_processes:
2364 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2365 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2366 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2367
2368 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002369
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002370 def test_cmd_issue_erase_existing(self):
2371 out = StringIO.StringIO()
2372 self.mock(git_cl.sys, 'stdout', out)
2373 self.calls = [
2374 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002375 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2376 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002377 # Let this command raise exception (retcode=1) - it should be ignored.
2378 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002379 CERR1),
2380 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2381 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002382 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2383 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2384 ''),
2385 ]
2386 self.assertEqual(0, git_cl.main(['issue', '0']))
2387
phajdan.jre328cf92016-08-22 04:12:17 -07002388 def test_cmd_issue_json(self):
2389 out = StringIO.StringIO()
2390 self.mock(git_cl.sys, 'stdout', out)
2391 self.calls = [
2392 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002393 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002394 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2395 ((['git', 'config', 'rietveld.server'],),
2396 'https://codereview.chromium.org'),
2397 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2398 (('write_json', 'output.json',
2399 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2400 ''),
2401 ]
2402 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2403
tandriide281ae2016-10-12 06:02:30 -07002404 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002405 self.mock(git_cl.Changelist, 'GetChange',
2406 lambda _, *a: (
2407 self._mocked_call(['GetChange']+list(a))))
2408 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2409 lambda *_, **__: (
2410 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002411 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2412 lambda _, s: self._mocked_call(['SetCQState', s]))
2413 self.calls = [
2414 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002415 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002416 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2417 ((['git', 'config', 'rietveld.server'],),
2418 'https://codereview.chromium.org'),
2419 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2420 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2421 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2422 ((['get_or_create_merge_base', 'feature', 'feature'],),
2423 'fake_ancestor_sha'),
2424 ((['GetChange', 'fake_ancestor_sha', None], ),
2425 git_cl.presubmit_support.GitChange(
2426 '', '', '', '', '', '', '', '')),
2427 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2428 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002429 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2430 ]
2431 out = StringIO.StringIO()
2432 self.mock(git_cl.sys, 'stdout', out)
2433 self.assertEqual(0, git_cl.main(['try']))
2434 self.assertEqual(
2435 out.getvalue(),
2436 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2437
tandrii8c5a3532016-11-04 07:52:02 -07002438 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2439 self.mock(git_cl.Changelist, 'GetChange',
2440 lambda _, *a: (
2441 self._mocked_call(['GetChange']+list(a))))
2442 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2443 lambda *_, **__: (
2444 self._mocked_call(['DoGetTryMasters'])))
2445 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2446 lambda _, s: self._mocked_call(['SetCQState', s]))
2447
tandrii8c5a3532016-11-04 07:52:02 -07002448 self.calls = [
2449 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2450 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2451 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2452 ((['git', 'config', 'branch.feature.gerritserver'],),
2453 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002454 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2455 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2456 'project': 'depot_tools',
2457 'status': 'OPEN',
2458 'owner': {'email': 'owner@e.mail'},
2459 'revisions': {
2460 'deadbeaf': {
2461 '_number': 6,
2462 },
2463 'beeeeeef': {
2464 '_number': 7,
2465 'fetch': {'http': {
2466 'url': 'https://chromium.googlesource.com/depot_tools',
2467 'ref': 'refs/changes/56/123456/7'
2468 }},
2469 },
2470 },
2471 }),
tandrii8c5a3532016-11-04 07:52:02 -07002472 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2473 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2474 ((['get_or_create_merge_base', 'feature', 'feature'],),
2475 'fake_ancestor_sha'),
2476 ((['GetChange', 'fake_ancestor_sha', None], ),
2477 git_cl.presubmit_support.GitChange(
2478 '', '', '', '', '', '', '', '')),
2479 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2480 ((['DoGetTryMasters'], ), None),
2481 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2482 ]
2483 out = StringIO.StringIO()
2484 self.mock(git_cl.sys, 'stdout', out)
2485 self.assertEqual(0, git_cl.main(['try']))
2486 self.assertEqual(
2487 out.getvalue(),
2488 'scheduled CQ Dry Run on '
2489 'https://chromium-review.googlesource.com/123456\n')
2490
2491 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2492 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2493 lambda _: {
2494 'owner_email': 'owner@e.mail',
2495 'private': False,
2496 'closed': False,
2497 'project': 'depot_tools',
2498 'patchsets': [20001],
2499 })
tandriide281ae2016-10-12 06:02:30 -07002500 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2501 self.calls = [
2502 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2503 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2504 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2505 ((['git', 'config', 'rietveld.server'],),
2506 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002507 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002508 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002509 ]
2510
2511 def _buildbucket_retry(*_, **kw):
2512 # self.maxDiff = 10000
2513 body = json.loads(kw['body'])
2514 self.assertEqual(len(body['builds']), 1)
2515 build = body['builds'][0]
2516 params = json.loads(build.pop('parameters_json'))
2517 self.assertEqual(params, {
2518 u'builder_name': u'win',
2519 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2520 u'revision': None}],
2521 u'properties': {
2522 u'category': u'git_cl_try',
2523 u'issue': 123,
2524 u'key': u'val',
2525 u'json': [{u'a': 1}, None],
2526 u'master': u'tryserver.chromium',
2527 u'patch_project': u'depot_tools',
2528 u'patch_storage': u'rietveld',
2529 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002530 u'rietveld': u'https://codereview.chromium.org',
2531 }
2532 })
2533 self.assertEqual(build, {
2534 u'bucket': u'master.tryserver.chromium',
2535 u'client_operation_id': u'uuid4',
2536 u'tags': [u'builder:win',
2537 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002538 u'user_agent:git_cl_try',
2539 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002540 })
2541
2542 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2543
2544 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2545 self.assertEqual(0, git_cl.main([
2546 'try', '-m', 'tryserver.chromium', '-b', 'win',
2547 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2548 self.assertRegexpMatches(
2549 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002550 'Tried jobs on:\nBucket: master.tryserver.chromium')
2551
tandrii8c5a3532016-11-04 07:52:02 -07002552 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2553 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2554 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2555
tandrii8c5a3532016-11-04 07:52:02 -07002556 self.calls = [
2557 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2558 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2559 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2560 ((['git', 'config', 'branch.feature.gerritserver'],),
2561 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002562 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002563 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002564 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002565 'status': 'OPEN',
2566 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002567 'revisions': {
2568 'deadbeaf': {
2569 '_number': 6,
2570 },
2571 'beeeeeef': {
2572 '_number': 7,
2573 'fetch': {'http': {
2574 'url': 'https://chromium.googlesource.com/depot_tools',
2575 'ref': 'refs/changes/56/123456/7'
2576 }},
2577 },
2578 },
2579 }),
2580 ]
2581
2582 def _buildbucket_retry(*_, **kw):
2583 # self.maxDiff = 10000
2584 body = json.loads(kw['body'])
2585 self.assertEqual(len(body['builds']), 1)
2586 build = body['builds'][0]
2587 params = json.loads(build.pop('parameters_json'))
2588 self.assertEqual(params, {
2589 u'builder_name': u'win',
2590 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2591 u'revision': None}],
2592 u'properties': {
2593 u'category': u'git_cl_try',
2594 u'key': u'val',
2595 u'json': [{u'a': 1}, None],
2596 u'master': u'tryserver.chromium',
2597
2598 u'patch_gerrit_url':
2599 u'https://chromium-review.googlesource.com',
2600 u'patch_issue': 123456,
2601 u'patch_project': u'depot_tools',
2602 u'patch_ref': u'refs/changes/56/123456/7',
2603 u'patch_repository_url':
2604 u'https://chromium.googlesource.com/depot_tools',
2605 u'patch_set': 7,
2606 u'patch_storage': u'gerrit',
2607 }
2608 })
2609 self.assertEqual(build, {
2610 u'bucket': u'master.tryserver.chromium',
2611 u'client_operation_id': u'uuid4',
2612 u'tags': [
2613 u'builder:win',
2614 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2615 u'user_agent:git_cl_try',
2616 u'master:tryserver.chromium'],
2617 })
2618
2619 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2620
2621 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2622 self.assertEqual(0, git_cl.main([
2623 'try', '-m', 'tryserver.chromium', '-b', 'win',
2624 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2625 self.assertRegexpMatches(
2626 git_cl.sys.stdout.getvalue(),
2627 'Tried jobs on:\nBucket: master.tryserver.chromium')
2628
borenet6c0efe62016-10-19 08:13:29 -07002629 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002630 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2631 lambda _: {
2632 'owner_email': 'owner@e.mail',
2633 'private': False,
2634 'closed': False,
2635 'project': 'depot_tools',
2636 'patchsets': [20001],
2637 })
borenet6c0efe62016-10-19 08:13:29 -07002638 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2639 self.calls = [
2640 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2641 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2642 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2643 ((['git', 'config', 'rietveld.server'],),
2644 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002645 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002646 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002647 ]
2648
2649 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002650 body = json.loads(kw['body'])
2651 self.assertEqual(len(body['builds']), 1)
2652 build = body['builds'][0]
2653 params = json.loads(build.pop('parameters_json'))
2654 self.assertEqual(params, {
2655 u'builder_name': u'win',
2656 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2657 u'revision': None}],
2658 u'properties': {
2659 u'category': u'git_cl_try',
2660 u'issue': 123,
2661 u'patch_project': u'depot_tools',
2662 u'patch_storage': u'rietveld',
2663 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002664 u'rietveld': u'https://codereview.chromium.org',
2665 }
2666 })
2667 self.assertEqual(build, {
2668 u'bucket': u'test.bucket',
2669 u'client_operation_id': u'uuid4',
2670 u'tags': [u'builder:win',
2671 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2672 u'user_agent:git_cl_try'],
2673 })
2674
2675 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2676
2677 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2678 self.assertEqual(0, git_cl.main([
2679 'try', '-B', 'test.bucket', '-b', 'win']))
2680 self.assertRegexpMatches(
2681 git_cl.sys.stdout.getvalue(),
2682 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002683
qyearsley123a4682016-10-26 09:12:17 -07002684 def test_git_cl_try_bots_on_multiple_masters(self):
2685 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2686 self.calls = [
2687 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2688 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2689 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2690 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002691 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002692 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2693 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2694 ]
2695
2696 def _buildbucket_retry(*_, **kw):
2697 body = json.loads(kw['body'])
2698 self.assertEqual(len(body['builds']), 2)
2699
2700 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2701 self.assertEqual(first_build_params['builder_name'], 'builder1')
2702 self.assertEqual(first_build_params['properties']['master'], 'master1')
2703
2704 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2705 self.assertEqual(first_build_params['builder_name'], 'builder2')
2706 self.assertEqual(first_build_params['properties']['master'], 'master2')
2707
2708 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2709
2710 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2711 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2712
2713 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2714 self.assertEqual(
2715 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2716 self.assertEqual(
2717 git_cl.sys.stdout.getvalue(),
2718 'Tried jobs on:\n'
2719 'Bucket: master.master1\n'
2720 ' builder1: []\n'
2721 'Bucket: master.master2\n'
2722 ' builder2: []\n'
2723 'To see results here, run: git cl try-results\n'
2724 'To see results in browser, run: git cl web\n')
2725
tandrii16e0b4e2016-06-07 10:34:28 -07002726 def _common_GerritCommitMsgHookCheck(self):
2727 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2728 self.mock(git_cl.os.path, 'abspath',
2729 lambda path: self._mocked_call(['abspath', path]))
2730 self.mock(git_cl.os.path, 'exists',
2731 lambda path: self._mocked_call(['exists', path]))
2732 self.mock(git_cl.gclient_utils, 'FileRead',
2733 lambda path: self._mocked_call(['FileRead', path]))
2734 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2735 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2736 self.calls = [
2737 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2738 ((['abspath', '../'],), '/abs/git_repo_root'),
2739 ]
2740 return git_cl.Changelist(codereview='gerrit', issue=123)
2741
2742 def test_GerritCommitMsgHookCheck_custom_hook(self):
2743 cl = self._common_GerritCommitMsgHookCheck()
2744 self.calls += [
2745 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2746 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2747 '#!/bin/sh\necho "custom hook"')
2748 ]
2749 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2750
2751 def test_GerritCommitMsgHookCheck_not_exists(self):
2752 cl = self._common_GerritCommitMsgHookCheck()
2753 self.calls += [
2754 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2755 ]
2756 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2757
2758 def test_GerritCommitMsgHookCheck(self):
2759 cl = self._common_GerritCommitMsgHookCheck()
2760 self.calls += [
2761 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2762 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2763 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002764 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002765 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2766 ''),
2767 ]
2768 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2769
tandriic4344b52016-08-29 06:04:54 -07002770 def test_GerritCmdLand(self):
2771 self.calls += [
2772 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2773 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2774 'deadbeaf'),
2775 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2776 ((['git', 'config', 'branch.feature.gerritserver'],),
2777 'chromium-review.googlesource.com'),
2778 ]
2779 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2780 cl._codereview_impl._GetChangeDetail = lambda _: {
2781 'labels': {},
2782 'current_revision': 'deadbeaf',
2783 }
agable32978d92016-11-01 12:55:02 -07002784 cl._codereview_impl._GetChangeCommit = lambda: {
2785 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002786 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002787 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2788 }
tandriic4344b52016-08-29 06:04:54 -07002789 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002790 out = StringIO.StringIO()
2791 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002792 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002793 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002794 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002795
tandrii221ab252016-10-06 08:12:04 -07002796 BUILDBUCKET_BUILDS_MAP = {
2797 '9000': {
2798 'id': '9000',
2799 'status': 'STARTED',
2800 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2801 'result_details_json': '{"properties": {}}',
2802 'bucket': 'master.x.y',
2803 'created_by': 'user:someone@chromium.org',
2804 'created_ts': '147200002222000',
2805 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2806 },
2807 '8000': {
2808 'id': '8000',
2809 'status': 'COMPLETED',
2810 'result': 'FAILURE',
2811 'failure_reason': 'BUILD_FAILURE',
2812 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2813 'result_details_json': '{"properties": {}}',
2814 'bucket': 'master.x.y',
2815 'created_by': 'user:someone@chromium.org',
2816 'created_ts': '147200001111000',
2817 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2818 },
2819 }
2820
2821 def test_write_try_results_json(self):
2822 expected_output = [
2823 {
2824 'buildbucket_id': '8000',
2825 'bucket': 'master.x.y',
2826 'builder_name': 'my-builder',
2827 'status': 'COMPLETED',
2828 'result': 'FAILURE',
2829 'failure_reason': 'BUILD_FAILURE',
2830 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2831 },
2832 {
2833 'buildbucket_id': '9000',
2834 'bucket': 'master.x.y',
2835 'builder_name': 'my-builder',
2836 'status': 'STARTED',
2837 'result': None,
2838 'failure_reason': None,
2839 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2840 }
2841 ]
2842 self.calls = [(('write_json', 'output.json', expected_output), '')]
2843 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2844
tandrii45b2a582016-10-11 03:14:16 -07002845 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002846 out = StringIO.StringIO()
2847 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002848 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2849 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002850 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2851 self._mocked_call(['get_authenticator_for_host', host]))
2852 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2853 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002854
2855 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2856 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002857 self.calls += [
2858 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2859 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2860 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2861 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2862 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2863 ((['git', 'config', 'branch.feature.rietveldserver'],),
2864 'codereview.example.com'),
2865 ((['get_authenticator_for_host', 'codereview.example.com'],),
2866 AuthenticatorMock()),
2867 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2868
2869 def test_fetch_try_jobs_none_rietveld(self):
2870 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002871 # Simulate that user isn't logged in.
2872 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002873 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002874 self.assertRegexpMatches(sys.stdout.getvalue(),
2875 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002876 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2877
2878 def test_fetch_try_jobs_some_rietveld(self):
2879 self._setup_fetch_try_jobs_rietveld({
2880 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2881 })
2882 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002883 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2884 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2885 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2886
2887 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2888 self._setup_fetch_try_jobs(most_recent_patchset=13)
2889 self.calls += [
2890 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2891 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2892 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002893 # TODO(tandrii): Uncomment the below if we decide to support checking
2894 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002895 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002896 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002897 ((['git', 'config', 'branch.feature.gerritserver'],),
2898 'https://x-review.googlesource.com'),
2899 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2900 AuthenticatorMock()),
2901 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2902
2903 def test_fetch_try_jobs_none_gerrit(self):
2904 self._setup_fetch_try_jobs_gerrit({})
2905 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002906 # TODO(tandrii): Uncomment the below if we decide to support checking
2907 # patchsets for Gerrit.
2908 # self.assertRegexpMatches(
2909 # sys.stdout.getvalue(),
2910 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002911 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2912
2913 def test_fetch_try_jobs_some_gerrit(self):
2914 self._setup_fetch_try_jobs_gerrit({
2915 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2916 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002917 # TODO(tandrii): Uncomment the below if we decide to support checking
2918 # patchsets for Gerrit.
2919 # self.calls.remove(
2920 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002921 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2922
2923 # ... and doesn't result in warning.
2924 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2925 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002926 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2927 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2928
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002929 def _mock_gerrit_changes_for_detail_cache(self):
2930 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002931
2932 def test_gerrit_change_detail_cache_normalize(self):
2933 self._mock_gerrit_changes_for_detail_cache()
2934 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002935 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002936 ]
2937 cl = git_cl.Changelist(codereview='gerrit')
2938 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2939 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2940 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2941 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2942
2943 def test_gerrit_change_detail_cache_simple(self):
2944 self._mock_gerrit_changes_for_detail_cache()
2945 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002946 (('GetChangeDetail', 'host', '1', []), 'a'),
2947 (('GetChangeDetail', 'host', '2', []), 'b'),
2948 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002949 ]
2950 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2951 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2952 self.assertEqual(cl._GetChangeDetail(), 'a')
2953 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002954 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002955 self.assertEqual(cl._GetChangeDetail(), 'a')
2956 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2957
2958 def test_gerrit_change_detail_cache_options(self):
2959 self._mock_gerrit_changes_for_detail_cache()
2960 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002961 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2962 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2963 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2964 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002965 ]
2966 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2967 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2968 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2969 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2970 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2971 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2972 self.assertEqual(cl._GetChangeDetail(), 'cab')
2973
2974 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2975 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2976 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2977 self.assertEqual(cl._GetChangeDetail(), 'cab')
2978
2979 # Finally, no_cache should invalidate all caches for given change.
2980 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2981 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2982
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002983 def test_gerrit_description_caching(self):
2984 def gen_detail(rev, desc):
2985 return {
2986 'current_revision': rev,
2987 'revisions': {rev: {'commit': {'message': desc}}}
2988 }
2989 self.calls = [
2990 (('GetChangeDetail', 'host', '1',
2991 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2992 gen_detail('rev1', 'desc1')),
2993 (('GetChangeDetail', 'host', '1',
2994 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2995 gen_detail('rev2', 'desc2')),
2996 ]
2997
2998 self._mock_gerrit_changes_for_detail_cache()
2999 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3000 self.assertEqual(cl.GetDescription(), 'desc1')
3001 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3002 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003003
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003004 def test_print_current_creds(self):
3005 class CookiesAuthenticatorMock(object):
3006 def __init__(self):
3007 self.gitcookies = {
3008 'host.googlesource.com': ('user', 'pass'),
3009 'host-review.googlesource.com': ('user', 'pass'),
3010 }
3011 self.netrc = self
3012 self.netrc.hosts = {
3013 'github.com': ('user2', None, 'pass2'),
3014 'host2.googlesource.com': ('user3', None, 'pass'),
3015 }
3016 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3017 CookiesAuthenticatorMock)
3018 self.mock(sys, 'stdout', StringIO.StringIO())
3019 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3020 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3021 ' Host\t User\t Which file',
3022 '============================\t=====\t===========',
3023 'host-review.googlesource.com\t user\t.gitcookies',
3024 ' host.googlesource.com\t user\t.gitcookies',
3025 ' host2.googlesource.com\tuser3\t .netrc',
3026 ])
3027 sys.stdout.buf = ''
3028 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3029 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3030 ' Host\tUser\t Which file',
3031 '============================\t====\t===========',
3032 'host-review.googlesource.com\tuser\t.gitcookies',
3033 ' host.googlesource.com\tuser\t.gitcookies',
3034 ])
3035
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003036 def _common_creds_check_mocks(self):
3037 def exists_mock(path):
3038 dirname = os.path.dirname(path)
3039 if dirname == os.path.expanduser('~'):
3040 dirname = '~'
3041 base = os.path.basename(path)
3042 if base in ('.netrc', '.gitcookies'):
3043 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3044 # git cl also checks for existence other files not relevant to this test.
3045 return None
3046 self.mock(os.path, 'exists', exists_mock)
3047 self.mock(sys, 'stdout', StringIO.StringIO())
3048
3049 def test_creds_check_gitcookies_not_configured(self):
3050 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003051 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003052 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003053 self.calls = [
3054 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3055 (('os.path.exists', '~/.netrc'), True),
3056 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3057 'or Ctrl+C to abort'), ''),
3058 ((['git', 'config', '--global', 'http.cookiefile',
3059 os.path.expanduser('~/.gitcookies')], ), ''),
3060 ]
3061 self.assertEqual(0, git_cl.main(['creds-check']))
3062 self.assertRegexpMatches(
3063 sys.stdout.getvalue(),
3064 '^You seem to be using outdated .netrc for git credentials:')
3065 self.assertRegexpMatches(
3066 sys.stdout.getvalue(),
3067 '\nConfigured git to use .gitcookies from')
3068
3069 def test_creds_check_gitcookies_configured_custom_broken(self):
3070 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003071 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003072 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003073 self.calls = [
3074 ((['git', 'config', '--global', 'http.cookiefile'],),
3075 '/custom/.gitcookies'),
3076 (('os.path.exists', '/custom/.gitcookies'), False),
3077 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3078 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3079 ((['git', 'config', '--global', 'http.cookiefile',
3080 os.path.expanduser('~/.gitcookies')], ), ''),
3081 ]
3082 self.assertEqual(0, git_cl.main(['creds-check']))
3083 self.assertRegexpMatches(
3084 sys.stdout.getvalue(),
3085 'WARNING: you have configured custom path to .gitcookies: ')
3086 self.assertRegexpMatches(
3087 sys.stdout.getvalue(),
3088 'However, your configured .gitcookies file is missing.')
3089
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003090 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003091 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3092 lambda _, message: self._mocked_call('AddComment', message))
3093 self.calls = [
3094 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3095 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3096 (('AddComment', 'msg'), ''),
3097 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003098 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3099 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003100
3101 def test_git_cl_comment_add_gerrit(self):
3102 self.mock(git_cl.gerrit_util, 'SetReview',
3103 lambda host, change, msg:
3104 self._mocked_call('SetReview', host, change, msg))
3105 self.calls = [
3106 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3107 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3108 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3109 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3110 'origin/master'),
3111 ((['git', 'config', 'remote.origin.url'],),
3112 'https://chromium.googlesource.com/infra/infra'),
3113 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3114 ]
3115 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3116 '-a', 'msg']))
3117
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003118 def test_git_cl_comments_fetch_rietveld(self):
3119 self.mock(sys, 'stdout', StringIO.StringIO())
3120 self.calls = [
3121 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3122 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3123 ] * 2
3124 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3125 'messages': [
3126 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3127 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3128 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3129 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3130 # Intentionally wrong order here.
3131 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3132 'disapproval': False, 'approval': False,
3133 'sender': 'owner@example.com'},
3134 ],
3135 'owner_email': 'owner@example.com',
3136 })
3137 expected_comments_summary = [
3138 git_cl._CommentSummary(
3139 message='lgtm',
3140 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3141 disapproval=False, approval=True, sender='r@example.com'),
3142 git_cl._CommentSummary(
3143 message='not lgtm',
3144 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3145 disapproval=True, approval=False, sender='r2@example.com'),
3146 # Note: same order as in whatever Rietveld returns.
3147 git_cl._CommentSummary(
3148 message='PTAL',
3149 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3150 disapproval=False, approval=False, sender='owner@example.com'),
3151 ]
3152 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3153 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3154
3155 with git_cl.gclient_utils.temporary_directory() as tempdir:
3156 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3157 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3158 '-j', out_file]))
3159 with open(out_file) as f:
3160 read = json.load(f)
3161 self.assertEqual(len(read), 3)
3162 self.assertEqual(read[0], {
3163 'date': '2000-03-13 20:49:34.515270',
3164 'message': 'PTAL',
3165 'approval': False,
3166 'disapproval': False,
3167 'sender': 'owner@example.com'})
3168 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3169 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3170
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003171 def test_git_cl_comments_fetch_gerrit(self):
3172 self.mock(sys, 'stdout', StringIO.StringIO())
3173 self.calls = [
3174 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3175 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3176 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3177 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3178 'origin/master'),
3179 ((['git', 'config', 'remote.origin.url'],),
3180 'https://chromium.googlesource.com/infra/infra'),
3181 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3182 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3183 'owner': {'email': 'owner@example.com'},
3184 'messages': [
3185 {
3186 u'_revision_number': 1,
3187 u'author': {
3188 u'_account_id': 1111084,
3189 u'email': u'commit-bot@chromium.org',
3190 u'name': u'Commit Bot'
3191 },
3192 u'date': u'2017-03-15 20:08:45.000000000',
3193 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3194 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3195 u'tag': u'autogenerated:cq:dry-run'
3196 },
3197 {
3198 u'_revision_number': 2,
3199 u'author': {
3200 u'_account_id': 11151243,
3201 u'email': u'owner@example.com',
3202 u'name': u'owner'
3203 },
3204 u'date': u'2017-03-16 20:00:41.000000000',
3205 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3206 u'message': u'PTAL',
3207 },
3208 {
3209 u'_revision_number': 2,
3210 u'author': {
3211 u'_account_id': 148512 ,
3212 u'email': u'reviewer@example.com',
3213 u'name': u'reviewer'
3214 },
3215 u'date': u'2017-03-17 05:19:37.500000000',
3216 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3217 u'message': u'Patch Set 2: Code-Review+1',
3218 },
3219 ]
3220 })
3221 ] * 2
3222 expected_comments_summary = [
3223 git_cl._CommentSummary(
3224 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3225 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3226 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3227 git_cl._CommentSummary(
3228 message=u'PTAL',
3229 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3230 disapproval=False, approval=False, sender=u'owner@example.com'),
3231 git_cl._CommentSummary(
3232 message=u'Patch Set 2: Code-Review+1',
3233 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3234 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3235 ]
3236 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3237 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3238
3239 with git_cl.gclient_utils.temporary_directory() as tempdir:
3240 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3241 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3242 '-j', out_file]))
3243 with open(out_file) as f:
3244 read = json.load(f)
3245 self.assertEqual(len(read), 3)
3246 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3247 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3248 self.assertEqual(read[2], {
3249 u'date': u'2017-03-17 05:19:37.500000',
3250 u'message': u'Patch Set 2: Code-Review+1',
3251 u'approval': False,
3252 u'disapproval': False,
3253 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003254
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003255if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003256 logging.basicConfig(
3257 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003258 unittest.main()