blob: c30d688b5a20049f85f15ccba693b04484c084f1 [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'
Mark Mentovai57c47212017-03-09 11:14:09 -0500571 ' tests/git_cl_test.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'
Mark Mentovai57c47212017-03-09 11:14:09 -0500578 ' tests/git_cl_test.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),
Mark Mentovai57c47212017-03-09 11:14:09 -0500641 ((['git', 'config', '--unset-all', 'rietveld.bug-line-format'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700642 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
643 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700644 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
645 CERR1),
646 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700647 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
648 CERR1),
649 ((['git', 'config', 'gerrit.host', 'true'],), ''),
650 ]
651 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
652
maruel@chromium.orga3353652011-11-30 14:26:57 +0000653 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000654 def _is_gerrit_calls(cls, gerrit=False):
655 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
656 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
657
658 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000659 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000660 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000661 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000662
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000663 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000664 def _upload_no_rev_calls(cls, similarity, find_copies):
665 return (cls._git_base_calls(similarity, find_copies) +
666 cls._git_upload_no_rev_calls())
667
668 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000669 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000670 if similarity is None:
671 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700672 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700673 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000674 else:
tandrii33a46ff2016-08-23 05:53:40 -0700675 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700676 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000677
678 if find_copies is None:
679 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700680 find_copies_call = ((['git', 'config', '--bool',
681 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000682 else:
tandrii5d48c322016-08-18 16:19:37 -0700683 val = str(find_copies).lower()
684 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000685 'branch.master.git-find-copies', val],), '')
686
687 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000688 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800689 '-l100000', '-C'+similarity,
690 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000691 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000692 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000693 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000694
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000695 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000696 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000697 similarity_call,
698 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
699 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000700 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000701 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700702 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
703 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000704 ((['git', 'config', 'rietveld.server'],),
705 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000706 ((['git', 'config', 'branch.master.merge'],), 'master'),
707 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000708 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000709 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000710 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000711 ((['git', 'rev-parse', '--show-cdup'],), ''),
712 ((['git', 'rev-parse', 'HEAD'],), '12345'),
713 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000714 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000715 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700716 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000717 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000718 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000719 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000720 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000721 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000722 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000723 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000724 'desc\n'),
Mark Mentovai57c47212017-03-09 11:14:09 -0500725 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
726 ((['git', 'config', 'rietveld.bug-line-format'],), CERR1),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000727 ]
728
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000729 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000730 def _git_upload_no_rev_calls(cls):
731 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000732 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000733 ]
734
735 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000736 def _git_upload_calls(cls, private):
737 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000738 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000739 private_call = []
740 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000741 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000742 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000743 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000744
maruel@chromium.orga3353652011-11-30 14:26:57 +0000745 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000746 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000747 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000748 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800749 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000750 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700751 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000752 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000753 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700755 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000756 ] + cls._git_post_upload_calls()
757
758 @classmethod
759 def _git_post_upload_calls(cls):
760 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000761 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
762 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
763 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000764 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000765 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000766 ]
767
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000768 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000769 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000770 fake_ancestor = 'fake_ancestor'
771 fake_cl = 'fake_cl_for_patch'
772 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000773 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000774 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000775 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000776 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000777 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000778 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000779 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000780 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700781 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000782 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000783 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000784 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000785 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000786 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000787 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000788 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000789 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000791 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000792 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000793
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000794 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700795 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000796 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000797 return [
798 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000799 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000800 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000801 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700802 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000803 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000804 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100805 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000806 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000807 ]
808
809 def _run_reviewer_test(
810 self,
811 upload_args,
812 expected_description,
813 returned_description,
814 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000815 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700816 private=False,
817 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000818 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000819 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000820 try:
821 similarity = upload_args[upload_args.index('--similarity')+1]
822 except ValueError:
823 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000824
825 if '--find-copies' in upload_args:
826 find_copies = True
827 elif '--no-find-copies' in upload_args:
828 find_copies = False
829 else:
830 find_copies = None
831
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000832 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700833 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000834
835 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000836
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000837 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 self.assertEquals(
839 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000840 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000841 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000842 '#--------------------This line is 72 characters long'
843 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000844 expected_description,
845 desc)
846 return returned_description
847 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000848
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000849 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000850 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700851 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000852 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000853 return 1, 2
854 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000855
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000856 git_cl.main(['upload'] + upload_args)
857
858 def test_no_reviewer(self):
859 self._run_reviewer_test(
860 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000861 'desc\n\nBUG=',
862 '# Blah blah comment.\ndesc\n\nBUG=',
863 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000864 [])
865
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000866 def test_keep_similarity(self):
867 self._run_reviewer_test(
868 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000869 'desc\n\nBUG=',
870 '# Blah blah comment.\ndesc\n\nBUG=',
871 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000872 [])
873
iannucci@chromium.org79540052012-10-19 23:15:26 +0000874 def test_keep_find_copies(self):
875 self._run_reviewer_test(
876 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000877 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000878 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000879 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000880 [])
881
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000882 def test_private(self):
883 self._run_reviewer_test(
884 ['--private'],
885 'desc\n\nBUG=',
886 '# Blah blah comment.\ndesc\n\nBUG=\n',
887 'desc\n\nBUG=',
888 [])
889
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000890 def test_reviewers_cmd_line(self):
891 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000892 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000893 self._run_reviewer_test(
894 ['-r' 'foo@example.com'],
895 description,
896 '\n%s\n' % description,
897 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000898 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000899
900 def test_reviewer_tbr_overriden(self):
901 # Reviewer is overriden with TBR
902 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000903 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000904 self._run_reviewer_test(
905 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000906 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000907 description.strip('\n'),
908 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000909 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000910
911 def test_reviewer_multiple(self):
912 # Handles multiple R= or TBR= lines.
913 description = (
bradnelsond975b302016-10-23 12:20:23 -0700914 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
915 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000916 self._run_reviewer_test(
917 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000918 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000919 description,
920 description,
bradnelsond975b302016-10-23 12:20:23 -0700921 ['--reviewers=another@example.com,reviewer@example.com'],
922 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000923
maruel@chromium.orga3353652011-11-30 14:26:57 +0000924 def test_reviewer_send_mail(self):
925 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000926 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000927 self._run_reviewer_test(
928 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000929 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000930 description.strip('\n'),
931 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000932 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000933
934 def test_reviewer_send_mail_no_rev(self):
935 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000936 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700937 self.calls = self._upload_no_rev_calls(None, None) + [
938 ((['DieWithError', 'Must specify reviewers to send email.'],),
939 SystemExitMock())
940 ]
941
942 def RunEditor(desc, _, **kwargs):
943 return desc
944 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
945 self.mock(sys, 'stdout', stdout)
946 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000947 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700948 self.assertEqual(
949 'Using 50% similarity for rename/copy detection. Override with '
950 '--similarity.\n',
951 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000952
tandriif9aefb72016-07-01 09:06:51 -0700953 def test_bug_on_cmd(self):
954 self._run_reviewer_test(
955 ['--bug=500658,proj:123'],
956 'desc\n\nBUG=500658\nBUG=proj:123',
957 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
958 'desc\n\nBUG=500658\nBUG=proj:1234',
959 [])
960
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100961 def _land_rietveld_common(self, debug=False):
962 if debug:
963 # Very useful due to finally clause in git cl land raising exceptions and
964 # shadowing real cause of failure.
965 self.mock(git_cl, '_IS_BEING_TESTED', True)
966 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100967 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100968
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100969 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
970 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100971 self.mock(RietveldMock, 'update_description', staticmethod(
972 lambda i, d: self._mocked_call(['update_description', i, d])))
973 self.mock(RietveldMock, 'add_comment', staticmethod(
974 lambda i, c: self._mocked_call(['add_comment', i, c])))
975 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100976 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
977 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
978 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
979 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
980 CERR1),
981 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
982 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800983 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100984 ((['git', 'config', 'rietveld.server'],),
985 'https://codereview.chromium.org'),
986 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
987 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
988 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
989 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100990 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
991 ''), # No commits to rebase, according to local view of origin.
992 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
993 'fake_ancestor_sha'),
994 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
995 ((['git', 'rev-parse', '--show-cdup'],), ''),
996 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
997 ((['git', 'diff', '--name-status', '--no-renames', '-r',
998 'fake_ancestor_sha...', '.'],),
999 'M\tfile1.cpp'),
1000 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1001 ((['git', 'config', 'branch.feature.rietveldserver'],),
1002 'https://codereview.chromium.org'),
1003 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1004 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1005 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1006 'fake_ancestor_sha', 'feature'],),
1007 # This command just prints smth like this:
1008 # file1.cpp | 53 ++++++--
1009 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1010 ''),
1011 ((['git', 'show-ref', '--quiet', '--verify',
1012 'refs/heads/git-cl-commit'],),
1013 ''), # 0 return code means branch exists.
1014 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1015 ((['git', 'show-ref', '--quiet', '--verify',
1016 'refs/heads/git-cl-cherry-pick'],),
1017 CERR1), # This means git-cl-cherry-pick branch does not exist.
1018 ((['git', 'rev-parse', '--show-cdup'],), ''),
1019 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1020 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1021 ((['git', 'commit', '-m',
1022 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001023 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001024 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1025 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1026 ((['git', 'config', '--get', 'remote.origin.url'],),
1027 'https://chromium.googlesource.com/infra/infra'),
1028 ]
1029
1030 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001031 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001032 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001033 ((['git', 'config', 'remote.origin.url'],),
1034 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001035 (('_is_git_numberer_enabled',
1036 'https://chromium.googlesource.com/infra/infra',
1037 'refs/heads/master'),
1038 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001039 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1040 ''),
1041 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1042 ((['git', 'checkout', '-q', 'feature'],), ''),
1043 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1044 ((['git', 'config', 'rietveld.viewvc-url'],),
1045 'https://chromium.googlesource.com/infra/infra/+/'),
1046 ((['update_description', 123,
1047 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1048 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1049 ''),
1050 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1051 'fake_sha_rebased (presubmit successful).'],), ''),
1052 ]
1053 git_cl.main(['land'])
1054
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001055 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001056 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001057
1058 # Special mocks to check validity of timestamp.
1059 original_git_amend_head = git_cl._git_amend_head
1060 def _git_amend_head_mock(msg, tstamp):
1061 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1062 return original_git_amend_head(msg, tstamp)
1063 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1064
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001065 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001066 ((['git', 'config', 'remote.origin.url'],),
1067 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001068 (('_is_git_numberer_enabled',
1069 'https://chromium.googlesource.com/chromium/src',
1070 'refs/heads/master'),
1071 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001072 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1073 'This is parent commit.\n'
1074 '\n'
1075 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1076 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001077 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1078 '1480022355'), # Committer's unix timestamp.
1079 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1080 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001081
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001082 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001083 ((['git', 'commit', '--amend', '-m',
1084 'Issue: 123\n\nR=john@chromium.org\n'
1085 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001086 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001087 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1088 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1089
1090 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1091 ''),
1092 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1093 ((['git', 'checkout', '-q', 'feature'],), ''),
1094 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1095 ((['git', 'config', 'rietveld.viewvc-url'],),
1096 'https://chromium.googlesource.com/infra/infra/+/'),
1097 ((['update_description', 123,
1098 'Issue: 123\n\nR=john@chromium.org\n'
1099 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001100 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001101 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1102 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1103 'Committed: '
1104 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1105 ''),
1106 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1107 'fake_sha_rebased (presubmit successful).'],), ''),
1108 ]
1109 git_cl.main(['land'])
1110
1111 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001112 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001113 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001114 ((['git', 'config', 'remote.origin.url'],),
1115 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001116 (('_is_git_numberer_enabled',
1117 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1118 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001119
1120 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1121 'This is parent commit with no footer.'),
1122
1123 ((['git', 'checkout', '-q', 'feature'],), ''),
1124 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1125 ]
1126 with self.assertRaises(ValueError) as cm:
1127 git_cl.main(['land'])
1128 self.assertEqual(cm.exception.message,
1129 'Unable to infer commit position from footers')
1130
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001131 def test_git_numberer_not_whitelisted_repo(self):
1132 self.calls = []
1133 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001134 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1135 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001136 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001137
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001138 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001139 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1140 self.calls = [
1141 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001142 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001143 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001144 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001145 remote_url='https://chromium.googlesource.com/chromium/src',
1146 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001147 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001148
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001149 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001150 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001151 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001152 def fake_temporary_directory(**kwargs):
1153 yield tempdir
1154 self.mock(git_cl.gclient_utils, 'temporary_directory',
1155 fake_temporary_directory)
1156 self._test_GitNumbererState_valid_configs_inner(tempdir)
1157
1158 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001159 self.calls = [
1160 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001161 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001162 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1163 '''
1164 [plugin "git-numberer"]
1165 validate-enabled-refglob = refs/else/*
1166 validate-enabled-refglob = refs/heads/*
1167 validate-disabled-refglob = refs/heads/disabled
1168 validate-disabled-refglob = refs/branch-heads/*
1169 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001170 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1171 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001172 'refs/else/*\n'
1173 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001174 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1175 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001176 'refs/heads/disabled\n'
1177 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001178 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001179
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001180 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001181 remote_url='https://chromium.googlesource.com/chromium/src',
1182 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001183 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001184
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001185 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001186 remote_url='https://chromium.googlesource.com/chromium/src',
1187 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001188 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001189
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001190 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001191 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001192 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001193 remote_url='https://chromium.googlesource.com/chromium/src',
1194 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001195 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001196
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001197 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001198 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001199 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001200 if skip_auth_check:
1201 return [((cmd, ), 'true')]
1202
tandrii5d48c322016-08-18 16:19:37 -07001203 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001204 if issue:
1205 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001206 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001207 ])
1208 calls.extend([
1209 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1210 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1211 ((['git', 'config', 'remote.origin.url'],),
1212 'https://chromium.googlesource.com/my/repo'),
1213 ((['git', 'config', 'remote.origin.url'],),
1214 'https://chromium.googlesource.com/my/repo'),
1215 ])
1216 return calls
1217
1218 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001219 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
1220 fetched_status=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001221 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001222 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001223 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001224 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001225 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001226 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1227 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001228 ]
1229 calls += cls._is_gerrit_calls(True)
1230 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001231 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001232 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1233 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001234 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001235 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001236 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001237 ((['get_or_create_merge_base', 'master',
1238 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001239 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001240 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001241 ]
1242 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1243
1244 if issue:
1245 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001246 (('GetChangeDetail', 'chromium-review.googlesource.com',
1247 '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
1248 {
1249 'change_id': '123456789',
1250 'current_revision': 'sha1_of_current_revision',
1251 'revisions': { 'sha1_of_current_revision': {
1252 'commit': {'message': fetched_description},
1253 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001254 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001255 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001256 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001257 if fetched_status == 'ABANDONED':
1258 calls += [
1259 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1260 '123456 has been abandoned, new uploads are not '
1261 'allowed'), SystemExitMock()),
1262 ]
1263 return calls
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001264
1265 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1266 get_remote_branch=False)
1267 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001268 ((['git', 'rev-parse', '--show-cdup'],), ''),
1269 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001270
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001271 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001272 'diff', '--name-status', '--no-renames', '-r',
1273 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001274 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001275 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001276 ]
1277
1278 if not issue:
1279 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001280 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001281 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001282 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001283 ]
1284
1285 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001286 ((['git', 'config', 'user.email'],), 'me@example.com'),
1287 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001288 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1289 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001290 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001291 ]
1292 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001293
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001294 @classmethod
1295 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001296 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001297 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001298 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001299 post_amend_description=None, issue=None, cc=None,
1300 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001301 if post_amend_description is None:
1302 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001303 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001304 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001305
tandriia60502f2016-06-20 02:01:53 -07001306 if squash_mode == 'default':
1307 calls.extend([
1308 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1309 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1310 ])
1311 elif squash_mode in ('override_squash', 'override_nosquash'):
1312 calls.extend([
1313 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1314 'true' if squash_mode == 'override_squash' else 'false'),
1315 ])
1316 else:
1317 assert squash_mode in ('squash', 'nosquash')
1318
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001319 # If issue is given, then description is fetched from Gerrit instead.
1320 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001321 calls += [
1322 ((['git', 'log', '--pretty=format:%s\n\n%b',
1323 'fake_ancestor_sha..HEAD'],),
1324 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001325 if squash:
1326 title = 'Initial_upload'
1327 else:
1328 if not title:
1329 calls += [
1330 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001331 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001332 ]
1333 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001334 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001335 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001336 # DownloadGerritHook(False)
1337 ((False, ),
1338 ''),
1339 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001340 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001341 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001342 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001343 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001344 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001345 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001346 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001347 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001348 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001349 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001350 if not issue:
1351 # Prompting to edit description on first upload.
1352 calls += [
1353 ((['git', 'config', 'core.editor'],), ''),
1354 ((['RunEditor'],), description),
1355 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001356 ref_to_push = 'abcdef0123456789'
1357 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001358 ((['git', 'config', 'branch.master.merge'],),
1359 'refs/heads/master'),
1360 ((['git', 'config', 'branch.master.remote'],),
1361 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001362 ((['get_or_create_merge_base', 'master',
1363 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001364 'origin/master'),
1365 ((['git', 'rev-parse', 'HEAD:'],),
1366 '0123456789abcdef'),
1367 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001368 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001369 ref_to_push),
1370 ]
1371 else:
1372 ref_to_push = 'HEAD'
1373
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001374 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001375 ((['git', 'rev-list',
1376 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001377 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001378
Aaron Gable9b713dd2016-12-14 16:04:21 -08001379 if title:
1380 if ref_suffix:
1381 ref_suffix += ',m=' + title
1382 else:
1383 ref_suffix = '%m=' + title
1384
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001385 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1386 if ref_suffix:
1387 ref_suffix += ',' + notify_suffix
1388 else:
1389 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001390
ukai@chromium.orge8077812012-02-03 03:41:46 +00001391 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001392 ref_suffix += ',' + ','.join('r=%s' % email
1393 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001394
1395 if git_mirror is None:
1396 calls += [
1397 ((['git', 'config', 'remote.origin.url'],),
1398 'https://chromium.googlesource.com/yyy/zzz'),
1399 ]
1400 else:
1401 calls += [
1402 ((['git', 'config', 'remote.origin.url'],),
1403 '/cache/this-dir-exists'),
1404 (('os.path.isdir', '/cache/this-dir-exists'),
1405 True),
1406 # Runs in /cache/this-dir-exists.
1407 ((['git', 'config', 'remote.origin.url'],),
1408 'https://chromium.googlesource.com/yyy/zzz'),
1409 ]
1410
ukai@chromium.orge8077812012-02-03 03:41:46 +00001411 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001412 ((['git', 'push',
1413 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001414 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001415 ('remote:\n'
1416 'remote: Processing changes: (\)\n'
1417 'remote: Processing changes: (|)\n'
1418 'remote: Processing changes: (/)\n'
1419 'remote: Processing changes: (-)\n'
1420 'remote: Processing changes: new: 1 (/)\n'
1421 'remote: Processing changes: new: 1, done\n'
1422 'remote:\n'
1423 'remote: New Changes:\n'
1424 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1425 'remote:\n'
1426 'To https://chromium.googlesource.com/yyy/zzz\n'
1427 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001428 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001429 if squash:
1430 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001431 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001432 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001433 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001434 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001435 ((['git', 'config', 'branch.master.gerritsquashhash',
1436 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001437 ]
tandrii88189772016-09-29 04:29:57 -07001438 calls += [
1439 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001440 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001441 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001442 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001443 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001444 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001445 return calls
1446
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001447 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001448 self,
1449 upload_args,
1450 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001451 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001452 squash=True,
1453 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001454 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001455 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001456 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001457 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001458 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001459 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001460 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001461 git_mirror=None,
1462 fetched_status=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001463 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001464 if squash_mode is None:
1465 if '--no-squash' in upload_args:
1466 squash_mode = 'nosquash'
1467 elif '--squash' in upload_args:
1468 squash_mode = 'squash'
1469 else:
1470 squash_mode = 'default'
1471
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001472 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001473 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001474 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001475 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001476 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001477 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1478 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001479 self.mock(git_cl.gclient_utils, 'RunEditor',
1480 lambda *_, **__: self._mocked_call(['RunEditor']))
1481 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1482
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001483 original_os_path_isdir = os.path.isdir
1484 def selective_os_path_isdir_mock(path):
1485 if path == '/cache/this-dir-exists':
1486 return self._mocked_call('os.path.isdir', path)
1487 return original_os_path_isdir(path)
1488 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1489
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001490 self.calls = self._gerrit_base_calls(
1491 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001492 fetched_description=description,
1493 fetched_status=fetched_status)
1494 if fetched_status != 'ABANDONED':
1495 self.calls += self._gerrit_upload_calls(
1496 description, reviewers, squash,
1497 squash_mode=squash_mode,
1498 expected_upstream_ref=expected_upstream_ref,
1499 ref_suffix=ref_suffix, title=title, notify=notify,
1500 post_amend_description=post_amend_description,
1501 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001502 # Uncomment when debugging.
1503 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001504 git_cl.main(['upload'] + upload_args)
1505
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001506 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001507 self._run_gerrit_upload_test(
1508 ['--no-squash'],
1509 'desc\n\nBUG=\n',
1510 [],
1511 squash=False,
1512 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1513
1514 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001515 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001516 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001517 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001518 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001519 [],
tandriia60502f2016-06-20 02:01:53 -07001520 squash=False,
1521 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001522 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001523
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001524 def test_gerrit_no_reviewer(self):
1525 self._run_gerrit_upload_test(
1526 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001527 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001528 [],
1529 squash=False,
1530 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001531
tandriieefe8322016-08-17 10:12:24 -07001532 def test_gerrit_patch_bad_chars(self):
1533 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001534 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001535 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001536 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001537 squash=False,
1538 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001539 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001540 self.assertIn(
1541 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001542 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1543 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001544 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001545
ukai@chromium.orge8077812012-02-03 03:41:46 +00001546 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001547 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001548 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001549 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001550 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001551 squash=False,
1552 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001553 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001554
1555 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001556 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001557 [],
bradnelsond975b302016-10-23 12:20:23 -07001558 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1559 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001560 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001561 ['reviewer@example.com', 'another@example.com'],
1562 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001563 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001564 ref_suffix='%l=Code-Review+1',
1565 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001566
1567 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001568 self._run_gerrit_upload_test(
1569 [],
1570 'desc\nBUG=\n\nChange-Id: 123456789',
1571 [],
1572 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001573
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001574 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001575 self._run_gerrit_upload_test(
1576 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001577 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001578 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001579 squash=True,
1580 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001581
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001582 def test_gerrit_upload_squash_first_with_mirror(self):
1583 self._run_gerrit_upload_test(
1584 ['--squash'],
1585 'desc\nBUG=\n\nChange-Id: 123456789',
1586 [],
1587 squash=True,
1588 expected_upstream_ref='origin/master',
1589 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1590
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001591 def test_gerrit_upload_squash_reupload(self):
1592 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001593 self._run_gerrit_upload_test(
1594 ['--squash'],
1595 description,
1596 [],
1597 squash=True,
1598 expected_upstream_ref='origin/master',
1599 issue=123456)
1600
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001601 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1602 self.mock(git_cl, 'DieWithError',
1603 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1604 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1605 with self.assertRaises(SystemExitMock):
1606 self._run_gerrit_upload_test(
1607 ['--squash'],
1608 description,
1609 [],
1610 squash=True,
1611 expected_upstream_ref='origin/master',
1612 issue=123456,
1613 fetched_status='ABANDONED')
1614
rmistry@google.com2dd99862015-06-22 12:22:18 +00001615 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001616 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001617 def mock_run_git(*args, **_kwargs):
1618 if args[0] == ['for-each-ref',
1619 '--format=%(refname:short) %(upstream:short)',
1620 'refs/heads']:
1621 # Create a local branch dependency tree that looks like this:
1622 # test1 -> test2 -> test3 -> test4 -> test5
1623 # -> test3.1
1624 # test6 -> test0
1625 branch_deps = [
1626 'test2 test1', # test1 -> test2
1627 'test3 test2', # test2 -> test3
1628 'test3.1 test2', # test2 -> test3.1
1629 'test4 test3', # test3 -> test4
1630 'test5 test4', # test4 -> test5
1631 'test6 test0', # test0 -> test6
1632 'test7', # test7
1633 ]
1634 return '\n'.join(branch_deps)
1635 self.mock(git_cl, 'RunGit', mock_run_git)
1636
1637 class RecordCalls:
1638 times_called = 0
1639 record_calls = RecordCalls()
1640 def mock_CMDupload(*args, **_kwargs):
1641 record_calls.times_called += 1
1642 return 0
1643 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1644
1645 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001646 (('ask_for_data', 'This command will checkout all dependent branches '
1647 'and run "git cl upload". Press Enter to continue, '
1648 'or Ctrl+C to abort'), ''),
1649 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001650
1651 class MockChangelist():
1652 def __init__(self):
1653 pass
1654 def GetBranch(self):
1655 return 'test1'
1656 def GetIssue(self):
1657 return '123'
1658 def GetPatchset(self):
1659 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001660 def IsGerrit(self):
1661 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001662
1663 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1664 # CMDupload should have been called 5 times because of 5 dependent branches.
1665 self.assertEquals(5, record_calls.times_called)
1666 self.assertEquals(0, ret)
1667
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001668 def test_gerrit_change_id(self):
1669 self.calls = [
1670 ((['git', 'write-tree'], ),
1671 'hashtree'),
1672 ((['git', 'rev-parse', 'HEAD~0'], ),
1673 'branch-parent'),
1674 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1675 'A B <a@b.org> 1456848326 +0100'),
1676 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1677 'C D <c@d.org> 1456858326 +0100'),
1678 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1679 'hashchange'),
1680 ]
1681 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1682 self.assertEqual(change_id, 'Ihashchange')
1683
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001684 def test_desecription_append_footer(self):
1685 for init_desc, footer_line, expected_desc in [
1686 # Use unique desc first lines for easy test failure identification.
1687 ('foo', 'R=one', 'foo\n\nR=one'),
1688 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1689 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1690 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1691 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1692 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1693 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1694 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1695 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1696 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1697 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1698 ]:
1699 desc = git_cl.ChangeDescription(init_desc)
1700 desc.append_footer(footer_line)
1701 self.assertEqual(desc.description, expected_desc)
1702
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001703 def test_update_reviewers(self):
1704 data = [
1705 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001706 ('foo\nR=xx', [], 'foo\nR=xx'),
1707 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001708 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001709 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1710 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1711 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001712 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001713 ('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 +00001714 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001715 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1716 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1717 # Same as the line before, but full of whitespaces.
1718 (
1719 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1720 'foo\nBar\n\nR=c@c\n BUG =',
1721 ),
1722 # Whitespaces aren't interpreted as new lines.
1723 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001724 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001725 expected = [i[2] for i in data]
1726 actual = []
1727 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001728 obj = git_cl.ChangeDescription(orig)
1729 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001730 actual.append(obj.description)
1731 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001732
wittman@chromium.org455dc922015-01-26 20:15:50 +00001733 def test_get_target_ref(self):
1734 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001735 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001736 self.assertEqual(None, git_cl.GetTargetRef(None,
1737 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001738 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001739
wittman@chromium.org455dc922015-01-26 20:15:50 +00001740 # Check default target refs for branches.
1741 self.assertEqual('refs/heads/master',
1742 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001743 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001744 self.assertEqual('refs/heads/master',
1745 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001746 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001747 self.assertEqual('refs/heads/master',
1748 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001749 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001750 self.assertEqual('refs/branch-heads/123',
1751 git_cl.GetTargetRef('origin',
1752 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001753 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001754 self.assertEqual('refs/diff/test',
1755 git_cl.GetTargetRef('origin',
1756 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001757 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001758 self.assertEqual('refs/heads/chrome/m42',
1759 git_cl.GetTargetRef('origin',
1760 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001761 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001762
1763 # Check target refs for user-specified target branch.
1764 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1765 'refs/remotes/branch-heads/123'):
1766 self.assertEqual('refs/branch-heads/123',
1767 git_cl.GetTargetRef('origin',
1768 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001769 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001770 for branch in ('origin/master', 'remotes/origin/master',
1771 'refs/remotes/origin/master'):
1772 self.assertEqual('refs/heads/master',
1773 git_cl.GetTargetRef('origin',
1774 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001775 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001776 for branch in ('master', 'heads/master', 'refs/heads/master'):
1777 self.assertEqual('refs/heads/master',
1778 git_cl.GetTargetRef('origin',
1779 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001780 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001781
wychen@chromium.orga872e752015-04-28 23:42:18 +00001782 def test_patch_when_dirty(self):
1783 # Patch when local tree is dirty
1784 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1785 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1786
1787 def test_diff_when_dirty(self):
1788 # Do 'git cl diff' when local tree is dirty
1789 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1790 self.assertNotEqual(git_cl.main(['diff']), 0)
1791
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001792 @staticmethod
1793 def _get_gerrit_codereview_server_calls(branch, value=None,
1794 git_short_host='host',
1795 detect_branch=True):
1796 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1797
1798 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1799 """
1800 calls = []
1801 if detect_branch:
1802 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1803 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1804 CERR1 if value is None else value))
1805 if value is None:
1806 calls += [
1807 ((['git', 'config', 'branch.' + branch + '.merge'],),
1808 'refs/heads' + branch),
1809 ((['git', 'config', 'branch.' + branch + '.remote'],),
1810 'origin'),
1811 ((['git', 'config', 'remote.origin.url'],),
1812 'https://%s.googlesource.com/my/repo' % git_short_host),
1813 ]
1814 return calls
1815
tandriidf09a462016-08-18 16:23:55 -07001816 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001817 new_branch=False, git_short_host='host',
1818 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001819 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001820 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1821 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001822 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001823 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001824 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1825
tandriidf09a462016-08-18 16:23:55 -07001826 if new_branch:
1827 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1828 else:
1829 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001830
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001831 if not force_codereview:
1832 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001833 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001834 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001835 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1836 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001837 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001838 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001839
1840 if is_gerrit:
1841 if not force_codereview:
1842 self.calls += [
1843 ((['git', 'config', 'gerrit.host'],), 'true'),
1844 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001845 if detect_gerrit_server:
1846 self.calls += self._get_gerrit_codereview_server_calls(
1847 'master', git_short_host=git_short_host,
1848 detect_branch=not new_branch and force_codereview)
1849
1850 self.calls += [
1851 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001852 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001853 {
1854 'current_revision': '7777777777',
1855 'revisions': {
1856 '1111111111': {
1857 '_number': 1,
1858 'fetch': {'http': {
1859 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1860 'ref': 'refs/changes/56/123456/1',
1861 }},
1862 },
1863 '7777777777': {
1864 '_number': 7,
1865 'fetch': {'http': {
1866 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1867 'ref': 'refs/changes/56/123456/7',
1868 }},
1869 },
1870 },
1871 }),
1872 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001873 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001874 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001875 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001876 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001877 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001878 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001879 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001880
tandriidf09a462016-08-18 16:23:55 -07001881 def _common_patch_successful(self, new_branch=False):
1882 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001883 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001884 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001885 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001886 ((['git', 'config', 'branch.master.rietveldserver',
1887 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001888 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001889 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001890 ((['git', 'commit', '-m',
1891 'Description\n\n' +
1892 'patch from issue 123456 at patchset 60001 ' +
1893 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001894 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001895
1896 def test_patch_successful(self):
1897 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001898 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1899
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001900 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001901 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001902 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1903
wychen@chromium.orga872e752015-04-28 23:42:18 +00001904 def test_patch_conflict(self):
1905 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001906 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001907 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001908
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001909 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001910 self._patch_common(is_gerrit=True, git_short_host='chromium',
1911 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001912 self.calls += [
1913 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1914 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001915 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001916 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001917 ((['git', 'config', 'branch.master.gerritserver',
1918 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001919 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001920 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001921 ]
1922 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1923
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001924 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001925 self._patch_common(is_gerrit=True, force_codereview=True,
1926 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001927 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001928 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001929 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001930 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001931 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001932 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001933 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001934 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001935 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001936 ]
1937 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1938
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001939 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001940 self._patch_common(is_gerrit=True, git_short_host='else',
1941 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001942 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001943 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001944 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001945 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001946 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001947 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001948 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001949 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001950 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001951 ]
1952 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001953 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001954
1955 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001956 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1957 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001958 self.calls += [
1959 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1960 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001961 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1962 ''),
1963 ((['git', 'config', 'branch.master.gerritserver',
1964 'https://chromium-review.googlesource.com'],), ''),
1965 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001966 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1967 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1968 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001969 ]
1970 with self.assertRaises(SystemExitMock):
1971 git_cl.main(['patch',
1972 'https://chromium-review.googlesource.com/#/c/123456/1'])
1973
tandriic2405f52016-10-10 08:13:15 -07001974 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001975 def notExists(_issue, *_, **kwargs):
1976 self.assertFalse(kwargs['ignore_404'])
1977 raise git_cl.gerrit_util.GerritError(404, '')
1978 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1979
tandriic2405f52016-10-10 08:13:15 -07001980 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001981 self.calls = [
1982 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1983 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1984 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1985 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1986 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1987 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001988 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001989 'or you have no access to it'],), SystemExitMock()),
1990 ]
1991 with self.assertRaises(SystemExitMock):
1992 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1993
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001994 def _checkout_calls(self):
1995 return [
1996 ((['git', 'config', '--local', '--get-regexp',
1997 'branch\\..*\\.rietveldissue'], ),
1998 ('branch.retrying.rietveldissue 1111111111\n'
1999 'branch.some-fix.rietveldissue 2222222222\n')),
2000 ((['git', 'config', '--local', '--get-regexp',
2001 'branch\\..*\\.gerritissue'], ),
2002 ('branch.ger-branch.gerritissue 123456\n'
2003 'branch.gbranch654.gerritissue 654321\n')),
2004 ]
2005
2006 def test_checkout_gerrit(self):
2007 """Tests git cl checkout <issue>."""
2008 self.calls = self._checkout_calls()
2009 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2010 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2011
2012 def test_checkout_rietveld(self):
2013 """Tests git cl checkout <issue>."""
2014 self.calls = self._checkout_calls()
2015 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2016 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2017
2018 def test_checkout_not_found(self):
2019 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002020 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002021 self.calls = self._checkout_calls()
2022 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2023
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002024 def test_checkout_no_branch_issues(self):
2025 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002026 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002027 self.calls = [
2028 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002029 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002030 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002031 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002032 ]
2033 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2034
tandrii@chromium.org28253532016-04-14 13:46:56 +00002035 def _test_gerrit_ensure_authenticated_common(self, auth,
2036 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002037 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2038 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2039 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002040 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002041 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002042 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002043 cl.branch = 'master'
2044 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002045 cl.lookedup_issue = True
2046 return cl
2047
2048 def test_gerrit_ensure_authenticated_missing(self):
2049 cl = self._test_gerrit_ensure_authenticated_common(auth={
2050 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
2051 })
2052 self.calls.append(
2053 ((['DieWithError',
2054 'Credentials for the following hosts are required:\n'
2055 ' chromium-review.googlesource.com\n'
2056 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002057 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002058 'https://chromium-review.googlesource.com/new-password'],), ''),)
2059 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2060
2061 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002062 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002063 cl = self._test_gerrit_ensure_authenticated_common(auth={
2064 'chromium.googlesource.com': 'one',
2065 'chromium-review.googlesource.com': 'other',
2066 })
2067 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002068 (('ask_for_data', 'If you know what you are doing '
2069 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002070 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2071
2072 def test_gerrit_ensure_authenticated_ok(self):
2073 cl = self._test_gerrit_ensure_authenticated_common(auth={
2074 'chromium.googlesource.com': 'same',
2075 'chromium-review.googlesource.com': 'same',
2076 })
2077 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2078
tandrii@chromium.org28253532016-04-14 13:46:56 +00002079 def test_gerrit_ensure_authenticated_skipped(self):
2080 cl = self._test_gerrit_ensure_authenticated_common(
2081 auth={}, skip_auth_check=True)
2082 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2083
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002084 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002085 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2086 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002087 self.calls = [
2088 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002089 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002090 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2091 ((['git', 'config', 'rietveld.server'],), ''),
2092 ((['git', 'config', 'rietveld.server'],), ''),
2093 ((['git', 'config', 'branch.feature.rietveldserver'],),
2094 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002095 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002096 ]
2097 self.assertEqual(0, git_cl.main(['set-commit']))
2098
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002099 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002100 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002101 lambda h, i, labels, notify=None:
2102 self._mocked_call(['SetReview', h, i, labels, notify]))
2103
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002104 self.calls = [
2105 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002106 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2107 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002108 ((['git', 'config', 'branch.feature.gerritserver'],),
2109 'https://chromium-review.googlesource.com'),
2110 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002111 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002112 ]
tandriid9e5ce52016-07-13 02:32:59 -07002113
2114 def test_cmd_set_commit_gerrit_clear(self):
2115 self._cmd_set_commit_gerrit_common(0)
2116 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2117
2118 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002119 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002120 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2121
tandriid9e5ce52016-07-13 02:32:59 -07002122 def test_cmd_set_commit_gerrit(self):
2123 self._cmd_set_commit_gerrit_common(2)
2124 self.assertEqual(0, git_cl.main(['set-commit']))
2125
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002126 def test_description_display(self):
2127 out = StringIO.StringIO()
2128 self.mock(git_cl.sys, 'stdout', out)
2129
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002130 self.mock(git_cl, 'Changelist', ChangelistMock)
2131 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002132
2133 self.assertEqual(0, git_cl.main(['description', '-d']))
2134 self.assertEqual('foo\n', out.getvalue())
2135
2136 def test_description_rietveld(self):
2137 out = StringIO.StringIO()
2138 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002139 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002140
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002141 self.assertEqual(0, git_cl.main([
2142 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2143 self.assertEqual('foobar\n', out.getvalue())
2144
iannucci3c972b92016-08-17 13:24:10 -07002145 def test_StatusFieldOverrideIssueMissingArgs(self):
2146 out = StringIO.StringIO()
2147 self.mock(git_cl.sys, 'stderr', out)
2148
2149 try:
2150 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2151 except SystemExit as ex:
2152 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002153 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002154
2155 out = StringIO.StringIO()
2156 self.mock(git_cl.sys, 'stderr', out)
2157
2158 try:
2159 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2160 except SystemExit as ex:
2161 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002162 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002163
2164 def test_StatusFieldOverrideIssue(self):
2165 out = StringIO.StringIO()
2166 self.mock(git_cl.sys, 'stdout', out)
2167
2168 def assertIssue(cl_self, *_args):
2169 self.assertEquals(cl_self.issue, 1)
2170 return 'foobar'
2171
2172 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2173 self.calls = [
2174 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2175 ((['git', 'config', 'rietveld.server'],), ''),
2176 ((['git', 'config', 'rietveld.server'],), ''),
2177 ]
iannuccie53c9352016-08-17 14:40:40 -07002178 self.assertEqual(
2179 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2180 0)
iannucci3c972b92016-08-17 13:24:10 -07002181 self.assertEqual(out.getvalue(), 'foobar\n')
2182
iannuccie53c9352016-08-17 14:40:40 -07002183 def test_SetCloseOverrideIssue(self):
2184 def assertIssue(cl_self, *_args):
2185 self.assertEquals(cl_self.issue, 1)
2186 return 'foobar'
2187
2188 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2189 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2190 self.calls = [
2191 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2192 ((['git', 'config', 'rietveld.server'],), ''),
2193 ((['git', 'config', 'rietveld.server'],), ''),
2194 ]
2195 self.assertEqual(
2196 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2197
2198 def test_SetCommitOverrideIssue(self):
2199 def assertIssue(cl_self, *_args):
2200 self.assertEquals(cl_self.issue, 1)
2201 return 'foobar'
2202
2203 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2204 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2205 self.calls = [
2206 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2207 ((['git', 'config', 'rietveld.server'],), ''),
2208 ((['git', 'config', 'rietveld.server'],), ''),
2209 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2210 ((['git', 'config', 'rietveld.server'],), ''),
2211 ((['git', 'config', 'rietveld.server'],), ''),
2212 ]
2213 self.assertEqual(
2214 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2215
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002216 def test_description_gerrit(self):
2217 out = StringIO.StringIO()
2218 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002219 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002220 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002221 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2222 {
2223 'current_revision': 'sha1',
2224 'revisions': {'sha1': {
2225 'commit': {'message': 'foobar'},
2226 }},
2227 }),
2228 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002229 self.assertEqual(0, git_cl.main([
2230 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2231 self.assertEqual('foobar\n', out.getvalue())
2232
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002233 def test_description_set_raw(self):
2234 out = StringIO.StringIO()
2235 self.mock(git_cl.sys, 'stdout', out)
2236
2237 self.mock(git_cl, 'Changelist', ChangelistMock)
2238 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2239
2240 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2241 self.assertEqual('hihi', ChangelistMock.desc)
2242
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002243 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002244 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002245
2246 def RunEditor(desc, _, **kwargs):
2247 self.assertEquals(
2248 '# Enter a description of the change.\n'
2249 '# This will be displayed on the codereview site.\n'
2250 '# The first line will also be used as the subject of the review.\n'
2251 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002252 '--------------------\n'
2253 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002254 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002255 # Simulate user changing something.
2256 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002257
dsansomee2d6fd92016-09-08 00:10:47 -07002258 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002259 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002260
2261 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2262 self.mock(git_cl.Changelist, 'GetDescription',
2263 lambda *args: current_desc)
2264 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2265 UpdateDescriptionRemote)
2266 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2267
2268 self.calls = [
2269 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002270 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002271 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2272 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
Mark Mentovai57c47212017-03-09 11:14:09 -05002273 ((['git', 'config', 'rietveld.bug-line-format'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002274 ((['git', 'config', 'core.editor'],), 'vi'),
2275 ]
2276 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2277
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002278 def test_description_set_stdin(self):
2279 out = StringIO.StringIO()
2280 self.mock(git_cl.sys, 'stdout', out)
2281
2282 self.mock(git_cl, 'Changelist', ChangelistMock)
2283 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2284
2285 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2286 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2287
kmarshall3bff56b2016-06-06 18:31:47 -07002288 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002289 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2290
kmarshall3bff56b2016-06-06 18:31:47 -07002291 self.calls = \
2292 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2293 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002294 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002295 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2296 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002297 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2298 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2299 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002300 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2301 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2302 ((['git', 'branch', '-D', 'foo'],), '')]
2303
kmarshall3bff56b2016-06-06 18:31:47 -07002304 self.mock(git_cl, 'get_cl_statuses',
2305 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002306 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2307 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2308 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002309
2310 self.assertEqual(0, git_cl.main(['archive', '-f']))
2311
2312 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002313 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002314 self.calls = \
2315 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2316 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002317 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002318 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2319 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002320 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2321
kmarshall9249e012016-08-23 12:02:16 -07002322 self.mock(git_cl, 'get_cl_statuses',
2323 lambda branches, fine_grained, max_processes:
2324 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2325
2326 self.assertEqual(1, git_cl.main(['archive', '-f']))
2327
2328 def test_archive_dry_run(self):
2329 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2330
2331 self.calls = \
2332 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2333 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2334 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2335 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2336 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2337 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2338 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2339 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2340 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002341
2342 self.mock(git_cl, 'get_cl_statuses',
2343 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002344 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2345 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2346 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002347
kmarshall9249e012016-08-23 12:02:16 -07002348 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2349
2350 def test_archive_no_tags(self):
2351 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2352
2353 self.calls = \
2354 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2355 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2356 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2357 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2358 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2359 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2360 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2361 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2362 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2363 ((['git', 'branch', '-D', 'foo'],), '')]
2364
2365 self.mock(git_cl, 'get_cl_statuses',
2366 lambda branches, fine_grained, max_processes:
2367 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2368 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2369 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2370
2371 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002372
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002373 def test_cmd_issue_erase_existing(self):
2374 out = StringIO.StringIO()
2375 self.mock(git_cl.sys, 'stdout', out)
2376 self.calls = [
2377 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002378 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2379 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002380 # Let this command raise exception (retcode=1) - it should be ignored.
2381 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002382 CERR1),
2383 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2384 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002385 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2386 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2387 ''),
2388 ]
2389 self.assertEqual(0, git_cl.main(['issue', '0']))
2390
phajdan.jre328cf92016-08-22 04:12:17 -07002391 def test_cmd_issue_json(self):
2392 out = StringIO.StringIO()
2393 self.mock(git_cl.sys, 'stdout', out)
2394 self.calls = [
2395 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002396 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002397 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2398 ((['git', 'config', 'rietveld.server'],),
2399 'https://codereview.chromium.org'),
2400 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2401 (('write_json', 'output.json',
2402 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2403 ''),
2404 ]
2405 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2406
tandriide281ae2016-10-12 06:02:30 -07002407 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002408 self.mock(git_cl.Changelist, 'GetChange',
2409 lambda _, *a: (
2410 self._mocked_call(['GetChange']+list(a))))
2411 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2412 lambda *_, **__: (
2413 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002414 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2415 lambda _, s: self._mocked_call(['SetCQState', s]))
2416 self.calls = [
2417 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002418 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002419 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2420 ((['git', 'config', 'rietveld.server'],),
2421 'https://codereview.chromium.org'),
2422 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2423 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2424 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2425 ((['get_or_create_merge_base', 'feature', 'feature'],),
2426 'fake_ancestor_sha'),
2427 ((['GetChange', 'fake_ancestor_sha', None], ),
2428 git_cl.presubmit_support.GitChange(
2429 '', '', '', '', '', '', '', '')),
2430 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2431 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002432 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2433 ]
2434 out = StringIO.StringIO()
2435 self.mock(git_cl.sys, 'stdout', out)
2436 self.assertEqual(0, git_cl.main(['try']))
2437 self.assertEqual(
2438 out.getvalue(),
2439 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2440
tandrii8c5a3532016-11-04 07:52:02 -07002441 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2442 self.mock(git_cl.Changelist, 'GetChange',
2443 lambda _, *a: (
2444 self._mocked_call(['GetChange']+list(a))))
2445 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2446 lambda *_, **__: (
2447 self._mocked_call(['DoGetTryMasters'])))
2448 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2449 lambda _, s: self._mocked_call(['SetCQState', s]))
2450
tandrii8c5a3532016-11-04 07:52:02 -07002451 self.calls = [
2452 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2453 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2454 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2455 ((['git', 'config', 'branch.feature.gerritserver'],),
2456 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002457 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2458 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2459 'project': 'depot_tools',
2460 'status': 'OPEN',
2461 'owner': {'email': 'owner@e.mail'},
2462 'revisions': {
2463 'deadbeaf': {
2464 '_number': 6,
2465 },
2466 'beeeeeef': {
2467 '_number': 7,
2468 'fetch': {'http': {
2469 'url': 'https://chromium.googlesource.com/depot_tools',
2470 'ref': 'refs/changes/56/123456/7'
2471 }},
2472 },
2473 },
2474 }),
tandrii8c5a3532016-11-04 07:52:02 -07002475 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2476 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2477 ((['get_or_create_merge_base', 'feature', 'feature'],),
2478 'fake_ancestor_sha'),
2479 ((['GetChange', 'fake_ancestor_sha', None], ),
2480 git_cl.presubmit_support.GitChange(
2481 '', '', '', '', '', '', '', '')),
2482 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2483 ((['DoGetTryMasters'], ), None),
2484 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2485 ]
2486 out = StringIO.StringIO()
2487 self.mock(git_cl.sys, 'stdout', out)
2488 self.assertEqual(0, git_cl.main(['try']))
2489 self.assertEqual(
2490 out.getvalue(),
2491 'scheduled CQ Dry Run on '
2492 'https://chromium-review.googlesource.com/123456\n')
2493
2494 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2495 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2496 lambda _: {
2497 'owner_email': 'owner@e.mail',
2498 'private': False,
2499 'closed': False,
2500 'project': 'depot_tools',
2501 'patchsets': [20001],
2502 })
tandriide281ae2016-10-12 06:02:30 -07002503 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2504 self.calls = [
2505 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2506 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2507 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2508 ((['git', 'config', 'rietveld.server'],),
2509 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002510 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002511 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002512 ]
2513
2514 def _buildbucket_retry(*_, **kw):
2515 # self.maxDiff = 10000
2516 body = json.loads(kw['body'])
2517 self.assertEqual(len(body['builds']), 1)
2518 build = body['builds'][0]
2519 params = json.loads(build.pop('parameters_json'))
2520 self.assertEqual(params, {
2521 u'builder_name': u'win',
2522 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2523 u'revision': None}],
2524 u'properties': {
2525 u'category': u'git_cl_try',
2526 u'issue': 123,
2527 u'key': u'val',
2528 u'json': [{u'a': 1}, None],
2529 u'master': u'tryserver.chromium',
2530 u'patch_project': u'depot_tools',
2531 u'patch_storage': u'rietveld',
2532 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002533 u'rietveld': u'https://codereview.chromium.org',
2534 }
2535 })
2536 self.assertEqual(build, {
2537 u'bucket': u'master.tryserver.chromium',
2538 u'client_operation_id': u'uuid4',
2539 u'tags': [u'builder:win',
2540 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002541 u'user_agent:git_cl_try',
2542 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002543 })
2544
2545 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2546
2547 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2548 self.assertEqual(0, git_cl.main([
2549 'try', '-m', 'tryserver.chromium', '-b', 'win',
2550 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2551 self.assertRegexpMatches(
2552 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002553 'Tried jobs on:\nBucket: master.tryserver.chromium')
2554
tandrii8c5a3532016-11-04 07:52:02 -07002555 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2556 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2557 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2558
tandrii8c5a3532016-11-04 07:52:02 -07002559 self.calls = [
2560 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2561 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2562 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2563 ((['git', 'config', 'branch.feature.gerritserver'],),
2564 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002565 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002566 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002567 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002568 'status': 'OPEN',
2569 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002570 'revisions': {
2571 'deadbeaf': {
2572 '_number': 6,
2573 },
2574 'beeeeeef': {
2575 '_number': 7,
2576 'fetch': {'http': {
2577 'url': 'https://chromium.googlesource.com/depot_tools',
2578 'ref': 'refs/changes/56/123456/7'
2579 }},
2580 },
2581 },
2582 }),
2583 ]
2584
2585 def _buildbucket_retry(*_, **kw):
2586 # self.maxDiff = 10000
2587 body = json.loads(kw['body'])
2588 self.assertEqual(len(body['builds']), 1)
2589 build = body['builds'][0]
2590 params = json.loads(build.pop('parameters_json'))
2591 self.assertEqual(params, {
2592 u'builder_name': u'win',
2593 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2594 u'revision': None}],
2595 u'properties': {
2596 u'category': u'git_cl_try',
2597 u'key': u'val',
2598 u'json': [{u'a': 1}, None],
2599 u'master': u'tryserver.chromium',
2600
2601 u'patch_gerrit_url':
2602 u'https://chromium-review.googlesource.com',
2603 u'patch_issue': 123456,
2604 u'patch_project': u'depot_tools',
2605 u'patch_ref': u'refs/changes/56/123456/7',
2606 u'patch_repository_url':
2607 u'https://chromium.googlesource.com/depot_tools',
2608 u'patch_set': 7,
2609 u'patch_storage': u'gerrit',
2610 }
2611 })
2612 self.assertEqual(build, {
2613 u'bucket': u'master.tryserver.chromium',
2614 u'client_operation_id': u'uuid4',
2615 u'tags': [
2616 u'builder:win',
2617 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2618 u'user_agent:git_cl_try',
2619 u'master:tryserver.chromium'],
2620 })
2621
2622 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2623
2624 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2625 self.assertEqual(0, git_cl.main([
2626 'try', '-m', 'tryserver.chromium', '-b', 'win',
2627 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2628 self.assertRegexpMatches(
2629 git_cl.sys.stdout.getvalue(),
2630 'Tried jobs on:\nBucket: master.tryserver.chromium')
2631
borenet6c0efe62016-10-19 08:13:29 -07002632 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002633 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2634 lambda _: {
2635 'owner_email': 'owner@e.mail',
2636 'private': False,
2637 'closed': False,
2638 'project': 'depot_tools',
2639 'patchsets': [20001],
2640 })
borenet6c0efe62016-10-19 08:13:29 -07002641 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2642 self.calls = [
2643 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2644 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2645 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2646 ((['git', 'config', 'rietveld.server'],),
2647 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002648 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002649 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002650 ]
2651
2652 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002653 body = json.loads(kw['body'])
2654 self.assertEqual(len(body['builds']), 1)
2655 build = body['builds'][0]
2656 params = json.loads(build.pop('parameters_json'))
2657 self.assertEqual(params, {
2658 u'builder_name': u'win',
2659 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2660 u'revision': None}],
2661 u'properties': {
2662 u'category': u'git_cl_try',
2663 u'issue': 123,
2664 u'patch_project': u'depot_tools',
2665 u'patch_storage': u'rietveld',
2666 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002667 u'rietveld': u'https://codereview.chromium.org',
2668 }
2669 })
2670 self.assertEqual(build, {
2671 u'bucket': u'test.bucket',
2672 u'client_operation_id': u'uuid4',
2673 u'tags': [u'builder:win',
2674 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2675 u'user_agent:git_cl_try'],
2676 })
2677
2678 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2679
2680 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2681 self.assertEqual(0, git_cl.main([
2682 'try', '-B', 'test.bucket', '-b', 'win']))
2683 self.assertRegexpMatches(
2684 git_cl.sys.stdout.getvalue(),
2685 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002686
qyearsley123a4682016-10-26 09:12:17 -07002687 def test_git_cl_try_bots_on_multiple_masters(self):
2688 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2689 self.calls = [
2690 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2691 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2692 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2693 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002694 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002695 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2696 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2697 ]
2698
2699 def _buildbucket_retry(*_, **kw):
2700 body = json.loads(kw['body'])
2701 self.assertEqual(len(body['builds']), 2)
2702
2703 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2704 self.assertEqual(first_build_params['builder_name'], 'builder1')
2705 self.assertEqual(first_build_params['properties']['master'], 'master1')
2706
2707 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2708 self.assertEqual(first_build_params['builder_name'], 'builder2')
2709 self.assertEqual(first_build_params['properties']['master'], 'master2')
2710
2711 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2712
2713 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2714 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2715
2716 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2717 self.assertEqual(
2718 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2719 self.assertEqual(
2720 git_cl.sys.stdout.getvalue(),
2721 'Tried jobs on:\n'
2722 'Bucket: master.master1\n'
2723 ' builder1: []\n'
2724 'Bucket: master.master2\n'
2725 ' builder2: []\n'
2726 'To see results here, run: git cl try-results\n'
2727 'To see results in browser, run: git cl web\n')
2728
tandrii16e0b4e2016-06-07 10:34:28 -07002729 def _common_GerritCommitMsgHookCheck(self):
2730 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2731 self.mock(git_cl.os.path, 'abspath',
2732 lambda path: self._mocked_call(['abspath', path]))
2733 self.mock(git_cl.os.path, 'exists',
2734 lambda path: self._mocked_call(['exists', path]))
2735 self.mock(git_cl.gclient_utils, 'FileRead',
2736 lambda path: self._mocked_call(['FileRead', path]))
2737 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2738 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2739 self.calls = [
2740 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2741 ((['abspath', '../'],), '/abs/git_repo_root'),
2742 ]
2743 return git_cl.Changelist(codereview='gerrit', issue=123)
2744
2745 def test_GerritCommitMsgHookCheck_custom_hook(self):
2746 cl = self._common_GerritCommitMsgHookCheck()
2747 self.calls += [
2748 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2749 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2750 '#!/bin/sh\necho "custom hook"')
2751 ]
2752 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2753
2754 def test_GerritCommitMsgHookCheck_not_exists(self):
2755 cl = self._common_GerritCommitMsgHookCheck()
2756 self.calls += [
2757 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2758 ]
2759 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2760
2761 def test_GerritCommitMsgHookCheck(self):
2762 cl = self._common_GerritCommitMsgHookCheck()
2763 self.calls += [
2764 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2765 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2766 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002767 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002768 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2769 ''),
2770 ]
2771 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2772
tandriic4344b52016-08-29 06:04:54 -07002773 def test_GerritCmdLand(self):
2774 self.calls += [
2775 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2776 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2777 'deadbeaf'),
2778 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2779 ((['git', 'config', 'branch.feature.gerritserver'],),
2780 'chromium-review.googlesource.com'),
2781 ]
2782 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2783 cl._codereview_impl._GetChangeDetail = lambda _: {
2784 'labels': {},
2785 'current_revision': 'deadbeaf',
2786 }
agable32978d92016-11-01 12:55:02 -07002787 cl._codereview_impl._GetChangeCommit = lambda: {
2788 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002789 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002790 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2791 }
tandriic4344b52016-08-29 06:04:54 -07002792 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002793 out = StringIO.StringIO()
2794 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002795 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002796 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002797 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002798
tandrii221ab252016-10-06 08:12:04 -07002799 BUILDBUCKET_BUILDS_MAP = {
2800 '9000': {
2801 'id': '9000',
2802 'status': 'STARTED',
2803 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2804 'result_details_json': '{"properties": {}}',
2805 'bucket': 'master.x.y',
2806 'created_by': 'user:someone@chromium.org',
2807 'created_ts': '147200002222000',
2808 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2809 },
2810 '8000': {
2811 'id': '8000',
2812 'status': 'COMPLETED',
2813 'result': 'FAILURE',
2814 'failure_reason': 'BUILD_FAILURE',
2815 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2816 'result_details_json': '{"properties": {}}',
2817 'bucket': 'master.x.y',
2818 'created_by': 'user:someone@chromium.org',
2819 'created_ts': '147200001111000',
2820 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2821 },
2822 }
2823
2824 def test_write_try_results_json(self):
2825 expected_output = [
2826 {
2827 'buildbucket_id': '8000',
2828 'bucket': 'master.x.y',
2829 'builder_name': 'my-builder',
2830 'status': 'COMPLETED',
2831 'result': 'FAILURE',
2832 'failure_reason': 'BUILD_FAILURE',
2833 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2834 },
2835 {
2836 'buildbucket_id': '9000',
2837 'bucket': 'master.x.y',
2838 'builder_name': 'my-builder',
2839 'status': 'STARTED',
2840 'result': None,
2841 'failure_reason': None,
2842 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2843 }
2844 ]
2845 self.calls = [(('write_json', 'output.json', expected_output), '')]
2846 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2847
tandrii45b2a582016-10-11 03:14:16 -07002848 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002849 out = StringIO.StringIO()
2850 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002851 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2852 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002853 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2854 self._mocked_call(['get_authenticator_for_host', host]))
2855 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2856 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002857
2858 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2859 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002860 self.calls += [
2861 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2862 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2863 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2864 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2865 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2866 ((['git', 'config', 'branch.feature.rietveldserver'],),
2867 'codereview.example.com'),
2868 ((['get_authenticator_for_host', 'codereview.example.com'],),
2869 AuthenticatorMock()),
2870 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2871
2872 def test_fetch_try_jobs_none_rietveld(self):
2873 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002874 # Simulate that user isn't logged in.
2875 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002876 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002877 self.assertRegexpMatches(sys.stdout.getvalue(),
2878 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002879 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2880
2881 def test_fetch_try_jobs_some_rietveld(self):
2882 self._setup_fetch_try_jobs_rietveld({
2883 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2884 })
2885 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002886 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2887 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2888 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2889
2890 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2891 self._setup_fetch_try_jobs(most_recent_patchset=13)
2892 self.calls += [
2893 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2894 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2895 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002896 # TODO(tandrii): Uncomment the below if we decide to support checking
2897 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002898 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002899 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002900 ((['git', 'config', 'branch.feature.gerritserver'],),
2901 'https://x-review.googlesource.com'),
2902 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2903 AuthenticatorMock()),
2904 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2905
2906 def test_fetch_try_jobs_none_gerrit(self):
2907 self._setup_fetch_try_jobs_gerrit({})
2908 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002909 # TODO(tandrii): Uncomment the below if we decide to support checking
2910 # patchsets for Gerrit.
2911 # self.assertRegexpMatches(
2912 # sys.stdout.getvalue(),
2913 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002914 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2915
2916 def test_fetch_try_jobs_some_gerrit(self):
2917 self._setup_fetch_try_jobs_gerrit({
2918 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2919 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002920 # TODO(tandrii): Uncomment the below if we decide to support checking
2921 # patchsets for Gerrit.
2922 # self.calls.remove(
2923 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002924 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2925
2926 # ... and doesn't result in warning.
2927 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2928 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002929 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2930 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2931
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002932 def _mock_gerrit_changes_for_detail_cache(self):
2933 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002934
2935 def test_gerrit_change_detail_cache_normalize(self):
2936 self._mock_gerrit_changes_for_detail_cache()
2937 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002938 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002939 ]
2940 cl = git_cl.Changelist(codereview='gerrit')
2941 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2942 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2943 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2944 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2945
2946 def test_gerrit_change_detail_cache_simple(self):
2947 self._mock_gerrit_changes_for_detail_cache()
2948 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002949 (('GetChangeDetail', 'host', '1', []), 'a'),
2950 (('GetChangeDetail', 'host', '2', []), 'b'),
2951 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002952 ]
2953 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2954 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2955 self.assertEqual(cl._GetChangeDetail(), 'a')
2956 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002957 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002958 self.assertEqual(cl._GetChangeDetail(), 'a')
2959 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2960
2961 def test_gerrit_change_detail_cache_options(self):
2962 self._mock_gerrit_changes_for_detail_cache()
2963 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002964 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2965 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2966 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2967 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002968 ]
2969 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2970 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2971 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2972 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2973 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2974 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2975 self.assertEqual(cl._GetChangeDetail(), 'cab')
2976
2977 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2978 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2979 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2980 self.assertEqual(cl._GetChangeDetail(), 'cab')
2981
2982 # Finally, no_cache should invalidate all caches for given change.
2983 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2984 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2985
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002986 def test_gerrit_description_caching(self):
2987 def gen_detail(rev, desc):
2988 return {
2989 'current_revision': rev,
2990 'revisions': {rev: {'commit': {'message': desc}}}
2991 }
2992 self.calls = [
2993 (('GetChangeDetail', 'host', '1',
2994 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2995 gen_detail('rev1', 'desc1')),
2996 (('GetChangeDetail', 'host', '1',
2997 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2998 gen_detail('rev2', 'desc2')),
2999 ]
3000
3001 self._mock_gerrit_changes_for_detail_cache()
3002 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3003 self.assertEqual(cl.GetDescription(), 'desc1')
3004 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3005 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003006
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003007 def test_print_current_creds(self):
3008 class CookiesAuthenticatorMock(object):
3009 def __init__(self):
3010 self.gitcookies = {
3011 'host.googlesource.com': ('user', 'pass'),
3012 'host-review.googlesource.com': ('user', 'pass'),
3013 }
3014 self.netrc = self
3015 self.netrc.hosts = {
3016 'github.com': ('user2', None, 'pass2'),
3017 'host2.googlesource.com': ('user3', None, 'pass'),
3018 }
3019 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3020 CookiesAuthenticatorMock)
3021 self.mock(sys, 'stdout', StringIO.StringIO())
3022 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3023 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3024 ' Host\t User\t Which file',
3025 '============================\t=====\t===========',
3026 'host-review.googlesource.com\t user\t.gitcookies',
3027 ' host.googlesource.com\t user\t.gitcookies',
3028 ' host2.googlesource.com\tuser3\t .netrc',
3029 ])
3030 sys.stdout.buf = ''
3031 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3032 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3033 ' Host\tUser\t Which file',
3034 '============================\t====\t===========',
3035 'host-review.googlesource.com\tuser\t.gitcookies',
3036 ' host.googlesource.com\tuser\t.gitcookies',
3037 ])
3038
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003039 def _common_creds_check_mocks(self):
3040 def exists_mock(path):
3041 dirname = os.path.dirname(path)
3042 if dirname == os.path.expanduser('~'):
3043 dirname = '~'
3044 base = os.path.basename(path)
3045 if base in ('.netrc', '.gitcookies'):
3046 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3047 # git cl also checks for existence other files not relevant to this test.
3048 return None
3049 self.mock(os.path, 'exists', exists_mock)
3050 self.mock(sys, 'stdout', StringIO.StringIO())
3051
3052 def test_creds_check_gitcookies_not_configured(self):
3053 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003054 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003055 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003056 self.calls = [
3057 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3058 (('os.path.exists', '~/.netrc'), True),
3059 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3060 'or Ctrl+C to abort'), ''),
3061 ((['git', 'config', '--global', 'http.cookiefile',
3062 os.path.expanduser('~/.gitcookies')], ), ''),
3063 ]
3064 self.assertEqual(0, git_cl.main(['creds-check']))
3065 self.assertRegexpMatches(
3066 sys.stdout.getvalue(),
3067 '^You seem to be using outdated .netrc for git credentials:')
3068 self.assertRegexpMatches(
3069 sys.stdout.getvalue(),
3070 '\nConfigured git to use .gitcookies from')
3071
3072 def test_creds_check_gitcookies_configured_custom_broken(self):
3073 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003074 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003075 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003076 self.calls = [
3077 ((['git', 'config', '--global', 'http.cookiefile'],),
3078 '/custom/.gitcookies'),
3079 (('os.path.exists', '/custom/.gitcookies'), False),
3080 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3081 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3082 ((['git', 'config', '--global', 'http.cookiefile',
3083 os.path.expanduser('~/.gitcookies')], ), ''),
3084 ]
3085 self.assertEqual(0, git_cl.main(['creds-check']))
3086 self.assertRegexpMatches(
3087 sys.stdout.getvalue(),
3088 'WARNING: you have configured custom path to .gitcookies: ')
3089 self.assertRegexpMatches(
3090 sys.stdout.getvalue(),
3091 'However, your configured .gitcookies file is missing.')
3092
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003093 def test_git_cl_comment_add_default(self):
3094 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3095 lambda _, message: self._mocked_call('AddComment', message))
3096 self.calls = [
3097 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3098 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3099 (('AddComment', 'msg'), ''),
3100 ]
3101 # TODO(tandrii): --rietveld should be specified here.
3102 self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
3103
3104 def test_git_cl_comment_add_gerrit(self):
3105 self.mock(git_cl.gerrit_util, 'SetReview',
3106 lambda host, change, msg:
3107 self._mocked_call('SetReview', host, change, msg))
3108 self.calls = [
3109 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3110 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3111 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3112 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3113 'origin/master'),
3114 ((['git', 'config', 'remote.origin.url'],),
3115 'https://chromium.googlesource.com/infra/infra'),
3116 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3117 ]
3118 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3119 '-a', 'msg']))
3120
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003121 def test_git_cl_comments_fetch_rietveld(self):
3122 self.mock(sys, 'stdout', StringIO.StringIO())
3123 self.calls = [
3124 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3125 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3126 ] * 2
3127 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3128 'messages': [
3129 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3130 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3131 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3132 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3133 # Intentionally wrong order here.
3134 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3135 'disapproval': False, 'approval': False,
3136 'sender': 'owner@example.com'},
3137 ],
3138 'owner_email': 'owner@example.com',
3139 })
3140 expected_comments_summary = [
3141 git_cl._CommentSummary(
3142 message='lgtm',
3143 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3144 disapproval=False, approval=True, sender='r@example.com'),
3145 git_cl._CommentSummary(
3146 message='not lgtm',
3147 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3148 disapproval=True, approval=False, sender='r2@example.com'),
3149 # Note: same order as in whatever Rietveld returns.
3150 git_cl._CommentSummary(
3151 message='PTAL',
3152 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3153 disapproval=False, approval=False, sender='owner@example.com'),
3154 ]
3155 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3156 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3157
3158 with git_cl.gclient_utils.temporary_directory() as tempdir:
3159 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3160 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3161 '-j', out_file]))
3162 with open(out_file) as f:
3163 read = json.load(f)
3164 self.assertEqual(len(read), 3)
3165 self.assertEqual(read[0], {
3166 'date': '2000-03-13 20:49:34.515270',
3167 'message': 'PTAL',
3168 'approval': False,
3169 'disapproval': False,
3170 'sender': 'owner@example.com'})
3171 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3172 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3173
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003174 def test_git_cl_comments_fetch_gerrit(self):
3175 self.mock(sys, 'stdout', StringIO.StringIO())
3176 self.calls = [
3177 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3178 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3179 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3180 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3181 'origin/master'),
3182 ((['git', 'config', 'remote.origin.url'],),
3183 'https://chromium.googlesource.com/infra/infra'),
3184 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3185 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3186 'owner': {'email': 'owner@example.com'},
3187 'messages': [
3188 {
3189 u'_revision_number': 1,
3190 u'author': {
3191 u'_account_id': 1111084,
3192 u'email': u'commit-bot@chromium.org',
3193 u'name': u'Commit Bot'
3194 },
3195 u'date': u'2017-03-15 20:08:45.000000000',
3196 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3197 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3198 u'tag': u'autogenerated:cq:dry-run'
3199 },
3200 {
3201 u'_revision_number': 2,
3202 u'author': {
3203 u'_account_id': 11151243,
3204 u'email': u'owner@example.com',
3205 u'name': u'owner'
3206 },
3207 u'date': u'2017-03-16 20:00:41.000000000',
3208 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3209 u'message': u'PTAL',
3210 },
3211 {
3212 u'_revision_number': 2,
3213 u'author': {
3214 u'_account_id': 148512 ,
3215 u'email': u'reviewer@example.com',
3216 u'name': u'reviewer'
3217 },
3218 u'date': u'2017-03-17 05:19:37.500000000',
3219 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3220 u'message': u'Patch Set 2: Code-Review+1',
3221 },
3222 ]
3223 })
3224 ] * 2
3225 expected_comments_summary = [
3226 git_cl._CommentSummary(
3227 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3228 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3229 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3230 git_cl._CommentSummary(
3231 message=u'PTAL',
3232 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3233 disapproval=False, approval=False, sender=u'owner@example.com'),
3234 git_cl._CommentSummary(
3235 message=u'Patch Set 2: Code-Review+1',
3236 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3237 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3238 ]
3239 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3240 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3241
3242 with git_cl.gclient_utils.temporary_directory() as tempdir:
3243 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3244 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3245 '-j', out_file]))
3246 with open(out_file) as f:
3247 read = json.load(f)
3248 self.assertEqual(len(read), 3)
3249 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3250 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3251 self.assertEqual(read[2], {
3252 u'date': u'2017-03-17 05:19:37.500000',
3253 u'message': u'Patch Set 2: Code-Review+1',
3254 u'approval': False,
3255 u'disapproval': False,
3256 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003257
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003258if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003259 logging.basicConfig(
3260 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003261 unittest.main()